]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'kraken' into wip-18314 12599/head
authorSage Weil <sage@redhat.com>
Thu, 22 Dec 2016 13:53:23 +0000 (07:53 -0600)
committerGitHub <noreply@github.com>
Thu, 22 Dec 2016 13:53:23 +0000 (07:53 -0600)

Trivial merge