From 538416879d45baa981307aeadd3abe34adae3874 Mon Sep 17 00:00:00 2001 From: Christoph Klaffl Date: Tue, 18 Jul 2023 18:09:51 +0200 Subject: [PATCH] prepare 2.2.0 --- CHANGELIST | 14 ++++++++++++++ VERSION | 2 +- findoid | 2 +- packages/debian/changelog | 18 ++++++++++++++++++ packages/rhel/sanoid.spec | 4 +++- sanoid | 2 +- syncoid | 2 +- 7 files changed, 39 insertions(+), 5 deletions(-) diff --git a/CHANGELIST b/CHANGELIST index 6ddc565..314e431 100644 --- a/CHANGELIST +++ b/CHANGELIST @@ -1,3 +1,17 @@ +2.2.0 [overall] documentation updates, small fixes (@azmodude, @deviantintegral, @jimsalterjrs, @alexhaydock, @cbreak-black, @kd8bny, @JavaScriptDude, @veeableful, @rsheasby, @Topslakr, @mavhc, @adam-stamand, @joelishness, @jsoref, @dodexahedron, @phreaker0) + [syncoid] implemented flag for preserving properties without the zfs -p flag (@phreaker0) + [syncoid] implemented target snapshot deletion (@mat813) + [syncoid] support bookmarks which are taken in the same second (@delxg, @phreaker0) + [syncoid] exit with an error if the specified src dataset doesn't exist (@phreaker0) + [syncoid] rollback is now done implicitly instead of explicit (@jimsalterjrs, @phreaker0) + [syncoid] append a rand int to the socket name to prevent collisions with parallel invocations (@Gryd3) + [syncoid] implemented support for ssh_config(5) files (@endreszabo) + [syncoid] snapshot hold/unhold support (@rbike) + [sanoid] handle duplicate key definitions gracefully (@phreaker0) + [syncoid] implemented removal of conflicting snapshots with force-delete option (@phreaker0) + [sanoid] implemented pre pruning script hook (@phreaker0) + [syncoid] implemented direct connection support (bypass ssh) for the actual data transfer (@phreaker0) + 2.1.0 [overall] documentation updates, small fixes (@HavardLine, @croadfeldt, @jimsalterjrs, @jim-perkins, @kr4z33, @phreaker0) [syncoid] do not require user to be specified for syncoid (@aerusso) [syncoid] implemented option for keeping sync snaps (@phreaker0) diff --git a/VERSION b/VERSION index 7ec1d6d..ccbccc3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.0 +2.2.0 diff --git a/findoid b/findoid index 98ad581..0bb5e5f 100755 --- a/findoid +++ b/findoid @@ -4,7 +4,7 @@ # from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE. -$::VERSION = '2.1.0'; +$::VERSION = '2.2.0'; use strict; use warnings; diff --git a/packages/debian/changelog b/packages/debian/changelog index 4cab69b..00c0c07 100644 --- a/packages/debian/changelog +++ b/packages/debian/changelog @@ -1,3 +1,21 @@ +sanoid (2.2.0) unstable; urgency=medium + + [overall] documentation updates, small fixes (@azmodude, @deviantintegral, @jimsalterjrs, @alexhaydock, @cbreak-black, @kd8bny, @JavaScriptDude, @veeableful, @rsheasby, @Topslakr, @mavhc, @adam-stamand, @joelishness, @jsoref, @dodexahedron, @phreaker0) + [syncoid] implemented flag for preserving properties without the zfs -p flag (@phreaker0) + [syncoid] implemented target snapshot deletion (@mat813) + [syncoid] support bookmarks which are taken in the same second (@delxg, @phreaker0) + [syncoid] exit with an error if the specified src dataset doesn't exist (@phreaker0) + [syncoid] rollback is now done implicitly instead of explicit (@jimsalterjrs, @phreaker0) + [syncoid] append a rand int to the socket name to prevent collisions with parallel invocations (@Gryd3) + [syncoid] implemented support for ssh_config(5) files (@endreszabo) + [syncoid] snapshot hold/unhold support (@rbike) + [sanoid] handle duplicate key definitions gracefully (@phreaker0) + [syncoid] implemented removal of conflicting snapshots with force-delete option (@phreaker0) + [sanoid] implemented pre pruning script hook (@phreaker0) + [syncoid] implemented direct connection support (bypass ssh) for the actual data transfer (@phreaker0) + + -- Jim Salter Tue, 18 Jul 2023 10:04:00 +0200 + sanoid (2.1.0) unstable; urgency=medium [overall] documentation updates, small fixes (@HavardLine, @croadfeldt, @jimsalterjrs, @jim-perkins, @kr4z33, @phreaker0) diff --git a/packages/rhel/sanoid.spec b/packages/rhel/sanoid.spec index 376f58a..218f52d 100644 --- a/packages/rhel/sanoid.spec +++ b/packages/rhel/sanoid.spec @@ -1,4 +1,4 @@ -%global version 2.1.0 +%global version 2.2.0 %global git_tag v%{version} # Enable with systemctl "enable sanoid.timer" @@ -111,6 +111,8 @@ echo "* * * * * root %{_sbindir}/sanoid --cron" > %{buildroot}%{_docdir}/%{name} %endif %changelog +* Tue Jul 18 2023 Christoph Klaffl - 2.2.0 +- Bump to 2.2.0 * Tue Nov 24 2020 Christoph Klaffl - 2.1.0 - Bump to 2.1.0 * Wed Oct 02 2019 Christoph Klaffl - 2.0.3 diff --git a/sanoid b/sanoid index 12a184a..5150f3b 100755 --- a/sanoid +++ b/sanoid @@ -4,7 +4,7 @@ # from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE. -$::VERSION = '2.1.0'; +$::VERSION = '2.2.0'; my $MINIMUM_DEFAULTS_VERSION = 2; use strict; diff --git a/syncoid b/syncoid index 6cde9f9..5ed00f0 100755 --- a/syncoid +++ b/syncoid @@ -4,7 +4,7 @@ # from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE. -$::VERSION = '2.1.0'; +$::VERSION = '2.2.0'; use strict; use warnings;