Merge pull request #7459 from dwj192/mon-created

author Sage Weil <sage@redhat.com>

Thu, 4 Feb 2016 13:37:22 +0000 (08:37 -0500)

committer Sage Weil <sage@redhat.com>

Thu, 4 Feb 2016 13:37:22 +0000 (08:37 -0500)
author Sage Weil <sage@redhat.com>
Thu, 4 Feb 2016 13:37:22 +0000 (08:37 -0500)
committer Sage Weil <sage@redhat.com>
Thu, 4 Feb 2016 13:37:22 +0000 (08:37 -0500)
diff --cc src/test/CMakeLists.txt
Simple merge
diff --cc src/test/Makefile.am
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 4 Feb 2016 13:37:22 +0000 (08:37 -0500)
committer	Sage Weil <sage@redhat.com>
	Thu, 4 Feb 2016 13:37:22 +0000 (08:37 -0500)
		1	2
src/test/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history