From c70c55cd1a96f0a8d63c4d7011090700c3a50479 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 15 Feb 2016 09:42:55 +0000 Subject: [PATCH] Fixing changelog and stopContainer git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/distributions/smartgears-distribution-bundle@124165 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 9 +++++++++ src/resources/stopContainer.sh | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/distro/changelog.xml b/distro/changelog.xml index 6c46cac..d8a74e8 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,13 @@ + + Environment variable values replaced instead of just appended in ~/.bashrc (refs #2179) + + + Environment variable values replaced instead of just appended in ~/.bashrc (refs #2179) + + + Improved setup (refs #77) + Passing smartgears-distribution version as argument when compiling Used tomcat 7 range instead of fixed version diff --git a/src/resources/stopContainer.sh b/src/resources/stopContainer.sh index 7b5c742..fe82cb9 100755 --- a/src/resources/stopContainer.sh +++ b/src/resources/stopContainer.sh @@ -1,3 +1,4 @@ #!/bin/bash cd $BUNDLE_HOME -$CATALINA_HOME/bin/shutdown.sh +# Waiting 30 seconds for sane termination +$CATALINA_HOME/bin/shutdown.sh 30