Merge branch 'master' into 2phase_thd

narzolliam · Feb 24, 2018 · 8b05d02 · 8b05d02
2 parents d71b55d + d5b1f98
commit 8b05d02
Show file tree

Hide file tree

Showing 540 changed files with 1,531 additions and 280 deletions.
diff --git a/BUILD b/BUILD
@@ -64,11 +64,11 @@ config_setting(
 )
 
 # This should be updated along with build.yaml
-g_stands_for = "glamorous"
+g_stands_for = "gorgeous"
 
 core_version = "6.0.0-dev"
 
-version = "1.10.0-dev"
+version = "1.11.0-dev"
 
 GPR_PUBLIC_HDRS = [
  "include/grpc/support/alloc.h",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(PACKAGE_NAME "grpc")
-set(PACKAGE_VERSION "1.10.0-dev")
+set(PACKAGE_VERSION "1.11.0-dev")
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
 set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")

diff --git a/Makefile b/Makefile
@@ -419,8 +419,8 @@ Q = @
 endif
 
 CORE_VERSION = 6.0.0-dev
-CPP_VERSION = 1.10.0-dev
-CSHARP_VERSION = 1.10.0-dev
+CPP_VERSION = 1.11.0-dev
+CSHARP_VERSION = 1.11.0-dev
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

diff --git a/build.yaml b/build.yaml
@@ -13,8 +13,8 @@ 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: 6.0.0-dev
- g_stands_for: glamorous
- version: 1.10.0-dev
+ g_stands_for: gorgeous
+ version: 1.11.0-dev
 filegroups:
 - name: census
  public_headers:

diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
@@ -23,15 +23,15 @@
 Pod::Spec.new do |s|
  s.name = 'gRPC-C++'
  # TODO (mxyan): use version that match gRPC version when pod is stabilized
- # version = '1.10.0-dev'
+ # version = '1.11.0-dev'
  version = '0.0.2'
  s.version = version
  s.summary = 'gRPC C++ library'
  s.homepage = 'https://grpc.io'
  s.license = 'Apache License, Version 2.0'
  s.authors = { 'The gRPC contributors' => '[email protected]' }
 
- grpc_version = '1.10.0-dev'
+ grpc_version = '1.11.0-dev'
 
  s.source = {
  :git => 'https://github.com/grpc/grpc.git',

diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
@@ -22,7 +22,7 @@
 
 Pod::Spec.new do |s|
  s.name = 'gRPC-Core'
- version = '1.10.0-dev'
+ version = '1.11.0-dev'
  s.version = version
  s.summary = 'Core cross-platform gRPC library, written in C'
  s.homepage = 'https://grpc.io'

diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec
@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
  s.name = 'gRPC-ProtoRPC'
- version = '1.10.0-dev'
+ version = '1.11.0-dev'
  s.version = version
  s.summary = 'RPC library for Protocol Buffers, based on gRPC'
  s.homepage = 'https://grpc.io'

diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec
@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
  s.name = 'gRPC-RxLibrary'
- version = '1.10.0-dev'
+ version = '1.11.0-dev'
  s.version = version
  s.summary = 'Reactive Extensions library for iOS/OSX.'
  s.homepage = 'https://grpc.io'

diff --git a/gRPC.podspec b/gRPC.podspec
@@ -20,7 +20,7 @@
 
 Pod::Spec.new do |s|
  s.name = 'gRPC'
- version = '1.10.0-dev'
+ version = '1.11.0-dev'
  s.version = version
  s.summary = 'gRPC client library for iOS/OSX'
  s.homepage = 'https://grpc.io'

diff --git a/grpc.gemspec b/grpc.gemspec
@@ -651,20 +651,80 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/curve25519/internal.h )
  s.files += %w( third_party/boringssl/crypto/err/internal.h )
  s.files += %w( third_party/boringssl/crypto/evp/internal.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/aes.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/internal.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/key_wrap.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/mode_wrappers.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/add.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/asm/x86_64-gcc.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/bn.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/bytes.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/cmp.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/ctx.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/div.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/exponentiation.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/gcd.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/generic.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/internal.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/jacobi.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/montgomery.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/montgomery_inv.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/mul.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/prime.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/random.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/shift.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/sqrt.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/aead.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/cipher.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/e_aes.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/e_des.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/delocate.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/des/des.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/des/internal.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/digest.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/digests.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/md32_common.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/ec.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/ec_key.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/ec_montgomery.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/internal.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/oct.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p224-64.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-64.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/simple.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/util-64.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/wnaf.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/hmac/hmac.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/md4/md4.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/md5/md5.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/cbc.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/cfb.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/ctr.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/gcm.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/internal.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/ofb.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/polyval.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/ctrdrbg.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/internal.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/rand.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/urandom.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/blinding.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/internal.h )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/padding.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/rsa.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/rsa_impl.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha1-altivec.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha1.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha256.c )
