]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-11067' into hammer
authorJosh Durgin <jdurgin@redhat.com>
Tue, 10 Mar 2015 22:42:21 +0000 (15:42 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 10 Mar 2015 22:42:21 +0000 (15:42 -0700)
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge