master to 0.10.5

This commit is contained in:
tknew2 2014-08-31 13:23:03 +02:00
parent 4f935731b8
commit 41346c07d1
2 changed files with 1 additions and 3 deletions

View File

@ -278,7 +278,6 @@ Satan.launchDaemon = function launchDaemon(cb) {
err = fs.openSync(cst.PM2_LOG_FILE_PATH, 'a');
}
if (process.env.PM2_NODE_OPTIONS)
node_args = node_args.concat(process.env.PM2_NODE_OPTIONS.split(' '));
@ -305,7 +304,6 @@ Satan.launchDaemon = function launchDaemon(cb) {
setTimeout(function() {cb(null, child)}, 20);
return false;
});
});
};

View File

@ -1,7 +1,7 @@
{
"name": "pm2",
"preferGlobal": "true",
"version": "0.10.4",
"version": "0.10.5",
"os": [
"!win32"
],