Merge branch 'master' of https://github.com/grpc/grpc into channelz

codebender · Jun 15, 2018 · c14e95f · c14e95f
2 parents c7166ae + bd6ac0f
commit c14e95f
Show file tree

Hide file tree

Showing 196 changed files with 1,291 additions and 680 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,6 +1,6 @@
 ---
-Checks: 'modernize-use-nullptr,google-build-namespaces,google-build-explicit-make-pair,readability-function-size'
-WarningsAsErrors: 'modernize-use-nullptr,google-build-namespaces,google-build-explicit-make-pair,readability-function-size'
+Checks: 'modernize-use-nullptr,google-build-namespaces,google-build-explicit-make-pair,readability-function-size,performance-*'
+WarningsAsErrors: 'modernize-use-nullptr,google-build-namespaces,google-build-explicit-make-pair,readability-function-size,performance-*'
 CheckOptions:
   - key:    readability-function-size.StatementThreshold
     value:  '450'
diff --git a/BUILD b/BUILD
@@ -64,11 +64,11 @@ config_setting(
 )
 
 # This should be updated along with build.yaml
-g_stands_for = "gloriosa"
+g_stands_for = "gladiolus"
 
 core_version = "6.0.0-dev"
 
-version = "1.13.0-dev"
+version = "1.14.0-dev"
 
 GPR_PUBLIC_HDRS = [
     "include/grpc/support/alloc.h",