diff --git a/.travis.yml b/.travis.yml
index d2d1c8ba639..004d44f3a55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
language: objective-c
-osx_image: xcode7.1
+osx_image: xcode7.2
env:
global:
- CONFIG=opt
@@ -27,6 +27,6 @@ xcode_scheme:
- InteropTestsLocalCleartext
# TODO(jcanizales): Investigate why they time out:
# - InteropTestsRemote
-xcode_sdk: iphonesimulator9.1
+xcode_sdk: iphonesimulator9.2
notifications:
email: false
diff --git a/package.xml b/package.xml
index 7e987d91c49..ba9f9a09f68 100644
--- a/package.xml
+++ b/package.xml
@@ -10,7 +10,7 @@
grpc-packages@google.com
yes
- 2016-02-24
+ 2016-02-25
0.8.0
@@ -989,7 +989,7 @@ Update to wrap gRPC C Core version 0.10.0
beta
beta
- 2016-02-24
+ 2016-02-25
BSD
- Simplify gRPC PHP installation #4517
diff --git a/src/core/support/env_linux.c b/src/core/support/env_linux.c
index 5863ad5682f..fe51f846b71 100644
--- a/src/core/support/env_linux.c
+++ b/src/core/support/env_linux.c
@@ -63,7 +63,9 @@ char *gpr_getenv(const char *name) {
for (size_t i = 0; getenv_func == NULL && i < GPR_ARRAY_SIZE(names); i++) {
getenv_func = (getenv_type)dlsym(RTLD_DEFAULT, names[i]);
if (getenv_func != NULL && strstr(names[i], "secure") == NULL) {
- gpr_log(GPR_DEBUG, "Warning: insecure environment read function '%s' used", names[i]);
+ gpr_log(GPR_DEBUG,
+ "Warning: insecure environment read function '%s' used",
+ names[i]);
}
}
char *result = getenv_func(name);
@@ -72,7 +74,8 @@ char *gpr_getenv(const char *name) {
char *result = secure_getenv(name);
return result == NULL ? result : gpr_strdup(result);
#else
- gpr_log(GPR_DEBUG, "Warning: insecure environment read function '%s' used", "getenv");
+ gpr_log(GPR_DEBUG, "Warning: insecure environment read function '%s' used",
+ "getenv");
char *result = getenv(name);
return result == NULL ? result : gpr_strdup(result);
#endif
diff --git a/src/objective-c/tests/GRPCClientTests.m b/src/objective-c/tests/GRPCClientTests.m
index 619f2cf56d5..9a3e5b5009b 100644
--- a/src/objective-c/tests/GRPCClientTests.m
+++ b/src/objective-c/tests/GRPCClientTests.m
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/objective-c/tests/InteropTestsLocalSSL.m b/src/objective-c/tests/InteropTestsLocalSSL.m
index f0f4b1d71f0..155e334ecb2 100644
--- a/src/objective-c/tests/InteropTestsLocalSSL.m
+++ b/src/objective-c/tests/InteropTestsLocalSSL.m
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/objective-c/tests/RxLibraryUnitTests.m b/src/objective-c/tests/RxLibraryUnitTests.m
index c94dcf533a4..d3426628141 100644
--- a/src/objective-c/tests/RxLibraryUnitTests.m
+++ b/src/objective-c/tests/RxLibraryUnitTests.m
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/test/cpp/util/test_credentials_provider.cc b/test/cpp/util/test_credentials_provider.cc
index cfd3ebbb111..7e1eb0d501c 100644
--- a/test/cpp/util/test_credentials_provider.cc
+++ b/test/cpp/util/test_credentials_provider.cc
@@ -95,9 +95,7 @@ gpr_once g_once_init_provider_mu = GPR_ONCE_INIT;
grpc::mutex* g_provider_mu = nullptr;
CredentialsProvider* g_provider = nullptr;
-void InitProviderMu() {
- g_provider_mu = new grpc::mutex;
-}
+void InitProviderMu() { g_provider_mu = new grpc::mutex; }
grpc::mutex& GetMu() {
gpr_once_init(&g_once_init_provider_mu, &InitProviderMu);
diff --git a/test/distrib/php/distribtest.php b/test/distrib/php/distribtest.php
index 318c6f9cf08..4c34cd674b4 100644
--- a/test/distrib/php/distribtest.php
+++ b/test/distrib/php/distribtest.php
@@ -1,4 +1,36 @@
Grpc\ChannelCredentials::createInsecure()
diff --git a/tools/buildgen/mako_renderer.py b/tools/buildgen/mako_renderer.py
index f629e68eb92..5f23f123c2d 100755
--- a/tools/buildgen/mako_renderer.py
+++ b/tools/buildgen/mako_renderer.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python2.7
-# Copyright 2015, Google Inc.
+# Copyright 2015-2016, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without