Merge branch 'master' into cq_create_api_changes

This commit is contained in:
Sree Kuchibhotla 2017-03-21 10:28:40 -07:00
commit 1d52e73a24
3 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "grpc-health-check", "name": "grpc-health-check",
"version": "1.2.0-dev", "version": "1.3.0-dev",
"author": "Google Inc.", "author": "Google Inc.",
"description": "Health check service for use with gRPC", "description": "Health check service for use with gRPC",
"repository": { "repository": {
@ -15,7 +15,7 @@
} }
], ],
"dependencies": { "dependencies": {
"grpc": "^1.2.0-dev", "grpc": "^1.3.0-dev",
"lodash": "^3.9.3", "lodash": "^3.9.3",
"google-protobuf": "^3.0.0" "google-protobuf": "^3.0.0"
}, },

View File

@ -728,7 +728,7 @@ var defaultHandler = {
* method implementation for the provided service. * method implementation for the provided service.
*/ */
Server.prototype.addService = function(service, implementation) { Server.prototype.addService = function(service, implementation) {
if (!_.isObjectLike(service) || !_.isObjectLike(implementation)) { if (!_.isObject(service) || !_.isObject(implementation)) {
throw new Error('addService requires two objects as arguments'); throw new Error('addService requires two objects as arguments');
} }
if (_.keys(service).length === 0) { if (_.keys(service).length === 0) {

View File

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