Skip to content

Commit

Permalink
0.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
oetiker committed Jun 29, 2014
1 parent 72969fe commit ffe3808
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 26 deletions.
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.

2014-06-13
2014-06-29

All rights reserved.

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.5.4
ZnapZend 0.6.0
--------------

[![Build Status](https://travis-ci.org/oetiker/znapzend.svg?branch=master)](https://travis-ci.org/oetiker/znapzend)
Expand All @@ -14,15 +14,15 @@ itself.
To zetup znapzend follow these zimple inztructionz

```sh
wget https://github.com/oetiker/znapzend/releases/download/v0.5.4/znapzend-0.5.4.tar.gz
tar zxvf znapzend-0.5.4.tar.gz
cd znapzend-0.5.4
./configure --prefix=/opt/znapzend-0.5.4
wget https://github.com/oetiker/znapzend/releases/download/v0.6.0/znapzend-0.6.0.tar.gz
tar zxvf znapzend-0.6.0.tar.gz
cd znapzend-0.6.0
./configure --prefix=/opt/znapzend-0.6.0
```
if configure complains about missing perl modules, run

```sh
./setup/build-thirdparty.sh /opt/znapzend-0.5.4/thirdparty
./setup/build-thirdparty.sh /opt/znapzend-0.6.0/thirdparty
```

now you can run configure again and then
Expand All @@ -36,4 +36,4 @@ now you can configure the thing with the znapzendzetup program
Enjoy!

Dominik Hassler & Tobi Oetiker
2014-06-13
2014-06-29
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.4
0.6.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.68 for znapzend 0.5.4.
# Generated by GNU Autoconf 2.68 for znapzend 0.6.0.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -560,8 +560,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='znapzend'
PACKAGE_TARNAME='znapzend'
PACKAGE_VERSION='0.5.4'
PACKAGE_STRING='znapzend 0.5.4'
PACKAGE_VERSION='0.6.0'
PACKAGE_STRING='znapzend 0.6.0'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1250,7 +1250,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.5.4 to adapt to many kinds of systems.
\`configure' configures znapzend 0.6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1316,7 +1316,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of znapzend 0.5.4:";;
short | recursive ) echo "Configuration of znapzend 0.6.0:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1409,7 +1409,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
znapzend configure 0.5.4
znapzend configure 0.6.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1665,7 +1665,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.5.4, which was
It was created by znapzend $as_me 0.6.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -3738,7 +3738,7 @@ fi
# Define the identity of the package.
PACKAGE='znapzend'
VERSION='0.5.4'
VERSION='0.6.0'
cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -4718,7 +4718,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.5.4, which was
This file was extended by znapzend $as_me 0.6.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -4771,7 +4771,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.5.4
znapzend config.status 0.6.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
Expand Down
20 changes: 18 additions & 2 deletions doc/znapzendzetup.pod
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ B<znapzendzetup> I<command> [I<options...>]

where 'command' is one of the following:

create [--recursive] [--mbuffer=<path>] \
create [--recursive] [--mbuffer=<path>] [--tsformat=<format>] \
SRC plan dataset \
[ DST[:key] plan [[user@]host:]dataset ]

delete [--dst=key] <src_dataset>

edit [--recursive=on|off] [--mbuffer=<path>|off] \
edit [--recursive=on|off] [--mbuffer=<path>|off] [--tsformat=<format>] \
SRC [plan] dataset \
[ DST:key [plan] [dataset] ]

Expand Down Expand Up @@ -64,9 +64,24 @@ To keep one copy every two days for 10 years:

10year=>2day


The 'tsformat' option specifies the format of the snapshots being created.
The syntax is 'strftime like'. The string must consist of the mandatory

(%Y, %m, %d, %H, %M, %S)

and optional

(-, _, ., :)

characters.

If not specified, tsformat defaults to '%Y-%m-%d-%H%M%S'.

=head1 EXAMPLE

znapzendzetup create --mbuffer=/opt/omni/bin/mbuffer \
--tsformat='%Y-%m-%d-%H%M%S' \
SRC '7d=>1h,30d=>4h,90d=>1d' tank/home \
DST:a '7d=>1h,30d=>4h,90d=>1d,1y=>1w,10y=>1month' backup/home \
DST:b '7d=>1h,30d=>4h,90d=>1d,1y=>1w,10y=>1month' root@bserv:backup/home
Expand Down Expand Up @@ -97,6 +112,7 @@ S<Dominik Hassler>

=head1 HISTORY

2014-06-29 had Flexible snapshot time format
2014-06-01 had Multi destination backup
2014-05-30 had Initial Version

Expand Down
1 change: 1 addition & 0 deletions doc/znapzendztatz.pod
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ S<Dominik Hassler>

=head1 HISTORY

2014-06-29 had Flexible snapshot time format
2014-06-05 had Initial Version

=cut
Expand Down
27 changes: 23 additions & 4 deletions man/znapzendzetup.1
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "ZNAPZENDZETUP 1"
.TH ZNAPZENDZETUP 1 "2014-06-03" "0.4.1" "znapzend"
.TH ZNAPZENDZETUP 1 "2014-06-29" "0.5.5" "znapzend"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand All @@ -138,13 +138,13 @@ znapzendzetup \- znapzend setup utility
where 'command' is one of the following:
.PP
.Vb 3
\& create [\-\-recursive] [\-\-mbuffer=<path>] \e
\& create [\-\-recursive] [\-\-mbuffer=<path>] [\-\-tsformat=<format>] \e
\& SRC plan dataset \e
\& [ DST[:key] plan [[user@]host:]dataset ]
\&
\& delete [\-\-dst=key] <src_dataset>
\&
\& edit [\-\-recursive=on|off] [\-\-mbuffer=<path>|off] \e
\& edit [\-\-recursive=on|off] [\-\-mbuffer=<path>|off] [\-\-tsformat=<format>] \e
\& SRC [plan] dataset \e
\& [ DST:key [plan] [dataset] ]
\&
Expand Down Expand Up @@ -200,10 +200,28 @@ To keep one copy every two days for 10 years:
.Vb 1
\& 10year=>2day
.Ve
.PP
The 'tsformat' option specifies the format of the snapshots being created.
The syntax is 'strftime like'. The string must consist of the mandatory
.PP
.Vb 1
\& (%Y, %m, %d, %H, %M, %S)
.Ve
.PP
and optional
.PP
.Vb 1
\& (\-, _, ., :)
.Ve
.PP
characters.
.PP
If not specified, tsformat defaults to '%Y\-%m\-%d\-%H%M%S'.
.SH "EXAMPLE"
.IX Header "EXAMPLE"
.Vb 4
.Vb 5
\& znapzendzetup create \-\-mbuffer=/opt/omni/bin/mbuffer \e
\& \-\-tsformat=\*(Aq%Y\-%m\-%d\-%H%M%S\*(Aq \e
\& SRC \*(Aq7d=>1h,30d=>4h,90d=>1d\*(Aq tank/home \e
\& DST:a \*(Aq7d=>1h,30d=>4h,90d=>1d,1y=>1w,10y=>1month\*(Aq backup/home \e
\& DST:b \*(Aq7d=>1h,30d=>4h,90d=>1d,1y=>1w,10y=>1month\*(Aq root@bserv:backup/home
Expand Down Expand Up @@ -231,5 +249,6 @@ Tobias\ Oetiker\ <[email protected]>
Dominik\ Hassler
.SH "HISTORY"
.IX Header "HISTORY"
2014\-06\-29 had Flexible snapshot time format
2014\-06\-01 had Multi destination backup
2014\-05\-30 had Initial Version
3 changes: 2 additions & 1 deletion man/znapzendztatz.1
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "ZNAPZENDZTATZ 1"
.TH ZNAPZENDZTATZ 1 "2014-06-11" "0.5.2" "znapzend"
.TH ZNAPZENDZTATZ 1 "2014-06-29" "0.5.5" "znapzend"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down Expand Up @@ -165,4 +165,5 @@ Tobias\ Oetiker\ <[email protected]>
Dominik\ Hassler
.SH "HISTORY"
.IX Header "HISTORY"
2014\-06\-29 had Flexible snapshot time format
2014\-06\-05 had Initial Version

0 comments on commit ffe3808

Please sign in to comment.