git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3a53d6d 9265d76)

author	Sage Weil <sage@inktank.com>
	Fri, 31 Jan 2014 15:00:49 +0000 (07:00 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 31 Jan 2014 15:00:49 +0000 (07:00 -0800)
commit	f8316f1a1a9ecdaebd870ad85159d71ba3429950
tree	69631a88ed4d8de6e3f194b73596ed51f5e4422d	tree \| snapshot
parent	3a53d6deae126ef59a69bf024f35ced98644e7e6	commit \| diff
parent	9265d76a259e38cb03fc26ddd2686169bdf595fa	commit \| diff

Merge branch 'wip-inline' of git://github.com/kylinstorage/ceph

Conflicts:
src/include/ceph_features.h

src/client/Client.cc	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/include/ceph_features.h	diff1 \|	diff2 \|	blob \| history
src/mds/mdstypes.h	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.