]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' of git://github.com/flaf/ceph
authorSage Weil <sage@redhat.com>
Thu, 28 Aug 2014 21:27:12 +0000 (14:27 -0700)
committerSage Weil <sage@redhat.com>
Thu, 28 Aug 2014 21:27:12 +0000 (14:27 -0700)
Signed-off-by: Sage Weil <sage@redhat.com>

Trivial merge