]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a41d09 d3c2b9c)
Merge branch 'dumpjournal' into unstable
authorGreg Farnum <gregf@hq.newdream.net>
Thu, 4 Nov 2010 18:58:30 +0000 (11:58 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Thu, 4 Nov 2010 18:58:30 +0000 (11:58 -0700)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.am
Simple merge
Unnamed repository; edit this file 'description' to name the repository.