Merge remote-tracking branch 'origin/jewel'

author Josh Durgin <jdurgin@redhat.com>

Tue, 22 Dec 2015 00:59:51 +0000 (16:59 -0800)

committer Josh Durgin <jdurgin@redhat.com>

Tue, 22 Dec 2015 00:59:51 +0000 (16:59 -0800)
author Josh Durgin <jdurgin@redhat.com>
Tue, 22 Dec 2015 00:59:51 +0000 (16:59 -0800)
committer Josh Durgin <jdurgin@redhat.com>
Tue, 22 Dec 2015 00:59:51 +0000 (16:59 -0800)
diff --cc src/librbd/ImageCtx.cc
Simple merge
diff --cc src/librbd/LibrbdWriteback.cc
Simple merge
diff --cc src/librbd/LibrbdWriteback.h
Simple merge
author	Josh Durgin <jdurgin@redhat.com>
	Tue, 22 Dec 2015 00:59:51 +0000 (16:59 -0800)
committer	Josh Durgin <jdurgin@redhat.com>
	Tue, 22 Dec 2015 00:59:51 +0000 (16:59 -0800)
		1	2
src/librbd/ImageCtx.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/LibrbdWriteback.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/LibrbdWriteback.h	patch \|	diff1 \|	diff2 \|	blob \| history