From: Samuel Just Date: Fri, 29 Mar 2013 19:14:22 +0000 (-0700) Subject: Merge remote-tracking branch 'upstream/bobtail-4556' into bobtail X-Git-Tag: v0.56.5~20 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e6eace2334d04fc9292c96a843304d1748b5bbe7;p=ceph.git Merge remote-tracking branch 'upstream/bobtail-4556' into bobtail Reviewed-by: Samuel Just --- e6eace2334d04fc9292c96a843304d1748b5bbe7