summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-11 01:29:24 +0000
committerGerrit Code Review <review@openstack.org>2018-08-11 01:29:24 +0000
commited07491140254ac35ce4701368fa0dd75da29e65 (patch)
tree4e008d18c69bdc5836f3c5623b6ee4a34c08be86
parent5835647e146b0049aa7bb6ac44df48217a947704 (diff)
parent215498373e6bd688498b9f480d062483f8d49abe (diff)
Merge "Open Stein DB branch"
-rw-r--r--neutron/db/migration/__init__.py2
-rw-r--r--neutron/db/migration/cli.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/neutron/db/migration/__init__.py b/neutron/db/migration/__init__.py
index a7fe47d..bbae2d8 100644
--- a/neutron/db/migration/__init__.py
+++ b/neutron/db/migration/__init__.py
@@ -30,6 +30,7 @@ OCATA = 'ocata'
30PIKE = 'pike' 30PIKE = 'pike'
31QUEENS = 'queens' 31QUEENS = 'queens'
32ROCKY = 'rocky' 32ROCKY = 'rocky'
33STEIN = 'stein'
33 34
34NEUTRON_MILESTONES = [ 35NEUTRON_MILESTONES = [
35 # earlier milestones were not tagged 36 # earlier milestones were not tagged
@@ -39,6 +40,7 @@ NEUTRON_MILESTONES = [
39 OCATA, 40 OCATA,
40 PIKE, 41 PIKE,
41 QUEENS, 42 QUEENS,
43 ROCKY,
42 # Do not add the milestone until the end of the release 44 # Do not add the milestone until the end of the release
43] 45]
44 46
diff --git a/neutron/db/migration/cli.py b/neutron/db/migration/cli.py
index 101054f..af6cbea 100644
--- a/neutron/db/migration/cli.py
+++ b/neutron/db/migration/cli.py
@@ -38,7 +38,7 @@ HEADS_FILENAME = 'HEADS'
38CONTRACT_HEAD_FILENAME = 'CONTRACT_HEAD' 38CONTRACT_HEAD_FILENAME = 'CONTRACT_HEAD'
39EXPAND_HEAD_FILENAME = 'EXPAND_HEAD' 39EXPAND_HEAD_FILENAME = 'EXPAND_HEAD'
40 40
41CURRENT_RELEASE = migration.ROCKY 41CURRENT_RELEASE = migration.STEIN
42RELEASES = ( 42RELEASES = (
43 migration.LIBERTY, 43 migration.LIBERTY,
44 migration.MITAKA, 44 migration.MITAKA,
@@ -47,6 +47,7 @@ RELEASES = (
47 migration.PIKE, 47 migration.PIKE,
48 migration.QUEENS, 48 migration.QUEENS,
49 migration.ROCKY, 49 migration.ROCKY,
50 migration.STEIN,
50) 51)
51 52
52EXPAND_BRANCH = 'expand' 53EXPAND_BRANCH = 'expand'