]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2 from ceph/master 11637/head
authorliupan1111 <liupan1111@users.noreply.github.com>
Tue, 1 Nov 2016 10:59:40 +0000 (18:59 +0800)
committerGitHub <noreply@github.com>
Tue, 1 Nov 2016 10:59:40 +0000 (18:59 +0800)
rebase new code


Trivial merge