From: Yehuda Sadeh <yehuda@inktank.com>
Date: Mon, 30 Sep 2013 23:30:03 +0000 (-0700)
Subject: PendingReleaseNotes: update regarding librados change
X-Git-Tag: mark-v0.70-wip~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F665%2Fhead;p=ceph.git

PendingReleaseNotes: update regarding librados change

Fix related to issue #6444

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 6609acbd5a82..edf459c992f7 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -1,3 +1,10 @@
+v0.70
+~~~~~
+* librados::Rados::pool_create_async() and librados::Rados::pool_delete_async()
+  don't drop a reference to the completion object on error, caller needs to take
+  care of that. This has never really worked correctly and we were leaking an
+  object
+
 v0.68
 ~~~~~
 
@@ -25,4 +32,4 @@ v0.68
   full-width value.  The old method is deprecated and will be removed
   in a future release.  Users of the C++ librados API that make use of
   the get_version() method should modify their code to avoid getting a
-  value that is truncated from 64 to to 32 bits.
\ No newline at end of file
+  value that is truncated from 64 to to 32 bits.
diff --git a/src/vstart.sh b/src/vstart.sh
index c112bfc9138f..7cd553f23cab 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -249,11 +249,11 @@ if [ -n "$ip" ]; then
     IP="$ip"
 else
     echo hostname $HOSTNAME
-    RAW_IP=`hostname --ip-address`
+    RAW_IP=`hostname -I`
     # filter out IPv6 and localhost addresses
     IP="$(echo "$RAW_IP"|tr ' ' '\012'|grep -v :|grep -v '^127\.'|head -n1)"
     # if that left nothing, then try to use the raw thing, it might work
-    if [ -z "IP" ]; then IP="$RAW_IP"; fi
+    if [ -z "$IP" ]; then IP="$RAW_IP"; fi
     echo ip $IP
 fi
 echo "ip $IP"