Merge pull request #2722 from ceph/wip-9598

author Sage Weil <sage@redhat.com>

Wed, 12 Nov 2014 18:01:50 +0000 (10:01 -0800)

committer Sage Weil <sage@redhat.com>

Wed, 12 Nov 2014 18:01:50 +0000 (10:01 -0800)
author Sage Weil <sage@redhat.com>
Wed, 12 Nov 2014 18:01:50 +0000 (10:01 -0800)
committer Sage Weil <sage@redhat.com>
Wed, 12 Nov 2014 18:01:50 +0000 (10:01 -0800)
diff --cc src/msg/simple/Pipe.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 12 Nov 2014 18:01:50 +0000 (10:01 -0800)
committer	Sage Weil <sage@redhat.com>
	Wed, 12 Nov 2014 18:01:50 +0000 (10:01 -0800)
		1	2
src/msg/simple/Pipe.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history