]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50285ec ca74b4b)
Merge branch 'atomic' into unstable
authorSage Weil <sage@newdream.net>
Fri, 23 Apr 2010 21:22:41 +0000 (14:22 -0700)
committerSage Weil <sage@newdream.net>
Fri, 23 Apr 2010 21:22:41 +0000 (14:22 -0700)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history

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