]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4351 from ceph/wip-11256
authorJosh Durgin <jdurgin@redhat.com>
Tue, 14 Apr 2015 17:45:34 +0000 (10:45 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 14 Apr 2015 17:45:34 +0000 (10:45 -0700)
Wip 11256

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge