]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-8639'
authorSage Weil <sage@redhat.com>
Thu, 28 Aug 2014 17:59:40 +0000 (10:59 -0700)
committerSage Weil <sage@redhat.com>
Thu, 28 Aug 2014 17:59:40 +0000 (10:59 -0700)
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>

Trivial merge