Merge pull request #6129 from dillaman/wip-13292

author Josh Durgin <jdurgin@redhat.com>

Fri, 4 Dec 2015 08:16:03 +0000 (00:16 -0800)

committer Josh Durgin <jdurgin@redhat.com>

Fri, 4 Dec 2015 08:16:03 +0000 (00:16 -0800)
author Josh Durgin <jdurgin@redhat.com>
Fri, 4 Dec 2015 08:16:03 +0000 (00:16 -0800)
committer Josh Durgin <jdurgin@redhat.com>
Fri, 4 Dec 2015 08:16:03 +0000 (00:16 -0800)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/librbd/internal.cc
Simple merge
author	Josh Durgin <jdurgin@redhat.com>
	Fri, 4 Dec 2015 08:16:03 +0000 (00:16 -0800)
committer	Josh Durgin <jdurgin@redhat.com>
	Fri, 4 Dec 2015 08:16:03 +0000 (00:16 -0800)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history