Merge pull request #14874 from ceph/wip-19805-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Sun, 27 Aug 2017 16:10:39 +0000 (18:10 +0200)

committer GitHub <noreply@github.com>

Sun, 27 Aug 2017 16:10:39 +0000 (18:10 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Sun, 27 Aug 2017 16:10:39 +0000 (18:10 +0200)
committer GitHub <noreply@github.com>
Sun, 27 Aug 2017 16:10:39 +0000 (18:10 +0200)
diff --cc src/librbd/internal.cc
Simple merge
diff --cc src/librbd/internal.h
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Sun, 27 Aug 2017 16:10:39 +0000 (18:10 +0200)
committer	GitHub <noreply@github.com>
	Sun, 27 Aug 2017 16:10:39 +0000 (18:10 +0200)
		1	2
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/internal.h	patch \|	diff1 \|	diff2 \|	blob \| history