+ s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha512.c )
  s.files += %w( third_party/boringssl/crypto/internal.h )
  s.files += %w( third_party/boringssl/crypto/obj/obj_dat.h )
  s.files += %w( third_party/boringssl/crypto/pkcs7/internal.h )

diff --git a/include/grpc/byte_buffer.h b/include/grpc/byte_buffer.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_BYTE_BUFFER_H
 #define GRPC_BYTE_BUFFER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/byte_buffer.h>
 #include <grpc/slice_buffer.h>
 

diff --git a/include/grpc/byte_buffer_reader.h b/include/grpc/byte_buffer_reader.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_BYTE_BUFFER_READER_H
 #define GRPC_BYTE_BUFFER_READER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/byte_buffer_reader.h>
 
 #endif /* GRPC_BYTE_BUFFER_READER_H */
diff --git a/include/grpc/census.h b/include/grpc/census.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_CENSUS_H
 #define GRPC_CENSUS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/grpc.h>
 
 #ifdef __cplusplus

diff --git a/include/grpc/fork.h b/include/grpc/fork.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_FORK_H
 #define GRPC_FORK_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/fork.h>
 
 #endif /* GRPC_FORK_H */
diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_GRPC_H
 #define GRPC_GRPC_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/status.h>
 
 #include <grpc/byte_buffer.h>

diff --git a/include/grpc/grpc_cronet.h b/include/grpc/grpc_cronet.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_GRPC_CRONET_H
 #define GRPC_GRPC_CRONET_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/grpc.h>
 
 #ifdef __cplusplus

diff --git a/include/grpc/grpc_posix.h b/include/grpc/grpc_posix.h
@@ -19,9 +19,10 @@
 #ifndef GRPC_GRPC_POSIX_H
 #define GRPC_GRPC_POSIX_H
 
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/port_platform.h>
 
+#include <grpc/impl/codegen/grpc_types.h>
+
 #include <stddef.h>
 
 #ifdef __cplusplus

diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_GRPC_SECURITY_H
 #define GRPC_GRPC_SECURITY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>

diff --git a/include/grpc/impl/codegen/byte_buffer.h b/include/grpc/impl/codegen/byte_buffer.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_IMPL_CODEGEN_BYTE_BUFFER_H
 #define GRPC_IMPL_CODEGEN_BYTE_BUFFER_H
 
+#include <grpc/impl/codegen/port_platform.h>
+
 #include <grpc/impl/codegen/grpc_types.h>
 
 #ifdef __cplusplus

diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h
@@ -314,6 +314,9 @@ typedef struct {
  Defaults to "blend". In the current implementation "blend" is equivalent to
  "latency". */
 #define GRPC_ARG_OPTIMIZATION_TARGET "grpc.optimization_target"
+/** Channel arg that carries the bridged objective c object for custom metrics
+ * logging filter. */
+#define GRPC_ARG_MOBILE_LOG_CONFIG "grpc.mobile_log_config"
 /** \} */
 
 /** Result of a grpc call. If the caller satisfies the prerequisites of a

diff --git a/include/grpc/impl/codegen/sync.h b/include/grpc/impl/codegen/sync.h
@@ -43,6 +43,7 @@ extern "C" {
 
 /* Platform-specific type declarations of gpr_mu and gpr_cv. */
 #include <grpc/impl/codegen/port_platform.h>
+
 #include <grpc/impl/codegen/sync_generic.h>
 
 #if defined(GPR_POSIX_SYNC)

diff --git a/include/grpc/impl/codegen/sync_custom.h b/include/grpc/impl/codegen/sync_custom.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_IMPL_CODEGEN_SYNC_CUSTOM_H
 #define GRPC_IMPL_CODEGEN_SYNC_CUSTOM_H
 
+#include <grpc/impl/codegen/port_platform.h>
+
 #include <grpc/impl/codegen/sync_generic.h>
 
 /* Users defining GPR_CUSTOM_SYNC need to define the following macros. */

diff --git a/include/grpc/impl/codegen/sync_generic.h b/include/grpc/impl/codegen/sync_generic.h
@@ -20,6 +20,8 @@
 #define GRPC_IMPL_CODEGEN_SYNC_GENERIC_H
 /* Generic type defintions for gpr_sync. */
 
+#include <grpc/impl/codegen/port_platform.h>
+
 #include <grpc/impl/codegen/atm.h>
 
 /* gpr_event */

diff --git a/include/grpc/impl/codegen/sync_posix.h b/include/grpc/impl/codegen/sync_posix.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_IMPL_CODEGEN_SYNC_POSIX_H
 #define GRPC_IMPL_CODEGEN_SYNC_POSIX_H
 
+#include <grpc/impl/codegen/port_platform.h>
+
 #include <grpc/impl/codegen/sync_generic.h>
 
 #include <pthread.h>

diff --git a/include/grpc/impl/codegen/sync_windows.h b/include/grpc/impl/codegen/sync_windows.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_IMPL_CODEGEN_SYNC_WINDOWS_H
 #define GRPC_IMPL_CODEGEN_SYNC_WINDOWS_H
 
+#include <grpc/impl/codegen/port_platform.h>
+
 #include <grpc/impl/codegen/sync_generic.h>
 
 typedef struct {

diff --git a/include/grpc/slice.h b/include/grpc/slice.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SLICE_H
 #define GRPC_SLICE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/slice.h>
 #include <grpc/support/sync.h>
 

diff --git a/include/grpc/slice_buffer.h b/include/grpc/slice_buffer.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SLICE_BUFFER_H
 #define GRPC_SLICE_BUFFER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/slice.h>
 
 #ifdef __cplusplus

diff --git a/include/grpc/status.h b/include/grpc/status.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_STATUS_H
 #define GRPC_STATUS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/status.h>
 
 #endif /* GRPC_STATUS_H */
diff --git a/include/grpc/support/alloc.h b/include/grpc/support/alloc.h
@@ -19,9 +19,9 @@
 #ifndef GRPC_SUPPORT_ALLOC_H
 #define GRPC_SUPPORT_ALLOC_H
 
-#include <stddef.h>
+#include <grpc/support/port_platform.h>
 
-#include <grpc/impl/codegen/port_platform.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/grpc/support/atm.h b/include/grpc/support/atm.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_ATM_H
 #define GRPC_SUPPORT_ATM_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/atm.h>
 
 #endif /* GRPC_SUPPORT_ATM_H */
diff --git a/include/grpc/support/atm_gcc_atomic.h b/include/grpc/support/atm_gcc_atomic.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_ATM_GCC_ATOMIC_H
 #define GRPC_SUPPORT_ATM_GCC_ATOMIC_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/atm_gcc_atomic.h>
 
 #endif /* GRPC_SUPPORT_ATM_GCC_ATOMIC_H */
diff --git a/include/grpc/support/atm_gcc_sync.h b/include/grpc/support/atm_gcc_sync.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_ATM_GCC_SYNC_H
 #define GRPC_SUPPORT_ATM_GCC_SYNC_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/atm_gcc_sync.h>
 
 #endif /* GRPC_SUPPORT_ATM_GCC_SYNC_H */
diff --git a/include/grpc/support/atm_windows.h b/include/grpc/support/atm_windows.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_ATM_WINDOWS_H
 #define GRPC_SUPPORT_ATM_WINDOWS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/atm_windows.h>
 
 #endif /* GRPC_SUPPORT_ATM_WINDOWS_H */