From 904e7f53aeb585df4eacac5d549585654bed1fd8 Mon Sep 17 00:00:00 2001
From: David Garcia Quintas <dgq@google.com>
Date: Thu, 9 Mar 2017 15:02:19 -0800
Subject: Introducing 1.2.0-pre1

---
 src/node/health_check/package.json | 4 ++--
 src/node/tools/package.json        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/node')

diff --git a/src/node/health_check/package.json b/src/node/health_check/package.json
index 8376339deb..302f2606c6 100644
--- a/src/node/health_check/package.json
+++ b/src/node/health_check/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc-health-check",
-  "version": "1.2.0-dev",
+  "version": "1.2.0-pre1",
   "author": "Google Inc.",
   "description": "Health check service for use with gRPC",
   "repository": {
@@ -15,7 +15,7 @@
     }
   ],
   "dependencies": {
-    "grpc": "^1.2.0-dev",
+    "grpc": "^1.2.0-pre1",
     "lodash": "^3.9.3",
     "google-protobuf": "^3.0.0"
   },
diff --git a/src/node/tools/package.json b/src/node/tools/package.json
index 53dd53f539..78071ad55a 100644
--- a/src/node/tools/package.json
+++ b/src/node/tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc-tools",
-  "version": "1.2.0-dev",
+  "version": "1.2.0-pre1",
   "author": "Google Inc.",
   "description": "Tools for developing with gRPC on Node.js",
   "homepage": "http://www.grpc.io/",
-- 
cgit v1.2.3


From 9d68158d13dda1ca0437b6c773ca2c3276fe2f4c Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Thu, 9 Mar 2017 15:37:21 -0800
Subject: Change argument validation in Server#addService

---
 src/node/src/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/node')

diff --git a/src/node/src/server.js b/src/node/src/server.js
index 8a7eff507d..a5a0ea2642 100644
--- a/src/node/src/server.js
+++ b/src/node/src/server.js
@@ -728,7 +728,7 @@ var defaultHandler = {
  *     method implementation for the provided service.
  */
 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');
   }
   if (_.keys(service).length === 0) {
-- 
cgit v1.2.3