]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge branch 'master' of github.com:ceph/ceph
authorSage Weil <sage@redhat.com>
Mon, 7 Mar 2016 20:58:44 +0000 (15:58 -0500)
committerSage Weil <sage@redhat.com>
Mon, 7 Mar 2016 20:58:44 +0000 (15:58 -0500)

Trivial merge