From: Alfredo Deza Date: Fri, 26 Feb 2016 13:23:58 +0000 (-0500) Subject: Merge remote-tracking branch 'gh/infernalis' into infernalis X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5eb2d6cf1ecb0c2d9b3caee10eff99c24d82b484;p=ceph.git Merge remote-tracking branch 'gh/infernalis' into infernalis --- 5eb2d6cf1ecb0c2d9b3caee10eff99c24d82b484