]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' of github.com:ceph/ceph
authorSage Weil <sage@redhat.com>
Wed, 10 Feb 2016 18:58:50 +0000 (13:58 -0500)
committerSage Weil <sage@redhat.com>
Wed, 10 Feb 2016 18:58:50 +0000 (13:58 -0500)

Trivial merge