]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' of github.com:ceph/ceph
authorSage Weil <sage@redhat.com>
Tue, 5 Aug 2014 16:15:34 +0000 (09:15 -0700)
committerSage Weil <sage@redhat.com>
Tue, 5 Aug 2014 16:15:34 +0000 (09:15 -0700)

Trivial merge