dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17717
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-12-16 18:16:43 +0100
message:
  Resources
modified:
  resources/util/backport
  resources/util/tomcat


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'resources/util/backport'
--- resources/util/backport	2013-12-02 10:54:42 +0000
+++ resources/util/backport	2014-12-16 17:16:43 +0000
@@ -21,6 +21,8 @@
 echo "Reverted local changes"
 bzr up
 echo "Updated branch"
+
+# Update lp:dhis2 with local repo for faster merge
 bzr merge lp:dhis2 -r ${REV}..${TOREV}
 echo "Merged revision ${TOREV}"
 echo "To commit changes: bzr commit -m \"R ${TOREV}\""

=== modified file 'resources/util/tomcat'
--- resources/util/tomcat	2014-05-11 11:31:33 +0000
+++ resources/util/tomcat	2014-12-16 17:16:43 +0000
@@ -5,7 +5,8 @@
 
 case $1 in
 start) 
-  ${TOMCAT_LOCAL}/bin/startup.sh 
+  ${TOMCAT_LOCAL}/bin/startup.sh
+  tail -f ${TOMCAT_LOCAL}/logs/catalina.out
   ;;
 stop)
   ${TOMCAT_LOCAL}/bin/shutdown.sh