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

Merge branch 'master' of https://github.com/SonarSource/sonarqube

# By Julien Lancelot (2) and Stas Vilchik (1)
# Via Stas Vilchik
* 'master' of https://github.com/SonarSource/sonarqube:
  Component Viewer: duplications
  Ignore some failing tests
  Fix licence headers

Conflicts:
sonar-core/src/main/java/org/sonar/core/cluster/LocalNonBlockingWorkQueue.java
sonar-server/src/main/java/org/sonar/server/rule2/RuleConstants.java
sonar-server/src/main/java/org/sonar/server/rule2/RuleDao.java
sonar-server/src/main/java/org/sonar/server/rule2/RuleIndex.java
sonar-server/src/test/java/org/sonar/server/rule2/RuleIndexTest.java

author	Stephane Gamard <stephane.gamard@searchbox.com>
	Mon, 28 Apr 2014 11:34:46 +0000 (13:34 +0200)
committer	Stephane Gamard <stephane.gamard@searchbox.com>
	Mon, 28 Apr 2014 11:34:46 +0000 (13:34 +0200)
commit	9837210b8a7286a842407fe94848460ea5ac56cf
tree	8b63d67ea6fb7cefda0b8268df2effdb247c36a6	tree \| snapshot
parent	5214de8cc260b47b130d863ddeba87b7d204239b	commit \| diff
parent	7b83179be6ede8e2fae4b13aaf8ccecb0f89bff6	commit \| diff

sonar-batch/src/test/java/org/sonar/batch/rule/RulesProviderTest.java	diff1 \|	diff2 \|	blob \| history
sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java	diff1 \|	diff2 \|	blob \| history
sonar-server/src/main/java/org/sonar/server/rule2/RuleIndex.java	diff1 \|	diff2 \|	blob \| history
sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java	diff1 \|	diff2 \|	blob \| history