Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7037 from murgatroid99/master_update_0_16

Browse Source 
Update master branch to 0.16.0-dev
pull/7048/head
Jan Tattermusch 9 years ago committed by GitHub
parent 9cb96ba4f0 d29a3bf004
commit 6cf35fd4a5
19 changed files with 23 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile
  2. 2
      build.yaml
  3. 2
      package.json
  4. 4
      package.xml
  5. 2
      src/core/lib/surface/version.c
  6. 4
      src/csharp/Grpc.Auth/project.json
  7. 4
      src/csharp/Grpc.Core/VersionInfo.cs
  8. 2
      src/csharp/Grpc.Core/project.json
  9. 4
      src/csharp/Grpc.HealthCheck/project.json
  10. 2
      src/csharp/build_packages.bat
  11. 2
      src/node/tools/package.json
  12. 2
      src/python/grpcio/grpc_version.py
  13. 2
      src/ruby/lib/grpc/version.rb
  14. 2
      src/ruby/tools/version.rb
  15. 2
      tools/distrib/python/grpcio_tools/grpc_version.py
  16. 2
      tools/doxygen/Doxyfile.c++
  17. 2
      tools/doxygen/Doxyfile.c++.internal
  18. 2
      tools/doxygen/Doxyfile.core
  19. 2
      tools/doxygen/Doxyfile.core.internal

2
Makefile
Unescape View File

@ -414,7 +414,7 @@ E = @echo
Q = @
endif
VERSION = 0.15.0-dev
VERSION = 0.16.0-dev
CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

2
build.yaml
Unescape View File

@ -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.15.0-dev
version: 0.16.0-dev
filegroups:
- name: census
public_headers:

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "grpc",
"version": "0.15.0-dev",
"version": "0.16.0-dev",
"author": "Google Inc.",
"description": "gRPC Library for Node",
"homepage": "http://www.grpc.io/",

4
package.xml
Unescape View File

@ -13,8 +13,8 @@
<date>2016-05-19</date>
<time>16:06:07</time>
<version>
<release>0.15.0</release>
<api>0.15.0</api>
<release>0.16.0</release>
<api>0.16.0</api>
</version>
<stability>
<release>beta</release>

2
src/core/lib/surface/version.c
Unescape View File

@ -36,4 +36,4 @@
#include <grpc/grpc.h>
const char *grpc_version_string(void) { return "0.15.0-dev"; }
const char *grpc_version_string(void) { return "0.16.0-dev"; }

4
src/csharp/Grpc.Auth/project.json
Unescape View File

@ -1,5 +1,5 @@
{
"version": "0.15.0-dev",
"version": "0.16.0-dev",
"title": "gRPC C# Auth",
"authors": [ "Google Inc." ],
"copyright": "Copyright 2015, Google Inc.",
@ -13,7 +13,7 @@
"tags": [ "gRPC RPC Protocol HTTP/2 Auth OAuth2" ],
},
"dependencies": {
"Grpc.Core": "0.15.0-dev",
"Grpc.Core": "0.16.0-dev",
"Google.Apis.Auth": "1.11.1"
},
"frameworks": {

4
src/csharp/Grpc.Core/VersionInfo.cs
Unescape View File

@ -48,11 +48,11 @@ namespace Grpc.Core
/// <summary>
/// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
/// </summary>
public const string CurrentAssemblyFileVersion = "0.15.0.0";
public const string CurrentAssemblyFileVersion = "0.16.0.0";
/// <summary>
/// Current version of gRPC C#
/// </summary>
public const string CurrentVersion = "0.15.0-dev";
public const string CurrentVersion = "0.16.0-dev";
}
}

2
src/csharp/Grpc.Core/project.json
Unescape View File

@ -1,5 +1,5 @@
{
"version": "0.15.0-dev",
"version": "0.16.0-dev",
"title": "gRPC C# Core",
"authors": [ "Google Inc." ],
"copyright": "Copyright 2015, Google Inc.",

4
src/csharp/Grpc.HealthCheck/project.json
Unescape View File

@ -1,5 +1,5 @@
{
"version": "0.15.0-dev",
"version": "0.16.0-dev",
"title": "gRPC C# Healthchecking",
"authors": [ "Google Inc." ],
"copyright": "Copyright 2015, Google Inc.",
@ -13,7 +13,7 @@
"tags": [ "gRPC health check" ]
},
"dependencies": {
"Grpc.Core": "0.15.0-dev",
"Grpc.Core": "0.16.0-dev",
"Google.Protobuf": "3.0.0-beta3"
},
"frameworks": {

2
src/csharp/build_packages.bat
Unescape View File

@ -30,7 +30,7 @@
@rem Builds gRPC NuGet packages
@rem Current package versions
set VERSION=0.15.0-dev
set VERSION=0.16.0-dev
set PROTOBUF_VERSION=3.0.0-beta3
@rem Packages that depend on prerelease packages (like Google.Protobuf) need to have prerelease suffix as well.

2
src/node/tools/package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "grpc-tools",
"version": "0.15.0-dev",
"version": "0.16.0-dev",
"author": "Google Inc.",
"description": "Tools for developing with gRPC on Node.js",
"homepage": "http://www.grpc.io/",

2
src/python/grpcio/grpc_version.py
Unescape View File

@ -29,4 +29,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
VERSION='0.15.0.dev0'
VERSION='0.16.0.dev0'

2
src/ruby/lib/grpc/version.rb
Unescape View File

@ -29,5 +29,5 @@
# GRPC contains the General RPC module.
module GRPC
VERSION = '0.15.0.dev'
VERSION = '0.16.0.dev'
end

2
src/ruby/tools/version.rb
Unescape View File

@ -29,6 +29,6 @@
module GRPC
module Tools
VERSION = '0.15.0.dev'
VERSION = '0.16.0.dev'
end
end

2
tools/distrib/python/grpcio_tools/grpc_version.py
Unescape View File

@ -29,4 +29,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
VERSION='0.15.0.dev0'
VERSION='0.16.0.dev0'

2
tools/doxygen/Doxyfile.c++
Unescape View File

@ -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.15.0-dev
PROJECT_NUMBER = 0.16.0-dev
# 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

2
tools/doxygen/Doxyfile.c++.internal
Unescape View File

@ -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.15.0-dev
PROJECT_NUMBER = 0.16.0-dev
# 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

2
tools/doxygen/Doxyfile.core
Unescape View File

@ -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.15.0-dev
PROJECT_NUMBER = 0.16.0-dev
# 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

2
tools/doxygen/Doxyfile.core.internal
Unescape View File

@ -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.15.0-dev
PROJECT_NUMBER = 0.16.0-dev
# 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

Write Preview
Loading…
Cancel
Save