From 90da40b54c5f7b36a3936bee2901fc645cc8ef4c Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 5 Sep 2017 19:29:26 -0500 Subject: [PATCH] pre 4.2 cut (#7380) --- model/version.go | 1 + store/sql_upgrade.go | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/model/version.go b/model/version.go index b08af46bdb..eaac69e74f 100644 --- a/model/version.go +++ b/model/version.go @@ -13,6 +13,7 @@ import ( // It should be maitained in chronological order with most current // release at the front of the list. var versions = []string{ + "4.2.0", "4.1.0", "4.0.0", "3.10.0", diff --git a/store/sql_upgrade.go b/store/sql_upgrade.go index e10bdec13a..7ec831a179 100644 --- a/store/sql_upgrade.go +++ b/store/sql_upgrade.go @@ -296,8 +296,7 @@ func UpgradeDatabaseToVersion41(sqlStore SqlStore) { } func UpgradeDatabaseToVersion42(sqlStore SqlStore) { - // TODO: Uncomment following condition when version 4.1.0 is released - // if shouldPerformUpgrade(sqlStore, VERSION_4_1_0, VERSION_4_2_0) { - // saveSchemaVersion(sqlStore, VERSION_4_2_0) - // } + if shouldPerformUpgrade(sqlStore, VERSION_4_1_0, VERSION_4_2_0) { + saveSchemaVersion(sqlStore, VERSION_4_2_0) + } }