]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-9658' into giant
authorSage Weil <sage@redhat.com>
Mon, 6 Oct 2014 22:52:24 +0000 (15:52 -0700)
committerSage Weil <sage@redhat.com>
Mon, 6 Oct 2014 22:52:24 +0000 (15:52 -0700)

Trivial merge