Merge remote-tracking branch 'gh/giant'

author Sage Weil <sage@redhat.com>

Tue, 21 Oct 2014 17:39:42 +0000 (10:39 -0700)

committer Sage Weil <sage@redhat.com>

Tue, 21 Oct 2014 17:39:42 +0000 (10:39 -0700)
author Sage Weil <sage@redhat.com>
Tue, 21 Oct 2014 17:39:42 +0000 (10:39 -0700)
committer Sage Weil <sage@redhat.com>
Tue, 21 Oct 2014 17:39:42 +0000 (10:39 -0700)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mds/Locker.cc
Simple merge
diff --cc src/osdc/Objecter.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 21 Oct 2014 17:39:42 +0000 (10:39 -0700)
committer	Sage Weil <sage@redhat.com>
	Tue, 21 Oct 2014 17:39:42 +0000 (10:39 -0700)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Locker.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history