Merge pull request #4699 from joehandzik/master

author Sage Weil <sage@redhat.com>

Wed, 15 Jul 2015 13:47:22 +0000 (09:47 -0400)

committer Sage Weil <sage@redhat.com>

Wed, 15 Jul 2015 13:47:22 +0000 (09:47 -0400)
author Sage Weil <sage@redhat.com>
Wed, 15 Jul 2015 13:47:22 +0000 (09:47 -0400)
committer Sage Weil <sage@redhat.com>
Wed, 15 Jul 2015 13:47:22 +0000 (09:47 -0400)
diff --cc configure.ac
Simple merge
diff --cc src/common/Makefile.am
Simple merge
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/test/objectstore/store_test.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 15 Jul 2015 13:47:22 +0000 (09:47 -0400)
committer	Sage Weil <sage@redhat.com>
	Wed, 15 Jul 2015 13:47:22 +0000 (09:47 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/objectstore/store_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history