Merge pull request #9867 from dillaman/wip-16411

author Mykola Golub <to.my.trociny@gmail.com>

Thu, 23 Jun 2016 17:25:03 +0000 (20:25 +0300)

committer GitHub <noreply@github.com>

Thu, 23 Jun 2016 17:25:03 +0000 (20:25 +0300)
author Mykola Golub <to.my.trociny@gmail.com>
Thu, 23 Jun 2016 17:25:03 +0000 (20:25 +0300)
committer GitHub <noreply@github.com>
Thu, 23 Jun 2016 17:25:03 +0000 (20:25 +0300)
diff --cc src/librbd/Operations.cc
Simple merge
diff --cc src/librbd/internal.cc
Simple merge
author	Mykola Golub <to.my.trociny@gmail.com>
	Thu, 23 Jun 2016 17:25:03 +0000 (20:25 +0300)
committer	GitHub <noreply@github.com>
	Thu, 23 Jun 2016 17:25:03 +0000 (20:25 +0300)
		1	2
src/librbd/Operations.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history