Merge pull request #4255 from Ved-vampir/osdccnt

author John Spray <jcspray@gmail.com>

Tue, 7 Apr 2015 13:10:04 +0000 (14:10 +0100)

committer John Spray <jcspray@gmail.com>

Tue, 7 Apr 2015 13:10:04 +0000 (14:10 +0100)
author John Spray <jcspray@gmail.com>
Tue, 7 Apr 2015 13:10:04 +0000 (14:10 +0100)
committer John Spray <jcspray@gmail.com>
Tue, 7 Apr 2015 13:10:04 +0000 (14:10 +0100)
diff --cc src/mon/Paxos.cc
Simple merge
diff --cc src/osdc/Objecter.cc
Simple merge
author	John Spray <jcspray@gmail.com>
	Tue, 7 Apr 2015 13:10:04 +0000 (14:10 +0100)
committer	John Spray <jcspray@gmail.com>
	Tue, 7 Apr 2015 13:10:04 +0000 (14:10 +0100)
		1	2
src/mon/Paxos.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history