Merge pull request #6507 from nicolasnoble/flagging-past-release

The release branch is now 0.14.1-pre1.
9 years ago · 0b917a7375
parent 414b6c8720 2c75731b68
commit 0b917a7375
17 changed files with 21 additions and 21 deletions
--- a/2
+++ b/2
@ -407,7 +407,7 @@ E = @echo
 Q = @
 endif

-VERSION = 0.14.0
+VERSION = 0.14.1-pre1

 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
--- a/build.yaml
+++ b/build.yaml
@ -7,7 +7,7 @@ settings:
  '#3': Use "-preN" suffixes to identify pre-release versions
  '#4': Per-language overrides are possible with (eg) ruby_version tag here
  '#5': See the expand_version.py for all the quirks here
-  version: 0.14.0
+  version: 0.14.1-pre1
 filegroups:
 - name: census
  public_headers:
--- a/composer.json
+++ b/composer.json
@ -2,7 +2,7 @@
  "name": "grpc/grpc",
  "type": "library",
  "description": "gRPC library for PHP",
-  "version": "0.14.0",
+  "version": "0.14.1",
  "keywords": ["rpc"],
  "homepage": "http://grpc.io",
  "license": "BSD-3-Clause",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc",
-  "version": "0.14.0",
+  "version": "0.14.1-pre1",
  "author": "Google Inc.",
  "description": "gRPC Library for Node",
  "homepage": "http://www.grpc.io/",
--- a/package.xml
+++ b/package.xml
@ -13,8 +13,8 @@
 <date>2016-04-19</date>
 <time>16:06:07</time>
 <version>
-  <release>0.14.0</release>
-  <api>0.14.0</api>
+  <release>0.14.1</release>
+  <api>0.14.1</api>
 </version>
 <stability>
  <release>beta</release>
@ -1014,8 +1014,8 @@ Update to wrap gRPC C Core version 0.10.0
  </release>
  <release>
   <version>
-    <release>0.14.0</release>
-    <api>0.14.0</api>
+    <release>0.14.1</release>
+    <api>0.14.1</api>
   </version>
   <stability>
    <release>beta</release>
--- a/src/core/lib/surface/version.c
+++ b/src/core/lib/surface/version.c
@ -36,4 +36,4 @@

 #include <grpc/grpc.h>

-const char *grpc_version_string(void) { return "0.14.0"; }
+const char *grpc_version_string(void) { return "0.14.1-pre1"; }
--- a/src/csharp/Grpc.Core/VersionInfo.cs
+++ b/src/csharp/Grpc.Core/VersionInfo.cs
@ -48,11 +48,11 @@ namespace Grpc.Core
        /// <summary>
        /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
        /// </summary>
-        public const string CurrentAssemblyFileVersion = "0.14.0.0";
+        public const string CurrentAssemblyFileVersion = "0.14.1.0";

        /// <summary>
        /// Current version of gRPC C#
        /// </summary>
-        public const string CurrentVersion = "0.14.0";
+        public const string CurrentVersion = "0.14.1-pre1";
    }
 }
--- a/src/csharp/build_packages.bat
+++ b/src/csharp/build_packages.bat
@ -1,7 +1,7 @@
@rem Builds gRPC NuGet packages

@rem Current package versions
-set VERSION=0.14.0
+set VERSION=0.14.1-pre1
 set PROTOBUF_VERSION=3.0.0-beta2

@rem Packages that depend on prerelease packages (like Google.Protobuf) need to have prerelease suffix as well.
--- a/src/node/tools/package.json
+++ b/src/node/tools/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc-tools",
-  "version": "0.14.0",
+  "version": "0.14.1-pre1",
  "author": "Google Inc.",
  "description": "Tools for developing with gRPC on Node.js",
  "homepage": "http://www.grpc.io/",
--- a/src/python/grpcio/grpc_version.py
+++ b/src/python/grpcio/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!

-VERSION='0.14.0'
+VERSION='0.14.1rc1'
--- a/src/ruby/lib/grpc/version.rb
+++ b/src/ruby/lib/grpc/version.rb
@ -29,5 +29,5 @@

 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '0.14.0'
+  VERSION = '0.14.1.pre1'
 end
--- a/src/ruby/tools/version.rb
+++ b/src/ruby/tools/version.rb
@ -29,6 +29,6 @@

 module GRPC
  module Tools
-    VERSION = '0.14.0'
+    VERSION = '0.14.1.pre1'
  end
 end
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!

-VERSION='0.14.0'
+VERSION='0.14.1rc1'
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 0.14.0
+PROJECT_NUMBER         = 0.14.1-pre1

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 0.14.0
+PROJECT_NUMBER         = 0.14.1-pre1

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/tools/doxygen/Doxyfile.core
+++ b/tools/doxygen/Doxyfile.core
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 0.14.0
+PROJECT_NUMBER         = 0.14.1-pre1

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 0.14.0
+PROJECT_NUMBER         = 0.14.1-pre1

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a