Merge "Patch svn r35215"

src/base/third_party/rapidjson/optimized_writer.h

-// Copyright (c) 2015 Baidu.com, Inc. All Rights Reserved
-// File: optimized_writer.h
+// Copyright (c) 2015 baidu-rpc authors.
 // Author: Lin Jiang (jianglin05@baidu.com)
 // Date: 2015/7/21 16:44:42
 

src/json2pb/encode_decode.cpp

-// Copyright (c) 2015 Baidu.com, Inc. All Rights Reserved
+// Copyright (c) 2015 baidu-rpc authors.
 // Author: Jiang,Lin (jianglin05@baidu.com)
 // Date: 2015/05/26 16:17:28
 

src/json2pb/encode_decode.h

-// Copyright (c) 2015 Baidu.com, Inc. All Rights Reserved
+// Copyright (c) 2015 baidu-rpc authors.
 // Author: Jiang,Lin (jianglin05@baidu.com)
 // Date: 2015/05/26 16:59:16
 #ifndef PROTOBUF_JSON_ENCODE_DECODE_H

src/json2pb/json_to_pb.cpp

+// Copyright (c) 2014 baidu-rpc authors.
+
 #include <vector>
 #include <map>
 #include <string>

src/json2pb/json_to_pb.h

 // protobuf-json: Conversions between protobuf and json.
-// Copyright (c) 2014 Baidu.com, Inc. All Rights Reserved
+// Copyright (c) 2014 baidu-rpc authors.
 
 // Author: The baidu-rpc authors (pbrpc@baidu.com)
 // Date:  2014-10-29 18:30:33

src/json2pb/pb_to_json.cpp

+// Copyright (c) 2014 baidu-rpc authors.
+
 #include <iostream>
 #include <vector>
 #include <string>

src/json2pb/pb_to_json.h

 // protobuf-json: Conversions between protobuf and json.
-// Copyright (c) 2014 Baidu.com, Inc. All Rights Reserved
+// Copyright (c) 2014 baidu-rpc authors.
 
 // Author: The baidu-rpc authors (pbrpc@baidu.com)
 // Date:  2014-10-29 18:30:33

src/json2pb/protobuf_map.cpp

-#include "protobuf_map.h"
+// Copyright (c) 2014 baidu-rpc authors.
 
+#include "protobuf_map.h"
 #include <stdio.h>
 
 namespace json2pb {

src/json2pb/protobuf_map.h

 // Baidu RPC - A framework to host and access services throughout Baidu.
-// Copyright (c) 2014 Baidu.com, Inc. All Rights Reserved
+// Copyright (c) 2014 baidu-rpc authors.
 //
 // Author: Rujie,Jiang jiangrujie@baidu.com
 // Date: Tue Feb 23 13:56:02 2016

src/json2pb/zero_copy_stream_reader.h

-// Copyright (c) 2014 Baidu.com, Inc. All Rights Reserved
+// Copyright (c) 2014 baidu-rpc authors.
 // File: iobuf_read_stream.h
 // Author: Zhangyi Chen (chenzhangyi01@baidu.com)
 // Date: 2014/10/29 15:01:09

src/json2pb/zero_copy_stream_writer.h

-// Copyright (c) 2014 Baidu.com, Inc. All Rights Reserved
-// File: zero_copy_stream_writer.h
+// Copyright (c) 2014 baidu-rpc authors.
 // Author: Zhangyi Chen (chenzhangyi01@baidu.com)
 // Date: 2014/10/29 16:44:42
 

test/brpc_protobuf_json_unittest.cpp

-// See README.txt for information and build instructions.
+// Copyright (c) 2015 baidu-rpc authors.
 
 #include <sys/time.h>
 #include <gtest/gtest.h>

test/brpc_repeated_field_unittest.cpp

-// Copyright (c) 2015 Baidu.com, Inc. All Rights Reserved
-
+// Copyright (c) 2015 baidu-rpc authors.
 // Author: Zhangyi Chen (chenzhangyi01@baidu.com)
 // Date: 2015/10/10 17:55:13