Merge remote-tracking branch 'ceph/luminous' into ses5

author Nathan Cutler <ncutler@suse.com>

Thu, 21 Sep 2017 16:01:22 +0000 (18:01 +0200)

committer Nathan Cutler <ncutler@suse.com>

Thu, 21 Sep 2017 16:01:22 +0000 (18:01 +0200)
author Nathan Cutler <ncutler@suse.com>
Thu, 21 Sep 2017 16:01:22 +0000 (18:01 +0200)
committer Nathan Cutler <ncutler@suse.com>
Thu, 21 Sep 2017 16:01:22 +0000 (18:01 +0200)
diff --cc ceph.spec.in
Simple merge
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Nathan Cutler <ncutler@suse.com>
	Thu, 21 Sep 2017 16:01:22 +0000 (18:01 +0200)
committer	Nathan Cutler <ncutler@suse.com>
	Thu, 21 Sep 2017 16:01:22 +0000 (18:01 +0200)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history