From: Sage Weil <sage@redhat.com>
Date: Thu, 5 Nov 2015 00:40:17 +0000 (-0500)
Subject: Merge tag 'v9.2.0'
X-Git-Tag: v10.0.0~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3eccde9d9c286e7bdf82f7c5d8b4d4f9d544d8b2;p=ceph.git

Merge tag 'v9.2.0'

v9.2.0
---

3eccde9d9c286e7bdf82f7c5d8b4d4f9d544d8b2
diff --cc src/init-rbdmap
index bb2bf2d7e641,bad2754fa535..8650ed4cd3a5
--- a/src/init-rbdmap
+++ b/src/init-rbdmap
@@@ -42,13 -43,11 +43,12 @@@ do_map() 
  			DEV=rbd/$DEV
  			;;
  		esac
- 		log_action_begin_msg "${DESC} '${DEV}'"
+ 		logger -p "daemon.debug" -t init-rbdmap "Mapping '${DEV}'"
  		newrbd=""
  		MAP_RV=""
- 		RET_OP=0
  		OIFS=$IFS
  		IFS=','
 +		CMDPARAMS=""
  		for PARAM in ${PARAMS[@]}; do
  			CMDPARAMS="$CMDPARAMS --$(echo $PARAM | tr '=' ' ')"
  		done