]> source.dussan.org Git - sonarqube.git/commit
Automatic merge from master
authorJenkins CI <ci@sonarsource.com>
Wed, 4 Mar 2015 06:59:34 +0000 (07:59 +0100)
committerJenkins CI <ci@sonarsource.com>
Wed, 4 Mar 2015 06:59:34 +0000 (07:59 +0100)
commit6f9777c016289556b7981aa894dc6a4739aa0d9d
tree96b8eab68750a7f0443a74c7ec75a8c729220d2f
parente0d9c3793d99ff6a26c694bf0f1d9af2e73b4950
parentd1d9e77a365e3817c9a01a26350ff6eb94e600d1
Automatic merge from master

* origin/master:
  Fix compatibility of tests with non-H2 dbs
  SONAR-6229 Indexing of activity logs consumes too much memory during server startup
  SONAR-6233 fix characteristic facet on rules page
  SONAR-6233 Fix behavior of facet on uncharacterized rules
  SONAR-6238 Updating only the name of a rule is not taking in account when synchronizing rules at startup
  Update javadoc
  Rename method
  Add javadoc
  change "recent history" to "browsed recently"
server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java
server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
sonar-core/src/main/resources/org/sonar/l10n/core.properties