Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@redhat.com>

Sat, 10 Jan 2015 05:43:49 +0000 (21:43 -0800)

committer Sage Weil <sage@redhat.com>

Sat, 10 Jan 2015 05:43:49 +0000 (21:43 -0800)
author Sage Weil <sage@redhat.com>
Sat, 10 Jan 2015 05:43:49 +0000 (21:43 -0800)
committer Sage Weil <sage@redhat.com>
Sat, 10 Jan 2015 05:43:49 +0000 (21:43 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 10 Jan 2015 05:43:49 +0000 (21:43 -0800)
committer	Sage Weil <sage@redhat.com>
	Sat, 10 Jan 2015 05:43:49 +0000 (21:43 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history