]> 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: 37bf38f 3d7a949)
Merge remote-tracking branch 'upstream/wip-zfs'
authorSamuel Just <sam.just@inktank.com>
Fri, 16 Aug 2013 23:35:21 +0000 (16:35 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 16 Aug 2013 23:35:41 +0000 (16:35 -0700)
Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history
src/common/config_opts.h patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.am
Simple merge
diff --cc src/common/config_opts.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.