Merge branch 'branch-6.7'

author Sébastien Lesaint <sebastien.lesaint@sonarsource.com>

Tue, 23 Jan 2018 08:31:21 +0000 (09:31 +0100)

committer Sébastien Lesaint <sebastien.lesaint@sonarsource.com>

Tue, 23 Jan 2018 08:31:21 +0000 (09:31 +0100)
author Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Tue, 23 Jan 2018 08:31:21 +0000 (09:31 +0100)
committer Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Tue, 23 Jan 2018 08:31:21 +0000 (09:31 +0100)
diff --cc server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java
Simple merge
diff --cc server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java
Simple merge
author	Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
	Tue, 23 Jan 2018 08:31:21 +0000 (09:31 +0100)
committer	Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
	Tue, 23 Jan 2018 08:31:21 +0000 (09:31 +0100)
		1	2
server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java	patch \|	diff1 \|	diff2 \|	blob \| history