grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'credentials_naming_and_cleanup' of github.com:jboeuf/grpc into credentials_naming_and_cleanup

This commit is contained in:
Julien Boeuf 2015-08-27 15:49:27 -07:00
parent aa4fd51e55 8117ff81d1
commit 27f432b267
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/credentials.cc
View File

@ -186,7 +186,7 @@ NAN_METHOD(Credentials::CreateComposite) {
NAN_METHOD(Credentials::CreateGce) { NAN_METHOD(Credentials::CreateGce) {
NanScope(); NanScope();
grpc_credentials *creds = grpc_compute_engine_credentials_create(NULL); grpc_credentials *creds = grpc_google_compute_engine_credentials_create(NULL);
if (creds == NULL) { if (creds == NULL) {
NanReturnNull(); NanReturnNull();
} }
@ -204,7 +204,7 @@ NAN_METHOD(Credentials::CreateIam) {
NanUtf8String auth_token(args[0]); NanUtf8String auth_token(args[0]);
NanUtf8String auth_selector(args[1]); NanUtf8String auth_selector(args[1]);
grpc_credentials *creds = grpc_credentials *creds =
grpc_iam_credentials_create(*auth_token, *auth_selector, NULL); grpc_google_iam_credentials_create(*auth_token, *auth_selector, NULL);
if (creds == NULL) { if (creds == NULL) {
NanReturnNull(); NanReturnNull();
} }