source.dussan.org Git - sonarqube.git/commit

Merge remote-tracking branch 'origin/branch-5.0'

Conflicts:
server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java
server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/rule/RuleTesting.java
sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ActiveRule.java
sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesMediumTest.java
sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnDirMediumTest.java

author	Julien Lancelot <julien.lancelot@sonarsource.com>
	Mon, 9 Feb 2015 12:10:08 +0000 (13:10 +0100)
committer	Julien Lancelot <julien.lancelot@sonarsource.com>
	Mon, 9 Feb 2015 12:10:08 +0000 (13:10 +0100)
commit	f32ae830af90b130ea73c66cd2a0b3a39f876afd
tree	0e787de5ffad7911402ecdbb3c2a0ee7b60e4fea	tree \| snapshot
parent	3dcf41ab1127fe59b943c1e79f173fcbd45e9e6c	commit \| diff
parent	b49f4a0e2dc098099f2172e24a48768a983f96f5	commit \| diff

server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java	diff1 \|	\|	blob \| history
server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java	diff1 \|	\|	blob \| history
sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ActiveRule.java	diff1 \|	diff2 \|	blob \| history