]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'origin/branch-4.5'
authorJulien Lancelot <julien.lancelot@sonarsource.com>
Thu, 6 Nov 2014 08:03:50 +0000 (09:03 +0100)
committerJulien Lancelot <julien.lancelot@sonarsource.com>
Thu, 6 Nov 2014 08:03:50 +0000 (09:03 +0100)
commit7b35ec7ba7e289cae1f916e2683b7e4de4f0086f
treeac206ae5aed16faf91afbf725a69d4db1a9fbbcd
parent9f65f2a6f01816f4e86046ee0ba57a034d57abfe
parent9ed6664d22efa17ab0f86ffe1135df9c9802c38a
Merge remote-tracking branch 'origin/branch-4.5'

Conflicts:
server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java