Merge pull request grpc#14572 from mehrdada/master

Upmerge v1.10.x and add gorgeous for 1.11 to g_stands_for.md
narzolliam · Mar 2, 2018 · af85e8f · af85e8f
2 parents f9244af + dafb7c9
commit af85e8f
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/doc/g_stands_for.md b/doc/g_stands_for.md
@@ -14,3 +14,4 @@ future), and the corresponding version numbers that used them:
 - 1.8 'g' stands for 'generous'
 - 1.9 'g' stands for 'glossy'
 - 1.10 'g' stands for 'glamorous'
+- 1.11 'g' stands for 'gorgeous'