]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'origin/branch-4.4'
authorStephane Gamard <stephane.gamard@searchbox.com>
Wed, 30 Jul 2014 07:23:43 +0000 (09:23 +0200)
committerStephane Gamard <stephane.gamard@searchbox.com>
Wed, 30 Jul 2014 07:23:43 +0000 (09:23 +0200)
commit041d9e3103129e323e8abfbf10504f15d00aab4f
tree04f9e377986ce1d55c01563dcce8bf40b365400a
parentea978ffddc1c29b0021b34fa3bbcf7217768a941
parent7e9c9bbea62d1f97fcee2569914105241ce1e98b
Merge remote-tracking branch 'origin/branch-4.4'

Conflicts:
server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java
server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java