]> 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: 4605fdd e6dd068)
Merge remote branch 'origin/next'
authorJosh Durgin <josh.durgin@inktank.com>
Thu, 13 Dec 2012 16:30:22 +0000 (08:30 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Thu, 13 Dec 2012 16:30:22 +0000 (08:30 -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.