]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-test-ceph-disk'
authorSage Weil <sage@redhat.com>
Wed, 6 Aug 2014 17:41:36 +0000 (10:41 -0700)
committerSage Weil <sage@redhat.com>
Wed, 6 Aug 2014 17:41:36 +0000 (10:41 -0700)

Trivial merge