Merge remote-tracking branch 'openshift/master'

# Conflicts: # package.json
sahat · Jul 19, 2016 · 0948eb7 · 0948eb7
2 parents 005b2d8 + ad11abe
commit 0948eb7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.openshift/markers/use_npm b/.openshift/markers/use_npm
diff --git a/package.json b/package.json
@@ -4,10 +4,8 @@
   "version": "0.15.0",
   "main": "dist/satellizer.js",
   "scripts": {
-    "start": "pm2 start ./examples/server/node/server.js",
-    "stop": "pm2 stop all",
+    "start": "supervisor ./examples/server/node/server.js",
     "test": "karma start",
-    "dev": "node ./examples/server/node/server.js",
     "build": "npm run clean && tsc && rollup -c && uglifyjs dist/satellizer.js -o dist/satellizer.min.js",
     "clean": "rimraf build dist",
     "copy": "cp dist/satellizer.js examples/client/vendor && cp -R examples/client/ examples/server/php/public/"