]> 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: 92ca3ef 643b9db)
Merge remote branch 'gh/wip-admin-socket'
authorSage Weil <sage.weil@dreamhost.com>
Sun, 8 Jan 2012 16:16:56 +0000 (08:16 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Sun, 8 Jan 2012 16:16:56 +0000 (08:16 -0800)
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.