killbill-uncached

Merge remote-tracking branch 'origin/master' into rbac

8/16/2013 5:39:23 PM

Pierre-Alexandre Meyer

Commit: 8b92ec1

Tree: d9ed3dd

Parents: d3b72d3
fec7721

Changes

bin/start-server 2(+1 -1)

Details

bin/start-server 2(+1 -1)

diff --git a/bin/start-server b/bin/start-server
index f6132f6..72e86b4 100755
--- a/bin/start-server
+++ b/bin/start-server
@@ -23,7 +23,7 @@ HERE=`cd \`dirname $0\`; pwd`
 TOP=$HERE/..
 SERVER=$TOP/server
 
-PROPERTIES="$SERVER/src/main/resources/killbill-server.properties"
+PROPERTIES=${PROPERTIES-"$SERVER/src/main/resources/killbill-server.properties"}
 
 DEBUG_OPTS_ECLIPSE=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=12345 "
 DEBUG_OPTS_ECLIPSE_WAIT=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=12345 "