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: 96e365b e0bc555)

author	Sage Weil <sage@inktank.com>
	Tue, 16 Oct 2012 03:57:19 +0000 (20:57 -0700)
committer	Sage Weil <sage@inktank.com>
	Tue, 16 Oct 2012 03:57:19 +0000 (20:57 -0700)
commit	fcf6273d04dc0c0061b4e3ad9cd715abe0f97ee5
tree	221a1ab8e2fab89b00be4590f953df936ec6af16	tree \| snapshot
parent	96e365be85fc6f86a518cf17f6a6765c11a179ef	commit \| diff
parent	e0bc5556aa14e1f51ebeaddd731a3ca57734795e	commit \| diff

Merge remote-tracking branch 'gh/wip-msgauth4'

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/ceph_osd.cc	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/include/types.h	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history

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