]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'kraken'
authorSage Weil <sage@redhat.com>
Wed, 29 Jun 2016 14:01:01 +0000 (10:01 -0400)
committerSage Weil <sage@redhat.com>
Wed, 29 Jun 2016 14:01:01 +0000 (10:01 -0400)

Trivial merge