]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/kraken'
authorSage Weil <sage@redhat.com>
Thu, 6 Oct 2016 16:08:51 +0000 (12:08 -0400)
committerSage Weil <sage@redhat.com>
Thu, 6 Oct 2016 16:08:51 +0000 (12:08 -0400)

Trivial merge