Skip to content

Commit

Permalink
updated to latest dependent modules
Browse files Browse the repository at this point in the history
  • Loading branch information
oetiker committed Apr 13, 2018
1 parent 86a814b commit 5c78e63
Show file tree
Hide file tree
Showing 14 changed files with 346 additions and 118 deletions.
154 changes: 154 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,157 @@
commit 2f32dc5aaaa18092894d3a011293fd23787e9eac
Author: Tobias Oetiker <[email protected]>
Date: Sun Apr 8 16:52:56 2018 +0200

fix indent

commit 006e9ec3b603f79e691383cdb3b19287042b66dc
Author: paradox <[email protected]>
Date: Tue Feb 20 16:55:56 2018 -0700

do not destroy snapshots on SRC if any DST is down or any pre-send-command failed

commit 83e9c24887225f841027583041f82c5b2a8308c8
Author: Adam James <[email protected]>
Date: Mon Feb 5 18:34:57 2018 +0000

Add support for %z specifier in tsformat option

commit 75f6f32765af7c39af8165a7ffa9388cc78f4560
Author: Grant Wu <[email protected]>
Date: Mon Feb 19 04:20:09 2018 -0500

Some light edits

commit 1095ea8213b340a36b6a1f6abf8dbd7667c381cc
Author: Grant Wu <[email protected]>
Date: Mon Feb 19 03:31:33 2018 -0500

Fix typo

commit 8c9d33a2992f570afb69c170a6fe9e72ab37686a
Author: albundy83 <[email protected]>
Date: Wed Feb 7 22:17:24 2018 +0100

Added zfsonlinux support

Choose or official zfs ubuntu packages or zfsonlinux.
Add also `--default` to not have to answer yes to checkinstall command

commit a5f8132348e255eca9021a002e0fadfb55c93f91
Author: Adam James <[email protected]>
Date: Mon Feb 5 19:06:02 2018 +0000

Add --version command line option

commit 65c1ae30e8f83b9bd8f4551bcf82c41f1518dd69
Author: Adam James <[email protected]>
Date: Tue Feb 6 14:14:03 2018 +0000

Allow skipping of snap create/send on pre-command failure

This commit implements two new boolean command line options:

* --skipOnPreSnapCmdFail
* --skipOnPreSendCmdFail

These options cause znapzend to skip snapshot creation or replication if
the respective pre-command returns a non-zero exit code or is killed by
a signal.

commit a15ab81197bb018cf1e7f8e894ecf74c808d8b30
Author: Dylan Powers <[email protected]>
Date: Mon Oct 16 16:15:23 2017 -0700

Missed properly validating if runonce option was passed

commit 04e2131d40dec644465c6e23fd02cc105c2a754c
Author: Dylan Powers <[email protected]>
Date: Mon Oct 9 16:42:55 2017 -0700

Allow runonce to run across all datasets

The motivation behind this was to run znapzend as a cron job.

commit 357bc3e0a9b28cb8f81008f56e81319167c80f87
Author: Dylan Powers <[email protected]>
Date: Wed Oct 4 02:30:43 2017 -0700

--sudo/pfexec znapzend options for consistency (#292)

* --sudo/pfexec znapzend options for consistency

I noticed that there is a bit of an inconsistency between the options to znapzend and its utilities which made me briefly confused why znapzend doesn't accept sudo as an option. I then found https://github.com/oetiker/znapzend/issues/166 and realized others have been confused. I've moved these out from the "features" option to their own standalone options. It's still possible to use the old features flag, for backwards compatibility, but there will now be a warning issued to make the switch.

* Introduction --rootExec

commit 21d63948943a07edc8b379379384bc24fe4ce0c7
Author: Steve Hess <[email protected]>
Date: Thu Jul 20 01:11:04 2017 -0500

Added compression feature to add -Lce options to zfs send. (#280)

* Added compression feature to add -Lce options to zfs send.

* Added brief description of -L and -e options. Changed the option name to compressed match zfs send option. Also some minor text changes to match zfs documentation.

* Added conditional for send options. (bugfix)

* Changed sendOpt to array to fix case where there are no send options.

* Changed sendOpt to array to fix case where there are no send options.

commit eef167b3c077edc9eba0e8bffe395fc5e3778a62
Author: Jason Lewis <[email protected]>
Date: Mon Jul 3 18:45:12 2017 +1000

add unzip as a requirement to build (#279)

fails to build if you don't have unzip installed

commit 172d4759fe43101ae71f260565c69597d006c98a
Author: Tobias Oetiker <[email protected]>
Date: Sat Jun 3 16:05:49 2017 +0200

teach znapzend about going into the future with the new timeWarp option (#272)

* teach znapzend about going into the future with the new timeWarp option

* add timewarp to znapzendztatz

commit 8102a00239bb9c22b0bcaf91efe24f7f37cf81d8
Author: Tobias Oetiker <[email protected]>
Date: Fri Jun 2 18:16:36 2017 +0200

document ZNAP_* environement variables (#277)

commit 830eb9df80a3c372b8a6faa54015532c19045350
Author: Tobias Oetiker <[email protected]>
Date: Fri Mar 17 09:10:10 2017 +0100

allow crfl input (fix for #267) (#268)

commit ff9efe9003da54b3911071489d41f93bd8aa6735
Author: morph027 <[email protected]>
Date: Fri Mar 17 08:54:23 2017 +0100

started basic bash completion (#242)

* started basic bash completion

* extend bash completion for list

commit 1c72924f8c960ca37958a20cf93260cd92a071d0
Author: Dominik Hassler <[email protected]>
Date: Fri Feb 10 17:01:33 2017 +0100

- escape '.' for snapshot filter

commit f740ff033f0f5e51198f9e997469ca1b388ea263
Author: Tobias Oetiker <[email protected]>
Date: Wed Feb 8 08:38:40 2017 +0100

release 0.17.0

commit 8188a79cbaec2dea4dfb0d52e6bea755e8e9a520
Author: Ron van den Dungen <[email protected]>
Date: Tue Jan 17 08:35:20 2017 +0100
Expand Down
2 changes: 1 addition & 1 deletion COPYRIGHT
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ znapzend - A ZFS backup system
Copyright by Dominik Hassler, Tobias Oetiker and the other people listed
in the AUTHORS file.

2017-02-08
2018-04-13

All rights reserved.

Expand Down
1 change: 0 additions & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,6 @@ man/%.1: bin/% VERSION
$(AM_V_GEN)mkdir -p man; test $(POD2MAN) = "no" || $(POD2MAN) --release=$(VERSION) --center=$(PACKAGE_NAME) $< > $@

dist-hook: $(POD) $(MAN) CHANGES
$(PERL) -i -p -e 's/\d+\.\d+\.\d+/$(PACKAGE_VERSION)/g;s/20\d\d/$(YEAR)/g;s/20\d\d-\d\d-\d\d/$(DATE)/g;' $(distdir)/README.md $(distdir)/COPYRIGHT
$(PERL) -i -p -e 's/^my .*# VERSION/my \$$VERSION = q{$(PACKAGE_VERSION)}; # VERSION/' $(distdir)/$(BIN)

install-exec-hook:
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ZnapZend 0.17.0
ZnapZend 0.18.0
===============

[![Build Status](https://travis-ci.org/oetiker/znapzend.svg?branch=master)](https://travis-ci.org/oetiker/znapzend)
Expand Down Expand Up @@ -34,10 +34,10 @@ On OmniOS/SmartOS you will need perl and gnu-make.
With that in place you can now utter:

```sh
wget https://github.com/oetiker/znapzend/releases/download/v0.17.0/znapzend-0.17.0.tar.gz
tar zxvf znapzend-0.17.0.tar.gz
cd znapzend-0.17.0
./configure --prefix=/opt/znapzend-0.17.0
wget https://github.com/oetiker/znapzend/releases/download/v0.18.0/znapzend-0.18.0.tar.gz
tar zxvf znapzend-0.18.0.tar.gz
cd znapzend-0.18.0
./configure --prefix=/opt/znapzend-0.18.0
```

If configure finds anything noteworthy, it will tell you about it. If any
Expand All @@ -53,7 +53,7 @@ Optionally (but recommended) put symbolic links to the installed binaries in the
system PATH.

```sh
for x in /opt/znapzend-0.17.0/bin/*; do ln -s $x /usr/local/bin; done
for x in /opt/znapzend-0.18.0/bin/*; do ln -s $x /usr/local/bin; done
```

Debian packages
Expand Down Expand Up @@ -111,4 +111,4 @@ And if you have a contribution, please send a pull request.
Enjoy!

Dominik Hassler & Tobi Oetiker
2017-02-08
2018-04-13
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.17.0
0.18.0
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for znapzend 0.17.0.
# Generated by GNU Autoconf 2.69 for znapzend 0.18.0.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='znapzend'
PACKAGE_TARNAME='znapzend'
PACKAGE_VERSION='0.17.0'
PACKAGE_STRING='znapzend 0.17.0'
PACKAGE_VERSION='0.18.0'
PACKAGE_STRING='znapzend 0.18.0'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1234,7 +1234,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures znapzend 0.17.0 to adapt to many kinds of systems.
\`configure' configures znapzend 0.18.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1301,7 +1301,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of znapzend 0.17.0:";;
short | recursive ) echo "Configuration of znapzend 0.18.0:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1388,7 +1388,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
znapzend configure 0.17.0
znapzend configure 0.18.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand All @@ -1405,7 +1405,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by znapzend $as_me 0.17.0, which was
It was created by znapzend $as_me 0.18.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2276,7 +2276,7 @@ fi
# Define the identity of the package.
PACKAGE='znapzend'
VERSION='0.17.0'
VERSION='0.18.0'
cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -3543,7 +3543,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by znapzend $as_me 0.17.0, which was
This file was extended by znapzend $as_me 0.18.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -3596,7 +3596,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
znapzend config.status 0.17.0
znapzend config.status 0.18.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
Loading

0 comments on commit 5c78e63

Please sign in to comment.