]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3524 from ceph/wip-8251-2
authorJosh Durgin <jdurgin@redhat.com>
Thu, 29 Jan 2015 16:54:40 +0000 (08:54 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 29 Jan 2015 16:54:40 +0000 (08:54 -0800)
Wip 8251 2

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

Trivial merge