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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1d0aa2a 7e0e096)

author	Sage Weil <sage@inktank.com>
	Wed, 29 May 2013 17:26:56 +0000 (10:26 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 29 May 2013 17:26:56 +0000 (10:26 -0700)
commit	532dee523ab250dc08cb96578ef8bcc6bba55584
tree	8a0a1320d8d9b71bac35c7dea678ea175b49430d	tree \| snapshot
parent	1d0aa2add3fd768d767ae3b0d4d62922904aae94	commit \| diff
parent	7e0e0963ed027387f3d575c532dd85ae029ed063	commit \| diff

Merge remote-tracking branch 'yan/wip-mds'

Reviewed-by: Sage Weil <sage@inktank.com>
Conflicts:
src/mds/MDCache.cc

src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/mds/Locker.cc	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	diff1 \|	diff2 \|	blob \| history
src/mds/Migrator.cc	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	diff1 \|	diff2 \|	blob \| history
src/msg/Message.h	diff1 \|	diff2 \|	blob \| history

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