diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-09-16 16:53:47 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-09-16 16:53:47 +0200 |
| commit | ef38e1b3082675fdd7ceea051995b764864d2dc7 (patch) | |
| tree | 4f71d331712de7d02b952c5a876582b561af56eb | |
| parent | c66350f67c0131ee06c227fa23e40ef33e4e3df7 (diff) | |
| parent | 08fb3803a26d57c27cf9f0ef23c2fa49d15d0d33 (diff) | |
| download | otp-ef38e1b3082675fdd7ceea051995b764864d2dc7.tar.gz otp-ef38e1b3082675fdd7ceea051995b764864d2dc7.tar.bz2 otp-ef38e1b3082675fdd7ceea051995b764864d2dc7.zip | |
Merge branch 'master' of git-server:otp
| -rw-r--r-- | erts/epmd/src/epmd.c | 4 | ||||
| -rw-r--r-- | lib/megaco/src/app/megaco.appup.src | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c index 9630e0cdf0..0823dcaa4e 100644 --- a/erts/epmd/src/epmd.c +++ b/erts/epmd/src/epmd.c @@ -345,7 +345,7 @@ static void run_daemon(EpmdVars *g) inform it of that the log is closed. */ closelog(); - /* These chouldn't be needed but for safety... */ + /* These shouldn't be needed but for safety... */ open("/dev/null", O_RDONLY); /* Order is important! */ open("/dev/null", O_WRONLY); @@ -386,7 +386,7 @@ static void run_daemon(EpmdVars *g) close(1); close(2); - /* These chouldn't be needed but for safety... */ + /* These shouldn't be needed but for safety... */ open("nul", O_RDONLY); open("nul", O_WRONLY); diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src index db59f55b55..a3a2e2ea9c 100644 --- a/lib/megaco/src/app/megaco.appup.src +++ b/lib/megaco/src/app/megaco.appup.src @@ -174,11 +174,19 @@ %% | %% v %% 3.17.0.3 +%% | +%% v +%% 3.17.1 +%% | +%% v +%% 3.17.2 %% %% {"%VSN%", [ + {"3.17.1", [{restart_application,megaco}]}, + {"3.17.0.3", [{restart_application,megaco}]}, {"3.17.0.2", []}, {"3.17.0.1", []}, {"3.17", []}, @@ -190,6 +198,8 @@ } ], [ + {"3.17.1", [{restart_application,megaco}]}, + {"3.17.0.3", [{restart_application,megaco}]}, {"3.17.0.2", []}, {"3.17.0.1", []}, {"3.17", []}, |