aboutsummaryrefslogtreecommitdiffhomepage
path: root/BUILD
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2018-04-10 14:02:26 -0700
committerGravatar Mark D. Roth <roth@google.com>2018-04-10 14:02:26 -0700
commita63aa993e0f9b95176f83d52bc8220ba013f4338 (patch)
tree2d98aa0c9129275ac23d064d86edbce3a58f7383 /BUILD
parent99dbd7a975704135b0b4d20c43c57c6af90b7485 (diff)
parentee6e4dc784cf63bc53e4b19609c6f458fd4b535c (diff)
Merge remote-tracking branch 'upstream/master' into c++_subchannel_list
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD9
1 files changed, 6 insertions, 3 deletions
diff --git a/BUILD b/BUILD
index 6e931a6222..62c63749cc 100644
--- a/BUILD
+++ b/BUILD
@@ -64,11 +64,11 @@ config_setting(
)
# This should be updated along with build.yaml
-g_stands_for = "gorgeous"
+g_stands_for = "glorious"
core_version = "6.0.0-dev"
-version = "1.11.0-dev"
+version = "1.12.0-dev"
GPR_PUBLIC_HDRS = [
"include/grpc/support/alloc.h",
@@ -141,7 +141,6 @@ GRPCXX_SRCS = [
"src/cpp/server/server_posix.cc",
"src/cpp/thread_manager/thread_manager.cc",
"src/cpp/util/byte_buffer_cc.cc",
- "src/cpp/util/slice_cc.cc",
"src/cpp/util/status.cc",
"src/cpp/util/string_ref.cc",
"src/cpp/util/time_cc.cc",
@@ -245,6 +244,8 @@ GRPCXX_PUBLIC_HDRS = [
"include/grpcpp/support/byte_buffer.h",
"include/grpcpp/support/channel_arguments.h",
"include/grpcpp/support/config.h",
+ "include/grpcpp/support/proto_buffer_reader.h",
+ "include/grpcpp/support/proto_buffer_writer.h",
"include/grpcpp/support/slice.h",
"include/grpcpp/support/status.h",
"include/grpcpp/support/status_code_enum.h",
@@ -1868,6 +1869,8 @@ grpc_cc_library(
language = "c++",
public_hdrs = [
"include/grpc++/impl/codegen/proto_utils.h",
+ "include/grpcpp/impl/codegen/proto_buffer_reader.h",
+ "include/grpcpp/impl/codegen/proto_buffer_writer.h",
"include/grpcpp/impl/codegen/proto_utils.h",
],
deps = [