From: Sage Weil Date: Thu, 3 Sep 2015 19:15:01 +0000 (-0400) Subject: Merge remote-tracking branch 'gh/master' into infernalis X-Git-Tag: v9.1.0~227 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=038e91b15de53efa7e17942979e52fdc4310cfbc;p=ceph.git Merge remote-tracking branch 'gh/master' into infernalis --- 038e91b15de53efa7e17942979e52fdc4310cfbc