From c1ebe66bfab328c5192a35c21ea290b5c45f40f5 Mon Sep 17 00:00:00 2001
From: Aidan Skinner <aidan@apache.org>
Date: Wed, 9 Sep 2009 13:05:43 +0000
Subject: Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@812936 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/qpidd.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'qpid/cpp/src/qpidd.cpp')

diff --git a/qpid/cpp/src/qpidd.cpp b/qpid/cpp/src/qpidd.cpp
index 9c3c6b0c4b..1839a62205 100644
--- a/qpid/cpp/src/qpidd.cpp
+++ b/qpid/cpp/src/qpidd.cpp
@@ -77,7 +77,7 @@ int main(int argc, char* argv[])
         return broker.execute(options.get());
     }
     catch(const exception& e) {
-        QPID_LOG(critical, "Broker start-up failed: " << e.what());
+        QPID_LOG(critical, "Unexpected error: " << e.what());
     }
     return 1;
 }
-- 
cgit v1.2.1