Merge remote-tracking branch 'origin/jewel'

author Josh Durgin <jdurgin@redhat.com>

Thu, 24 Dec 2015 00:32:00 +0000 (16:32 -0800)

committer Josh Durgin <jdurgin@redhat.com>

Thu, 24 Dec 2015 00:32:00 +0000 (16:32 -0800)
author Josh Durgin <jdurgin@redhat.com>
Thu, 24 Dec 2015 00:32:00 +0000 (16:32 -0800)
committer Josh Durgin <jdurgin@redhat.com>
Thu, 24 Dec 2015 00:32:00 +0000 (16:32 -0800)
diff --cc src/librbd/ImageCtx.cc
Simple merge
diff --cc src/librbd/internal.cc
Simple merge
diff --cc src/librbd/operation/SnapshotRemoveRequest.cc
Simple merge
author	Josh Durgin <jdurgin@redhat.com>
	Thu, 24 Dec 2015 00:32:00 +0000 (16:32 -0800)
committer	Josh Durgin <jdurgin@redhat.com>
	Thu, 24 Dec 2015 00:32:00 +0000 (16:32 -0800)
		1	2
src/librbd/ImageCtx.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/operation/SnapshotRemoveRequest.cc	patch \|	diff1 \|	diff2 \|	blob \| history