]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' of github.com:ceph/ceph
authorSage Weil <sage@redhat.com>
Thu, 19 Mar 2015 20:05:01 +0000 (13:05 -0700)
committerSage Weil <sage@redhat.com>
Thu, 19 Mar 2015 20:05:01 +0000 (13:05 -0700)

Trivial merge