]> 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, 22 Dec 2016 03:21:41 +0000 (22:21 -0500)
committerSage Weil <sage@redhat.com>
Thu, 22 Dec 2016 03:21:41 +0000 (22:21 -0500)

Trivial merge