]> 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: e087862 c7fbf27)
Merge remote-tracking branch 'gh/firefly-next' into firefly
authorSage Weil <sage@redhat.com>
Tue, 12 Aug 2014 21:38:33 +0000 (14:38 -0700)
committerSage Weil <sage@redhat.com>
Tue, 12 Aug 2014 21:38:33 +0000 (14:38 -0700)

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