Merge pull request #7767 from athanatos/wip-sam-journal-throttle-4

author Samuel Just <sjust@redhat.com>

Tue, 1 Mar 2016 20:51:15 +0000 (12:51 -0800)

committer Samuel Just <sjust@redhat.com>

Tue, 1 Mar 2016 20:51:15 +0000 (12:51 -0800)
author Samuel Just <sjust@redhat.com>
Tue, 1 Mar 2016 20:51:15 +0000 (12:51 -0800)
committer Samuel Just <sjust@redhat.com>
Tue, 1 Mar 2016 20:51:15 +0000 (12:51 -0800)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/Makefile.am
Simple merge
diff --cc src/os/ObjectStore.h
Simple merge
diff --cc src/os/filestore/FileStore.cc
Simple merge
diff --cc src/os/filestore/FileStore.h
Simple merge
author	Samuel Just <sjust@redhat.com>
	Tue, 1 Mar 2016 20:51:15 +0000 (12:51 -0800)
committer	Samuel Just <sjust@redhat.com>
	Tue, 1 Mar 2016 20:51:15 +0000 (12:51 -0800)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/ObjectStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/filestore/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/filestore/FileStore.h	patch \|	diff1 \|	diff2 \|	blob \| history