]> 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: 0904c7b 80e2a5e)
Merge branch 'wip-msgr4'
authorSage Weil <sage@newdream.net>
Fri, 16 Mar 2012 18:31:13 +0000 (11:31 -0700)
committerSage Weil <sage@newdream.net>
Fri, 16 Mar 2012 18:31:13 +0000 (11:31 -0700)
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
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.