]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/infernalis'
authorSage Weil <sage@redhat.com>
Fri, 28 Aug 2015 19:20:04 +0000 (15:20 -0400)
committerSage Weil <sage@redhat.com>
Fri, 28 Aug 2015 19:20:04 +0000 (15:20 -0400)

Trivial merge