]> 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: 5f4ceb2 5049fc4)
Merge remote-tracking branch 'origin/wip-8858-firefly' into firefly
authorJosh Durgin <josh.durgin@inktank.com>
Wed, 23 Jul 2014 17:09:19 +0000 (10:09 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Wed, 23 Jul 2014 17:09:19 +0000 (10:09 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

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