Merge remote-tracking branch 'origin/jewel'

author Josh Durgin <jdurgin@redhat.com>

Tue, 19 Jan 2016 21:44:31 +0000 (13:44 -0800)

committer Josh Durgin <jdurgin@redhat.com>

Tue, 19 Jan 2016 21:44:31 +0000 (13:44 -0800)
author Josh Durgin <jdurgin@redhat.com>
Tue, 19 Jan 2016 21:44:31 +0000 (13:44 -0800)
committer Josh Durgin <jdurgin@redhat.com>
Tue, 19 Jan 2016 21:44:31 +0000 (13:44 -0800)
diff --cc src/librados/IoCtxImpl.cc
Simple merge
diff --cc src/msg/simple/Pipe.cc
Simple merge
author	Josh Durgin <jdurgin@redhat.com>
	Tue, 19 Jan 2016 21:44:31 +0000 (13:44 -0800)
committer	Josh Durgin <jdurgin@redhat.com>
	Tue, 19 Jan 2016 21:44:31 +0000 (13:44 -0800)
		1	2
src/librados/IoCtxImpl.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/simple/Pipe.cc	patch \|	diff1 \|	diff2 \|	blob \| history