From 6469c21900d6d1a78af37b1b86e7732049d659dd Mon Sep 17 00:00:00 2001
From: Ian Chen <ichen@osrfoundation.org>
Date: Mon, 29 Jan 2018 13:09:03 -0800
Subject: [PATCH 1/2] deploy arg

---
 package.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 3169a1af..e5c717c9 100644
--- a/package.json
+++ b/package.json
@@ -7,14 +7,13 @@
     "url": "https://bitbucket.org/osrf/gzweb"
   },
   "config": {
-    "port": "",
-    "deploy_op": ""
+    "port": ""
   },
   "scripts": {
     "test": "./node_modules/.bin/eslint gz3d/src/*.js gz3d/test/*.js gzbridge/server.js && ./node_modules/karma/bin/karma start --singleRun",
     "update": "./node_modules/.bin/grunt build && cd build && cmake ..",
     "start": "if [ $npm_config_port ]; then port=$npm_config_port; fi; cd gzbridge && ./server.js $port",
-    "deploy": "if [ $npm_config_deploy_op ]; then ./deploy.sh -$npm_config_deploy_op; else ./deploy.sh; fi;",
+    "deploy": "./deploy.sh",
     "docs": "./node_modules/.bin/grunt doc",
     "coverage": "codecov"
   },

From c15ad76b8a5a6ead066978e9ee41fe1364e4c076 Mon Sep 17 00:00:00 2001
From: Louise Poubel <lupoubel@hotmail.com>
Date: Mon, 29 Jan 2018 23:38:09 +0000
Subject: [PATCH 2/2] Close branch deploy_arg