]> 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: 2675b0d 80f2f9c)
Merge branch 'wip-sam-testing-firefly' into firefly
authorSamuel Just <sam.just@inktank.com>
Tue, 23 Sep 2014 17:27:15 +0000 (10:27 -0700)
committerSamuel Just <sam.just@inktank.com>
Tue, 23 Sep 2014 17:27:15 +0000 (10:27 -0700)

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