]> 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: 2d2dc13 1ff8f76)
Merge branch 'hammer' of github.com:ceph/ceph into hammer
authorSage Weil <sage@redhat.com>
Wed, 11 Feb 2015 17:20:19 +0000 (09:20 -0800)
committerSage Weil <sage@redhat.com>
Wed, 11 Feb 2015 17:20:19 +0000 (09:20 -0800)
mon bits
Reviewed-by: Sage Weil <sage@redhat.com>
cli bits
Reviewed-by: Dan Mick <dmick@redhat.com>

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