]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'origin/branch-4.5'
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Fri, 3 Oct 2014 13:34:33 +0000 (15:34 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Fri, 3 Oct 2014 13:34:33 +0000 (15:34 +0200)
commit72e5ccaf03bb37e407ec0e0e4c7253f5060708da
treeaf3cf2395927df2addbab58a9668a196d6f1a83f
parent0d797dd4a916a5d093e65fa25d5c14d618f9e92a
parent3406907abc194c2a665539f49cea1a16f877e667
Merge remote-tracking branch 'origin/branch-4.5'

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