Skip to content

Commit 0629b9d

Browse files
committed
v0.12.15 pre-release
1 parent 8d46312 commit 0629b9d

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
- YAML support for apps declarations
66
- Improve app declaration file parsing (log_file, out_file, error_file)
77

8-
# 0.12.15 (Coming next)
8+
# 0.12.15 (Current Stable)
99

10+
- Fix #941 : Env variables overrided when an app is restarted
1011
- max_memory_restart now performs a graceful reload
1112
- `pm2 logs --raw` now shows 20 last lines of each log file
1213
- pm2-dev run app.js : start an app in dev mode (--no-daemon --watch and stream logs of all launched apps)
1314
- --no-daemon command now display logs of all processes (Docker)
1415

15-
# 0.12.14 (Current Stable)
16+
# 0.12.14
1617

1718
- `ilogs` is no longer part of PM2
1819
- Improved interaction with Keymetrics

lib/Common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ Common.extend = function(origin, add){
321321
if (!add || typeof add != 'object') return origin;
322322

323323
//Ignore PM2's set environment variables from the nested env
324-
var keysToIgnore = ['name', 'exec_mode', 'env', 'pm_cwd', 'exec_interpreter', 'pm_exec_path', 'node_args', 'pm_out_log_path', 'pm_err_log_path', 'pm_pid_path', 'pm_id', 'status', 'pm_uptime', 'created_at', 'started_inside', 'unstable_restarts', 'restart_time', 'pm_id', 'axm_actions', 'pmx_module', 'command', 'watch', 'versioning', 'vizion_runing', 'MODULE_DEBUG'];
324+
var keysToIgnore = ['name', 'exec_mode', 'env', 'args', 'pm_cwd', 'exec_interpreter', 'pm_exec_path', 'node_args', 'pm_out_log_path', 'pm_err_log_path', 'pm_pid_path', 'pm_id', 'status', 'pm_uptime', 'created_at', 'started_inside', 'unstable_restarts', 'restart_time', 'pm_id', 'axm_actions', 'pmx_module', 'command', 'watch', 'versioning', 'vizion_runing', 'MODULE_DEBUG'];
325325

326326
var keys = Object.keys(add);
327327
var i = keys.length;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "pm2",
33
"preferGlobal": "true",
4-
"version": "0.12.14",
4+
"version": "0.12.15",
55
"engines": {
66
"node": ">=0.10"
77
},

0 commit comments

Comments
 (0)