]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-object-corpus.git/commitdiff
Merge remote-tracking branch 'origin/kraken'
authorSage Weil <sage@redhat.com>
Fri, 5 May 2017 22:01:59 +0000 (18:01 -0400)
committerSage Weil <sage@redhat.com>
Fri, 5 May 2017 22:01:59 +0000 (18:01 -0400)

Trivial merge