]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88ebb30 c87fc69)
Merge remote branch 'origin/next'
authorJosh Durgin <josh.durgin@dreamhost.com>
Fri, 22 Apr 2011 20:39:07 +0000 (13:39 -0700)
committerJosh Durgin <josh.durgin@dreamhost.com>
Fri, 22 Apr 2011 20:39:07 +0000 (13:39 -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.