aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2017-03-16 11:24:16 -0700
committerGravatar GitHub <noreply@github.com>2017-03-16 11:24:16 -0700
commit4a3f53a9becd64d30c83e5a14bd43073b3a08f99 (patch)
treed853aadf93b09f23446fcc0ce0f0837971f1b13f
parentc6a4539f80a6f3b97b29628c413c7f7eb62d9420 (diff)
parent008c1f09115b23196d192d9ddd92b431a824edd7 (diff)
Merge pull request #10156 from grpc/name
G stands for...
-rw-r--r--build.yaml2
-rw-r--r--doc/g_stands_for.md1
-rw-r--r--src/core/lib/surface/version.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/build.yaml b/build.yaml
index 997f55df97..111ef049f0 100644
--- 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
index 53a1fdf193..d2fc7a50f9 100644
--- 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
index 1143a9e044..ba80bd801e 100644
--- 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"; }