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: 8110204 06ec5ef)

author	Sage Weil <sage@redhat.com>
	Fri, 29 Aug 2014 23:10:16 +0000 (16:10 -0700)
committer	Sage Weil <sage@redhat.com>
	Fri, 29 Aug 2014 23:11:38 +0000 (16:11 -0700)
commit	21e25e77c25e3161f57dd23b46b98a0d8fed3294
tree	37d3e28cde33cdd92a17ebf06663ad33cf102bf3	tree \| snapshot
parent	81102044f417bd99ca570d9234b1df5195e9a8c9	commit \| diff
parent	06ec5ef5939ead876c0056e76fbbeebeb4878029	commit \| diff

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

Conflicts:
src/mds/RecoveryQueue.cc

Reviewed-by: Sage Weil <sage@redhat.com>

16 files changed:

src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/mds/RecoveryQueue.cc	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	diff1 \|	diff2 \|	blob \| history
src/mon/LogMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/LogMonitor.h	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	diff1 \|	diff2 \|	blob \| history
src/mon/MonmapMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Paxos.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history

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