]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7147 from athanatos/wip-14247
authorSamuel Just <sjust@redhat.com>
Fri, 8 Jan 2016 19:41:55 +0000 (11:41 -0800)
committerSamuel Just <sjust@redhat.com>
Fri, 8 Jan 2016 19:41:55 +0000 (11:41 -0800)
Wip 14247

Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge