From 8a0ab38c0b18f84b5c64cdfb5354b223e79b800d Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 19 Apr 2019 11:44:07 +0200 Subject: [PATCH] Branch off 11/12 master is now version 12, and version 11 has its own branch. --- wwwtools/messages-branches.txt | 3 ++- wwwtools/nls-status-page | 1 + wwwtools/postgresql-branches.txt | 1 + wwwtools/update-nls-www | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wwwtools/messages-branches.txt b/wwwtools/messages-branches.txt index 93d72bb..5d1b290 100644 --- a/wwwtools/messages-branches.txt +++ b/wwwtools/messages-branches.txt @@ -1,4 +1,5 @@ -messages-11-branch master +messages-master master +messages-11-branch REL_11_STABLE messages-10-branch REL_10_STABLE messages-9.6-branch REL9_6_STABLE messages-9.5-branch REL9_5_STABLE diff --git a/wwwtools/nls-status-page b/wwwtools/nls-status-page index 4938d80..9a2358f 100755 --- a/wwwtools/nls-status-page +++ b/wwwtools/nls-status-page @@ -84,6 +84,7 @@ my %branch_status = ( '9.6-branch' => 'maintenance', '10-branch' => 'maintenance', '11-branch' => 'translate this now', + 'master' => 'future', ); my @branches = reverse sort { diff --git a/wwwtools/postgresql-branches.txt b/wwwtools/postgresql-branches.txt index b35821c..60dc6e4 100644 --- a/wwwtools/postgresql-branches.txt +++ b/wwwtools/postgresql-branches.txt @@ -1,3 +1,4 @@ +postgresql-master master postgresql-11-branch REL_11_STABLE postgresql-10-branch REL_10_STABLE postgresql-9.6-branch REL9_6_STABLE diff --git a/wwwtools/update-nls-www b/wwwtools/update-nls-www index 8c67915..77a0ef4 100755 --- a/wwwtools/update-nls-www +++ b/wwwtools/update-nls-www @@ -30,7 +30,7 @@ while true; do esac done -active_branches="11-branch 10-branch 9.6-branch 9.5-branch 9.4-branch" +active_branches="master 11-branch 10-branch 9.6-branch 9.5-branch 9.4-branch" if [ -n "$1" ]; then active_branches=$1 -- 2.39.5