Merge branch 'release-0_12' of github.com:grpc/grpc into cpp_new_creds_plugin_api

pull/4208/head
Julien Boeuf 9 years ago
commit 2b8e9ca49d
  1. 3
      include/grpc/grpc_security.h
  2. 2
      package.json
  3. 1
      src/core/security/client_auth_filter.c
  4. 2
      src/csharp/Grpc.Core/VersionInfo.cs
  5. 4
      src/csharp/build_packages.bat

@ -247,7 +247,8 @@ typedef struct {
const char *service_url;
/* The method name of the RPC being called (not fully qualified).
Can be NULL if no method name was found. */
The fully qualified method name can be built from the service_url:
full_qualified_method_name = ctx->service_url + '/' + ctx->method_name. */
const char *method_name;
/* The auth_context of the channel which gives the server's identity. */

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

@ -146,6 +146,7 @@ void build_auth_metadata_context(grpc_security_connector *sc,
*last_slash = '\0';
method_name = gpr_strdup(last_slash + 1);
}
if (method_name == NULL) method_name = gpr_strdup("");
gpr_asprintf(&service_url, "%s://%s%s",
sc->url_scheme == NULL ? "" : sc->url_scheme,
grpc_mdstr_as_c_string(calld->host), service);

@ -41,6 +41,6 @@ namespace Grpc.Core
/// <summary>
/// Current version of gRPC C#
/// </summary>
public const string CurrentVersion = "0.7.1";
public const string CurrentVersion = "0.12.0";
}
}

@ -1,8 +1,8 @@
@rem Builds gRPC NuGet packages
@rem Current package versions
set VERSION=0.7.1
set CORE_VERSION=0.11.1
set VERSION=0.12.0
set CORE_VERSION=0.12.0
set PROTOBUF_VERSION=3.0.0-alpha4
@rem Packages that depend on prerelease packages (like Google.Protobuf) need to have prerelease suffix as well.

Loading…
Cancel
Save