From: Sage Weil Date: Wed, 11 Feb 2015 17:21:36 +0000 (-0800) Subject: Merge remote-tracking branch 'gh/master' into hammer X-Git-Tag: v0.93~62 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa03d6a84c5f92a78ca1a54f2107be2027cbb2c2;p=ceph.git Merge remote-tracking branch 'gh/master' into hammer --- aa03d6a84c5f92a78ca1a54f2107be2027cbb2c2