aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-core/src
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-12-11 15:17:24 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-12-11 15:17:24 +0100
commit190033b97a0d174b4c7434598d158184e8a14502 (patch)
tree2b86206f1da01c738386a3b99bd5aaaabd6c058b /sonar-core/src
parent2b5242fac595f3508444739ecc595d6a9c4319e9 (diff)
parent63e79feb4bc099a53bfbc5d3b8fd1cb023c614a2 (diff)
downloadsonarqube-190033b97a0d174b4c7434598d158184e8a14502.tar.gz
sonarqube-190033b97a0d174b4c7434598d158184e8a14502.zip
Merge remote-tracking branch 'origin/branch-5.0'
Conflicts: server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
Diffstat (limited to 'sonar-core/src')
-rw-r--r--sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql1
1 files changed, 1 insertions, 0 deletions
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
index dfe283966c3..a14e4320bde 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
@@ -278,6 +278,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('717');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('718');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('719');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('720');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('721');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('750');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('751');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('752');