]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'origin/branch-4.5'
authorJulien Lancelot <julien.lancelot@sonarsource.com>
Fri, 17 Oct 2014 07:13:15 +0000 (09:13 +0200)
committerJulien Lancelot <julien.lancelot@sonarsource.com>
Fri, 17 Oct 2014 07:13:15 +0000 (09:13 +0200)
commit0f6775907280ff2d0b5e3ea9d4c2cff9755c63d1
treef08cff09972440967c44d2dd19b40eac0182421b
parente2dd32eff8f27428f4c94b7c77e92feef38e0948
parentcbd911bcb1bc40510fdf56639ef7476612bec24c
Merge remote-tracking branch 'origin/branch-4.5'

Conflicts:
sonar-application/src/test/java/org/sonar/application/JdbcSettingsTest.java
sonar-application/src/main/java/org/sonar/application/JdbcSettings.java
sonar-application/src/test/java/org/sonar/application/JdbcSettingsTest.java