]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-10507'
authorJoao Eduardo Luis <joao@suse.de>
Thu, 16 Jul 2015 17:40:57 +0000 (18:40 +0100)
committerJoao Eduardo Luis <joao@suse.de>
Thu, 16 Jul 2015 17:40:57 +0000 (18:40 +0100)
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Trivial merge