]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3dfb596 f48a033)
Merge pull request #2027 from athanatos/wip-7999-master
authorSamuel Just <sam.just@inktank.com>
Mon, 30 Jun 2014 18:11:16 +0000 (11:11 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 30 Jun 2014 18:11:16 +0000 (11:11 -0700)
Wip 7999 master

Fixes: #7999
Backport: Firefly
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.