]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f68ff5 c7d11cd)
Merge remote-tracking branch 'origin/master' into wip-gc2
authorYehuda Sadeh <yehuda@inktank.com>
Mon, 27 Aug 2012 19:43:27 +0000 (12:43 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Mon, 27 Aug 2012 19:43:27 +0000 (12:43 -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.