diff options
| -rw-r--r-- | doc/source/reference/database-migrations.rst | 4 | ||||
| -rwxr-xr-x | tools/check-cherry-picks.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/reference/database-migrations.rst b/doc/source/reference/database-migrations.rst index ea2b9050d9..51fcaf80ad 100644 --- a/doc/source/reference/database-migrations.rst +++ b/doc/source/reference/database-migrations.rst @@ -24,7 +24,7 @@ Schema migrations The database migration engine was changed from ``sqlalchemy-migrate`` to ``alembic``. -.. versionchanged:: 27.0.0 (Antelope) +.. versionchanged:: 28.0.0 (Bobcat) The legacy ``sqlalchemy-migrate``-based database migrations were removed. @@ -43,7 +43,7 @@ respectively. There were also legacy migrations provided in the ``legacy_migrations`` subdirectory for both the API and main databases. These were provided to facilitate upgrades from pre-Xena (24.0.0) deployments. They were removed - in the 27.0.0 (Antelope) release. + in the 28.0.0 (Bobcat) release. The best reference for alembic is the `alembic documentation`__, but a small example is provided here. You can create the migration either manually or diff --git a/tools/check-cherry-picks.sh b/tools/check-cherry-picks.sh index 46cef8c225..3042aa1659 100755 --- a/tools/check-cherry-picks.sh +++ b/tools/check-cherry-picks.sh @@ -23,7 +23,7 @@ hashes=$(git show --format='%b' --quiet $commit_hash | sed -nr 's/^.cherry picke checked=0 branches+="" for hash in $hashes; do - branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z]+)') + branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z0-9.]+)') if [ $? -ne 0 ]; then echo "Cherry pick hash $hash not on any master or stable branches" exit 1 |