aboutsummaryrefslogtreecommitdiffhomepage
path: root/BUILD
diff options
context:
space:
mode:
authorGravatar murgatroid99 <mlumish@google.com>2017-04-13 09:56:17 -0700
committerGravatar murgatroid99 <mlumish@google.com>2017-04-13 09:56:17 -0700
commita41fd5b0861f01a7be447eb3abfd903a6f623fa8 (patch)
treea2b268872d24c80fc894d0441a2e5af084c47209 /BUILD
parent4d0ee2a56b71b3eae4865c6440362daebba0b5f7 (diff)
parente48dd23092a58c76a1cb486846fbeea38f60af3e (diff)
Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD7
1 files changed, 4 insertions, 3 deletions
diff --git a/BUILD b/BUILD
index 9881e8776c..12bd026c95 100644
--- a/BUILD
+++ b/BUILD
@@ -37,7 +37,8 @@ package(default_visibility = ["//visibility:public"])
load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_proto_plugin")
-g_stands_for = "green"
+# This should be updated along with build.yaml
+g_stands_for = "gentle"
core_version = "3.0.0-dev"
@@ -996,11 +997,11 @@ grpc_cc_library(
"src/core/ext/transport/chttp2/transport/frame_ping.c",
"src/core/ext/transport/chttp2/transport/frame_rst_stream.c",
"src/core/ext/transport/chttp2/transport/frame_settings.c",
- "src/core/ext/transport/chttp2/transport/http2_settings.c",
"src/core/ext/transport/chttp2/transport/frame_window_update.c",
"src/core/ext/transport/chttp2/transport/hpack_encoder.c",
"src/core/ext/transport/chttp2/transport/hpack_parser.c",
"src/core/ext/transport/chttp2/transport/hpack_table.c",
+ "src/core/ext/transport/chttp2/transport/http2_settings.c",
"src/core/ext/transport/chttp2/transport/huffsyms.c",
"src/core/ext/transport/chttp2/transport/incoming_metadata.c",
"src/core/ext/transport/chttp2/transport/parsing.c",
@@ -1019,11 +1020,11 @@ grpc_cc_library(
"src/core/ext/transport/chttp2/transport/frame_ping.h",
"src/core/ext/transport/chttp2/transport/frame_rst_stream.h",
"src/core/ext/transport/chttp2/transport/frame_settings.h",
- "src/core/ext/transport/chttp2/transport/http2_settings.h",
"src/core/ext/transport/chttp2/transport/frame_window_update.h",
"src/core/ext/transport/chttp2/transport/hpack_encoder.h",
"src/core/ext/transport/chttp2/transport/hpack_parser.h",
"src/core/ext/transport/chttp2/transport/hpack_table.h",
+ "src/core/ext/transport/chttp2/transport/http2_settings.h",
"src/core/ext/transport/chttp2/transport/huffsyms.h",
"src/core/ext/transport/chttp2/transport/incoming_metadata.h",
"src/core/ext/transport/chttp2/transport/internal.h",