Browse code

Merge "Rollback workaround for Marconi"

Jenkins authored on 2014/03/15 06:40:32
Showing 1 changed files
... ...
@@ -154,7 +154,7 @@ function install_marconiclient {
154 154
 
155 155
 # start_marconi() - Start running processes, including screen
156 156
 function start_marconi {
157
-    screen_it marconi-server "marconi-server --config-file $MARCONI_CONF 2>&1"
157
+    screen_it marconi-server "marconi-server --config-file $MARCONI_CONF"
158 158
     echo "Waiting for Marconi to start..."
159 159
     if ! timeout $SERVICE_TIMEOUT sh -c "while ! wget --no-proxy -q -O- $MARCONI_SERVICE_PROTOCOL://$MARCONI_SERVICE_HOST:$MARCONI_SERVICE_PORT/v1/health; do sleep 1; done"; then
160 160
         die $LINENO "Marconi did not start"