]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit967dc2388c6aaa8a36464f9a35e5638f6685e445
tree0bb6c49669c7f7758820f27f4f6ea5ee7effa1cftree | snapshot
parent37bf38f7e8b25414e17114c1f196a92b4e375ac7commit | diff
parent3d7a94954c58b80ca15219449b197bc45f6cd2adcommit | diff
Merge remote-tracking branch 'upstream/wip-zfs'

Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
src/Makefile.am diff1 | diff2 | blob | history
src/common/config_opts.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.