Prepare release 2.6

Signed-off-by: Marco Nenciarini <marco.nenciarini@2ndquadrant.it>
kmoppel · Jan 31, 2019 · 3cbe9e4 · 3cbe9e4
1 parent 6af4131
commit 3cbe9e4
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 18 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -2,19 +2,21 @@ Barman Core Team (in alphabetical order):
 
 * Gabriele Bartolini <gabriele.bartolini@2ndquadrant.it> (architect)
 * Jonathan Battiato <jonathan.battiato@2ndquadrant.it> (QA/testing)
+* Anna Bellandi <anna.bellandi@2ndquadrant.com> (QA/testing)
 * Giulio Calacoci <giulio.calacoci@2ndquadrant.it> (developer)
 * Francesco Canovai <francesco.canovai@2ndquadrant.it> (QA/testing)
 * Leonardo Cecchi <leonardo.cecchi@2ndquadrant.it> (developer)
 * Gianni Ciolli <gianni.ciolli@2ndquadrant.it> (QA/testing)
-* Britt Cole <britt.cole@2ndquadrant.com> (documentation)
+* Niccolò Fei <niccolo.fei@2ndquadrant.com> (QA/testing)
 * Marco Nenciarini <marco.nenciarini@2ndquadrant.it> (project leader)
 * Rubens Souza <rubens.souza@2ndquadrant.it> (QA/testing)
 
 Past contributors:
 
-* Carlo Ascani
-* Stefano Bianucci
-* Giuseppe Broccolo
+* Carlo Ascani (developer)
+* Stefano Bianucci (developer)
+* Giuseppe Broccolo (developer)
+* Britt Cole (documentation reviewer)
 
 Many thanks go to our sponsors (in alphabetical order):
 

diff --git a/NEWS b/NEWS
@@ -1,6 +1,27 @@
 Barman News - History of user-visible changes
 Copyright (C) 2011-2018 2ndQuadrant Limited
 
+Version 2.6 - 4 Feb 2019
+
+-   Add support for Geographical redundancy, introducing 3 new commands:
+    sync-info, sync-backup and sync-wals. Geo-redundancy allows a Barman
+    server to use another Barman server as data source instead of a
+    PostgreSQL server.
+
+-   Add put-wal command that allows Barman to safely receive WAL files
+    via PostgreSQL's archive_command using the barman-wal-archive script
+    included in barman-cli
+
+-   Add ANSI colour support to check command
+
+-   Minor fixes:
+
+    -   Fix switch-wal on standby with an empty WAL directory
+    -   Honour archiver locking in wait_for_wal method
+    -   Fix WAL compression detection algorithm
+    -   Fix current_action in concurrent stop backup errors
+    -   Do not treat lock file busy as an error when validating a backup
+
 Version 2.5 - 23 Oct 2018
 
 -   Add support for PostgreSQL 11

diff --git a/README.rst b/README.rst
@@ -44,7 +44,7 @@ Web resources
 Licence
 -------
 
-Copyright (C) 2011-2018 2ndQuadrant Limited
+Copyright (C) 2011-2019 2ndQuadrant Limited
 
 Barman is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/barman/version.py b/barman/version.py
@@ -19,4 +19,4 @@
 This module contains the current Barman version.
 '''
 
-__version__ = '2.6a1'
+__version__ = '2.6'
diff --git a/doc/barman.1 b/doc/barman.1
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 2.5
 .\"
-.TH "BARMAN" "1" "Month DD, 2018" "Barman User manuals" "Version 2.6a1"
+.TH "BARMAN" "1" "February 4, 2019" "Barman User manuals" "Version 2.6"
 .hy
 .SH NAME
 .PP
@@ -556,7 +556,7 @@ Professional support: <http://www.2ndQuadrant.com/>
 Barman is the property of 2ndQuadrant Limited and its code is
 distributed under GNU General Public License v3.
 .PP
-Copyright (C) 2011\-2018 2ndQuadrant Limited \-
+Copyright (C) 2011\-2019 2ndQuadrant Limited \-
 <http://www.2ndQuadrant.com/>.
 .SH AUTHORS
 2ndQuadrant Limited <https://www.2ndQuadrant.com>.
diff --git a/doc/barman.1.d/00-header.md b/doc/barman.1.d/00-header.md
@@ -1,3 +1,3 @@
-% BARMAN(1) Barman User manuals | Version 2.6a1
+% BARMAN(1) Barman User manuals | Version 2.6
 % 2ndQuadrant Limited <https://www.2ndQuadrant.com>
-% Month DD, 2018
+% February 4, 2019
diff --git a/doc/barman.1.d/99-copying.md b/doc/barman.1.d/99-copying.md
@@ -3,4 +3,4 @@
 Barman is the property of 2ndQuadrant Limited
 and its code is distributed under GNU General Public License v3.
 
-Copyright (C) 2011-2018 2ndQuadrant Limited - <http://www.2ndQuadrant.com/>.
+Copyright (C) 2011-2019 2ndQuadrant Limited - <http://www.2ndQuadrant.com/>.
diff --git a/doc/barman.5 b/doc/barman.5
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 2.5
 .\"
-.TH "BARMAN" "5" "Month DD, 2018" "Barman User manuals" "Version 2.6a1"
+.TH "BARMAN" "5" "February 4, 2019" "Barman User manuals" "Version 2.6"
 .hy
 .SH NAME
 .PP
@@ -704,7 +704,7 @@ Professional support: <https://www.2ndQuadrant.com/>
 Barman is the property of 2ndQuadrant Limited and its code is
 distributed under GNU General Public License v3.
 .PP
-Copyright (C) 2011\-2018 2ndQuadrant Limited \-
+Copyright (C) 2011\-2019 2ndQuadrant Limited \-
 https://www.2ndQuadrant.com/.
 .SH AUTHORS
 2ndQuadrant Limited <https://www.2ndQuadrant.com>.
diff --git a/doc/barman.5.d/00-header.md b/doc/barman.5.d/00-header.md
@@ -1,3 +1,3 @@
-% BARMAN(5) Barman User manuals | Version 2.6a1
+% BARMAN(5) Barman User manuals | Version 2.6
 % 2ndQuadrant Limited <https://www.2ndQuadrant.com>
-% Month DD, 2018
+% February 4, 2019
diff --git a/doc/barman.5.d/99-copying.md b/doc/barman.5.d/99-copying.md
@@ -3,4 +3,4 @@
 Barman is the property of 2ndQuadrant Limited
 and its code is distributed under GNU General Public License v3.
 
-Copyright (C) 2011-2018 2ndQuadrant Limited - https://www.2ndQuadrant.com/.
+Copyright (C) 2011-2019 2ndQuadrant Limited - https://www.2ndQuadrant.com/.
diff --git a/doc/manual/00-head.en.md b/doc/manual/00-head.en.md
@@ -1,6 +1,6 @@
 % Barman Manual
 % 2ndQuadrant Limited
-% Month DD, 2018 (v2.6a1)
+% February 4, 2019 (v2.6)
 
 **Barman** (Backup and Recovery Manager) is an open-source administration tool for disaster recovery of PostgreSQL servers written in Python. It allows your organisation to perform remote backups of multiple servers in business critical environments to reduce risk and help DBAs during the recovery phase.
 

diff --git a/rpm/barman.spec b/rpm/barman.spec
@@ -22,7 +22,7 @@
 
 %global main_version 2.6
 # comment out the next line if not a pre-release (use '#%%global ...')
-%global extra_version a1
+#%%global extra_version a1
 # Usually 1 - unique sequence for all pre-release version
 %global package_release 1
 
@@ -114,6 +114,9 @@ useradd -M -n -g barman -r -d /var/lib/barman -s /bin/bash \
 	-c "Backup and Recovery Manager for PostgreSQL" barman >/dev/null 2>&1 || :
 
 %changelog
+* Mon Feb 4 2019 - Marco Nenciarini <marco.nenciarini@2ndquadrant.it> 2.6-1
+- New release 2.6-1
+
 * Tue Oct 23 2018 - Marco Nenciarini <marco.nenciarini@2ndquadrant.it> 2.5-1
 - New release 2.5-1
 

diff --git a/setup.py b/setup.py
@@ -98,6 +98,7 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
     setup_requires=setup_requires,
     tests_require=[