]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-8902'
authorJosh Durgin <jdurgin@redhat.com>
Sat, 24 Jan 2015 23:37:09 +0000 (15:37 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Sat, 24 Jan 2015 23:37:09 +0000 (15:37 -0800)
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge