Merge pull request grpc#10156 from grpc/name

G stands for...
monder · Mar 16, 2017 · 4a3f53a · 4a3f53a
2 parents c6a4539 + 008c1f0
commit 4a3f53a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/build.yaml b/build.yaml
@@ -13,7 +13,7 @@ settings:
   '#09': Per-language overrides are possible with (eg) ruby_version tag here
   '#10': See the expand_version.py for all the quirks here
   core_version: 3.0.0-dev
-  g_stands_for: green
+  g_stands_for: gentle
   version: 1.3.0-dev
 filegroups:
 - name: census

diff --git a/doc/g_stands_for.md b/doc/g_stands_for.md
@@ -7,3 +7,4 @@ future), and the corresponding version numbers that used them:
 - 1.0 'g' stands for 'gRPC'
 - 1.1 'g' stands for 'good'
 - 1.2 'g' stands for 'green'
+- 1.3 'g' stands for 'gentle'
diff --git a/src/core/lib/surface/version.c b/src/core/lib/surface/version.c
@@ -38,4 +38,4 @@
 
 const char *grpc_version_string(void) { return "3.0.0-dev"; }
 
-const char *grpc_g_stands_for(void) { return "green"; }
+const char *grpc_g_stands_for(void) { return "gentle"; }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,4 +38,4 @@

		const char *grpc_version_string(void) { return "3.0.0-dev"; }

		const char *grpc_g_stands_for(void) { return "green"; }
		const char *grpc_g_stands_for(void) { return "gentle"; }