From 380587bde6444edcc8c0b3adad250de70b27ad33 Mon Sep 17 00:00:00 2001
From: Malini Kamalambal <malini.kamalambal@rackspace.com>
Date: Fri, 14 Mar 2014 12:22:18 -0400
Subject: [PATCH] Rollback workaround for Marconi

This patch rollsback the stderr redirection in Marconi.

Change-Id: Iaa2d897295cf2bc2e4a8c370d3e0592def337c78
---
 lib/marconi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/marconi b/lib/marconi
index 3c4547fc75..fd1c35132a 100644
--- a/lib/marconi
+++ b/lib/marconi
@@ -154,7 +154,7 @@ function install_marconiclient {
 
 # start_marconi() - Start running processes, including screen
 function start_marconi {
-    screen_it marconi-server "marconi-server --config-file $MARCONI_CONF 2>&1"
+    screen_it marconi-server "marconi-server --config-file $MARCONI_CONF"
     echo "Waiting for Marconi to start..."
     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
         die $LINENO "Marconi did not start"