]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' of github.com:ceph/ceph
authorSage Weil <sage@redhat.com>
Fri, 11 Mar 2016 16:14:55 +0000 (11:14 -0500)
committerSage Weil <sage@redhat.com>
Fri, 11 Mar 2016 16:14:55 +0000 (11:14 -0500)

Trivial merge