Merge pull request #7752 from somnathr/wip-odsync-write

author Samuel Just <sjust@redhat.com>

Fri, 11 Mar 2016 21:47:38 +0000 (13:47 -0800)

committer Samuel Just <sjust@redhat.com>

Fri, 11 Mar 2016 21:47:38 +0000 (13:47 -0800)
author Samuel Just <sjust@redhat.com>
Fri, 11 Mar 2016 21:47:38 +0000 (13:47 -0800)
committer Samuel Just <sjust@redhat.com>
Fri, 11 Mar 2016 21:47:38 +0000 (13:47 -0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/filestore/FileStore.cc
Simple merge
author	Samuel Just <sjust@redhat.com>
	Fri, 11 Mar 2016 21:47:38 +0000 (13:47 -0800)
committer	Samuel Just <sjust@redhat.com>
	Fri, 11 Mar 2016 21:47:38 +0000 (13:47 -0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/filestore/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history