Merge pull request #14636 from jcsp/wip-19691

author John Spray <jspray@redhat.com>

Mon, 24 Apr 2017 21:12:35 +0000 (22:12 +0100)

committer GitHub <noreply@github.com>

Mon, 24 Apr 2017 21:12:35 +0000 (22:12 +0100)
author John Spray <jspray@redhat.com>
Mon, 24 Apr 2017 21:12:35 +0000 (22:12 +0100)
committer GitHub <noreply@github.com>
Mon, 24 Apr 2017 21:12:35 +0000 (22:12 +0100)
diff --cc PendingReleaseNotes
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osdc/Journaler.cc
Simple merge
author	John Spray <jspray@redhat.com>
	Mon, 24 Apr 2017 21:12:35 +0000 (22:12 +0100)
committer	GitHub <noreply@github.com>
	Mon, 24 Apr 2017 21:12:35 +0000 (22:12 +0100)
		1	2
PendingReleaseNotes	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Journaler.cc	patch \|	diff1 \|	diff2 \|	blob \| history