]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/infernalis'
authorSage Weil <sage@redhat.com>
Tue, 15 Sep 2015 21:42:42 +0000 (17:42 -0400)
committerSage Weil <sage@redhat.com>
Tue, 15 Sep 2015 21:42:42 +0000 (17:42 -0400)

Trivial merge