From: Dan Mick <dan.mick@inktank.com>
Date: Mon, 10 Jun 2013 20:26:06 +0000 (-0700)
Subject: mon: send "osd create" output to stdout; tests rely on it
X-Git-Tag: v0.65~119
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a741aa073a1e26551eea2d2b63088eb6a060dfff;p=ceph.git

mon: send "osd create" output to stdout; tests rely on it

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 0a8451fc3ea8..d6e2e1cb5606 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3115,8 +3115,8 @@ done:
     if (!uuid.is_zero())
       pending_inc.new_uuid[i] = uuid;
     ss << i;
-    getline(ss, rs);
-    wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
+    rdata.append(ss);
+    wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, rdata, get_version()));
     return true;
 
   } else if (prefix == "osd blacklist") {