]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-8860'
authorSage Weil <sage@redhat.com>
Tue, 12 Aug 2014 19:22:31 +0000 (12:22 -0700)
committerSage Weil <sage@redhat.com>
Tue, 12 Aug 2014 19:22:31 +0000 (12:22 -0700)
Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge