Merge branch 'master' into prepare-release
This commit is contained in:
commit
5fd4ff04bb
|
@ -1,8 +1,8 @@
|
|||
1.4.19 [overall] documentation updates, small fixes, more warnings (@sparky3387, @ljwobker, @phreaker0)
|
||||
2.0.0 [overall] documentation updates, small fixes, more warnings (@sparky3387, @ljwobker, @phreaker0)
|
||||
[syncoid] added force delete flag (@phreaker0)
|
||||
[sanoid] removed sleeping between snapshot taking (@phreaker0)
|
||||
[sanoid] removed sleeping between snapshot taking (@phreaker0)
|
||||
[syncoid] added '--no-privilege-elevation' option to bypass root check (@lopsided98)
|
||||
[sanoid] implemented weekly period (@phreaker0)
|
||||
[sanoid] implemented weekly period (@phreaker0)
|
||||
[syncoid] implemented support for zfs bookmarks as fallback (@phreaker0)
|
||||
[sanoid] support for pre, post and prune snapshot scripts (@jouir, @darkbasic, @phreaker0)
|
||||
[sanoid] ignore snapshots types that are set to 0 (@muff1nman)
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
sanoid (1.4.19) unstable; urgency=medium
|
||||
sanoid (2.0.0) unstable; urgency=medium
|
||||
|
||||
[overall] documentation updates, small fixes, more warnings (@sparky3387, @ljwobker, @phreaker0)
|
||||
[syncoid] added force delete flag (@phreaker0)
|
||||
[sanoid] removed sleeping between snapshot taking (@phreaker0)
|
||||
[sanoid] removed sleeping between snapshot taking (@phreaker0)
|
||||
[syncoid] added '--no-privilege-elevation' option to bypass root check (@lopsided98)
|
||||
[sanoid] implemented weekly period (@phreaker0)
|
||||
[sanoid] implemented weekly period (@phreaker0)
|
||||
[syncoid] implemented support for zfs bookmarks as fallback (@phreaker0)
|
||||
[sanoid] support for pre, post and prune snapshot scripts (@jouir, @darkbasic, @phreaker0)
|
||||
[sanoid] ignore snapshots types that are set to 0 (@muff1nman)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
%global version 1.4.19
|
||||
%global version 2.0.0
|
||||
%global git_tag v%{version}
|
||||
|
||||
# Enable with systemctl "enable sanoid.timer"
|
||||
|
@ -111,8 +111,8 @@ echo "* * * * * root %{_sbindir}/sanoid --cron" > %{buildroot}%{_docdir}/%{name}
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Dec 04 2018 Christoph Klaffl <christoph@phreaker.eu> - 1.4.19
|
||||
- Bump to 1.4.19
|
||||
* Wed Dec 04 2018 Christoph Klaffl <christoph@phreaker.eu> - 2.0.0
|
||||
- Bump to 2.0.0
|
||||
* Sat Apr 28 2018 Dominic Robinson <github@dcrdev.com> - 1.4.18-1
|
||||
- Bump to 1.4.18
|
||||
* Thu Aug 31 2017 Dominic Robinson <github@dcrdev.com> - 1.4.14-2
|
||||
|
|
2
sanoid
2
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 = '1.4.19';
|
||||
$::VERSION = '2.0.0';
|
||||
my $MINIMUM_DEFAULTS_VERSION = 2;
|
||||
|
||||
use strict;
|
||||
|
|
Loading…
Reference in New Issue