Commit 84326a57 authored by Bryan Tong's avatar Bryan Tong

Merge branch 'master' into 'master'

Update kado version, and fix watch definition.

See merge request !44
parents 142a51c7 706c7f27
......@@ -16,7 +16,7 @@ if (process.env.command !== 'session' && cluster.isMaster()) {
cluster.timeout.watch = 500
cluster.watch(
fs.path.resolve(process.argv[1] + '.js'),
fs.path.join(__dirname, 'main/route')
fs.path.join(__dirname, 'lib')
)
// start child and cluster
child.start()
......
......@@ -91,8 +91,8 @@
"dev": true
},
"kado": {
"version": "git+ssh://git@git.nullivex.com:kado/kado.git#d8b144e7cb4e6afa4ab341e1ebbb251b8e2a38be",
"from": "git+ssh://git@git.nullivex.com:kado/kado.git#master"
"version": "git+https://git.nullivex.com/kado/kado.git#0fdd592b8e626315e41504a273eef9d56eebfc17",
"from": "git+https://git.nullivex.com/kado/kado.git"
},
"locate-path": {
"version": "3.0.0",
......
......@@ -19,7 +19,7 @@
},
"main": "./app.js",
"dependencies": {
"kado": "git+ssh://git@git.nullivex.com:kado/kado.git#master"
"kado": "git+https://git.nullivex.com/kado/kado.git"
},
"devDependencies": {
"highlight.js": "^9.18.1",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment