]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'origin/branch-4.5'
authorJulien Lancelot <julien.lancelot@sonarsource.com>
Fri, 7 Nov 2014 11:59:39 +0000 (12:59 +0100)
committerJulien Lancelot <julien.lancelot@sonarsource.com>
Fri, 7 Nov 2014 11:59:39 +0000 (12:59 +0100)
commit42814c36e2f4ef8ebeb5b37ca40129ece6158cb5
tree797c1c580e111fcb385225491cf23e0777b5d46e
parent5bae92cf0f91e54068a09a1827021160826eabb8
parentb84084cf0d8024d49a29b997bf0dc138bebcd3ec
Merge remote-tracking branch 'origin/branch-4.5'

Conflicts:
sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl