protobuf - Protocol Buffers – Google’s data interchange format

	Commit message (Collapse)	Author	Age
*	protostream_objectwriter: fix bug when Any is directly embedded in a map.	Harvey Tuch	2018-06-21
\| \| \| \| \| \| \| \| \| \|	This came up when trying to round-trip the JSON<->proto3 conversion for Envoy's envoy.admin.v2alpha.ConfigDump (https://github.com/envoyproxy/envoy/blob/b903c1dc984593f8e95e0569c1503dc5d85fbe34/api/envoy/admin/v2alpha/config_dump.proto#L29). Validated fix on the Envoy code base and via the provided unit test. Signed-off-by: Harvey Tuch <htuch@google.com>
*	Merge branch 'master' into fixbug_enum2json2	stone4774	2018-03-22
\|\
* \|	Fix bug: whether always_print_enums_as_ints is true or false, it always ↵	stone4774	2018-03-19
\| \| \| \| \| \| \| \|	print the default value of enums as strings
\| *	Merge branch 'master' into down-integrate	Adam Cozzette	2018-03-13
\| \|\ \| \|/ \|/\|
\| *	Integrated internal changes from Google	Adam Cozzette	2018-03-13
\| \|
* \|	The JsonParseOptions::ignore_unknown_fields option behavior treats	Alexey Malov	2018-02-12
\|/ \| \| \|	unrecognized string values in enum fields as default ones.
*	line breaks adjsted	Ubuntu	2017-12-20
\|
*	formatting issues	Ubuntu	2017-12-20
\|
*	resolve issue 4032 and added a unit test	Ubuntu	2017-12-19
\|
*	Down-integrate from google3.	Feng Xiao	2017-03-29
\|
*	Merge pull request #2867 from mojoBrendan/master	Feng Xiao	2017-03-17
\|\ \| \| \| \|	Add preserve_proto_field_names option to JsonPrintOptions
\| *	Add option to preserve original proto field names	Brendan McCarthy	2017-03-17
\| \|
* \|	DefaultValueObjectWriter should populate oneof message field	Jie Luo	2017-03-10
\|/
*	Remove the use of C++11 features.	Feng Xiao	2017-02-27
\|
*	Add an option to always print enums as ints in Json API	Sanchay Harneja	2017-02-18
\| \| \| \|	https://github.com/google/protobuf/issues/2735
*	JsonUtilTest: Add ParsePrimitiveMapIn subtest	Konstantin Podsvirov	2017-02-11
\|
*	Integrated internal changes from Google	Adam Cozzette	2016-11-17
\|
*	detect invaild JSON encoding in bytes field	mike07026	2016-09-01
\|
*	detect invaild JSON encoding in bytes field	mike07026	2016-09-01
\|
*	Integrate from internal code base.	Feng Xiao	2016-07-13
\|
*	Add JsonParseOptions to ignore unknown fields	Lizan Zhou	2016-06-28
\| \| \| \| \|	- add JsonParseOptions for JsonToBinaryString allow unknown fields - rename current JsonOptions to JsonPrintOptions
*	Integrate google internal changes.	Jisi Liu	2016-03-30
\|
*	Use static cast	Hamdi Sahloul	2015-10-09
\| \| \|	Used static cast to improve initalization compatibility with MSVC2010
*	VS2010 compatibility of address initalization	Hamdi Sahloul	2015-10-09
\| \| \|	VS2010 cannot compile json_util_test.cc since it assumes NULL as a zero (int), and therefore cannot convert into to char*
*	Merge remote-tracking branch 'origin/master' into beta-1	Feng Xiao	2015-08-26
\|\
* \|	Down-integrate from google3.	Feng Xiao	2015-08-22
\| \|
\| *	Fix map fields parsing.	Feng Xiao	2015-08-11
\|/ \| \| \|	Change-Id: If61e16cea84492474a71bbfe985131ec980b0b0a
*	Down-integrate from internal code base.	Feng Xiao	2015-06-15
	[ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d