Merge pull request #16113 from smithfarm/wip-19807-kraken

author Nathan Cutler <presnypreklad@gmail.com>

Thu, 6 Jul 2017 15:46:06 +0000 (17:46 +0200)

committer GitHub <noreply@github.com>

Thu, 6 Jul 2017 15:46:06 +0000 (17:46 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Thu, 6 Jul 2017 15:46:06 +0000 (17:46 +0200)
committer GitHub <noreply@github.com>
Thu, 6 Jul 2017 15:46:06 +0000 (17:46 +0200)
diff --cc src/librbd/librbd.cc
Simple merge
diff --cc src/test/librbd/test_librbd.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Thu, 6 Jul 2017 15:46:06 +0000 (17:46 +0200)
committer	GitHub <noreply@github.com>
	Thu, 6 Jul 2017 15:46:06 +0000 (17:46 +0200)
		1	2
src/librbd/librbd.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librbd/test_librbd.cc	patch \|	diff1 \|	diff2 \|	blob \| history