aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util/internal/protostream_objectwriter.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5109 from haberman/integrateJoshua Haberman2018-09-071-4/+5
|\
| * Down-integrate from google3.Josh Haberman2018-09-041-4/+5
* | Code fixes for the original unit test.Brandon Cole2018-08-301-1/+13
|/
* Replace repo links.Feng Xiao2018-08-221-3/+3
* Down-integrate from google3.Feng Xiao2018-08-081-38/+59
* protostream_objectwriter: fix bug when Any is directly embedded in a map.Harvey Tuch2018-06-211-1/+1
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-39/+39
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-1/+1
* Down-integrate from google3.Feng Xiao2017-03-291-13/+22
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-8/+1
* Made helper code also consider package name 'proto2' when dealing with Messag...guptasu2016-11-101-2/+6
* Integrate internal changesBo Yang2016-10-101-39/+92
* Restore New*Callback into google::protobuf namespace since these are used by ...Srivats P2016-08-291-1/+1
* Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-011-1/+3
|\
| * Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-281-1/+3
* | Integrated internal changes from GoogleAdam Cozzette2016-06-291-1/+8
|/
* Down integrate from Google internal.Jisi Liu2016-04-281-25/+64
* Integrate google internal changes.Jisi Liu2016-03-301-10/+44
* Down-integrate from internal code base.Feng Xiao2015-12-111-1039/+521
* Fix compilation errors when built internally.Feng Xiao2015-11-021-1/+1
* Merge pull request #815 from TeBoring/third-partyPaul Yang2015-10-091-1/+1
|\
| * Down-integrate internal bug fixing changes.Bo Yang2015-10-041-1/+1
* | Down-integrate from google internal.Jisi Liu2015-10-051-5/+36
|/
* Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-261-1/+3
|\
| * Fix map fields parsing.Feng Xiao2015-08-111-1/+3
* | fix "memory leaks" in protostream-object files.Jisi Liu2015-08-251-28/+36
* | Down-integrate from google3.Feng Xiao2015-08-221-13/+66
|/
* Down-integrate from internal code base.Feng Xiao2015-06-151-0/+1557