]> 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: be11c31 a562518)
Merge branch 'wip-oc-hang' into next
authorJosh Durgin <josh.durgin@inktank.com>
Sat, 17 Nov 2012 00:43:00 +0000 (16:43 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Sat, 17 Nov 2012 00:43:07 +0000 (16:43 -0800)
Reviewed-by: Sage Weil <sage.weil@inktank.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.