Commit Graph

139 Commits

Author SHA1 Message Date
Jim Salter a5fa5e7bad
Merge pull request #843 from mjeanson/master
Fix typos in syncoid documentation
2024-01-13 21:32:08 -05:00
Jim Salter d01eef7555
Merge pull request #846 from jiawen/master-1
Fix tiny typo in README.md
2024-01-13 15:47:19 -05:00
Christoph Klaffl e9eb05e840
Merge branch 'master' into filter-snaps 2024-01-13 19:40:28 +01:00
Jiawen (Kevin) Chen 18ccb7df35
Fix tiny typo in README.md 2023-08-14 22:52:16 -07:00
Michael Jeanson 6b874a7e3c Fix typos in syncoid documentation
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
2023-08-03 16:17:51 -04:00
Christoph Klaffl f3d4d309b5
implemented flag for preserving properties without the zfs -p flag 2023-07-18 08:38:40 +02:00
Christoph Klaffl 1e3874aea5
Merge branch 'master' into direct-connection 2023-04-27 09:16:51 +02:00
Christoph Klaffl 01ace52642
Merge branch 'master' into syncoid-hold 2023-04-26 19:59:20 +02:00
Mathieu Arnold f711e6bf28
Add a note about when snapshot deletion is done. 2023-04-08 09:45:01 +02:00
Mathieu Arnold 63dd819ec5
Rename option. 2023-04-08 09:45:00 +02:00
Mathieu Arnold 2d89434ac3
Add target snapshot deletion. 2023-04-08 09:42:58 +02:00
Christoph Klaffl 9e04911945
Merge branch 'master' into direct-connection 2023-03-24 09:16:13 +01:00
Christoph Klaffl 0b27059133
Merge remote-tracking branch 'upstream/master' into filter-snaps 2023-03-21 16:35:20 +01:00
Christoph Klaffl f3152d6f6c
Merge remote-tracking branch 'upstream/master' into syncoid-hold 2023-03-21 15:44:04 +01:00
Christoph Klaffl e5b1d0fd4f
Merge branch 'pr796' into pr-merger 2023-03-20 22:31:40 +01:00
Christoph Klaffl b3d32d9394
Merge branch 'pr788' into pr-merger 2023-03-20 22:31:19 +01:00
Christoph Klaffl 50ff9b7d31
Merge branch 'pr775' into pr-merger 2023-03-20 22:29:17 +01:00
Christoph Klaffl 52c30bfad7
Merge branch 'pr679' into pr-merger 2023-03-20 22:06:21 +01:00
Christoph Klaffl 59544de134
Merge branch 'pr605' into pr-merger 2023-03-20 21:14:02 +01:00
dodexahedron 38f2d625a8
Clarified that compression is on the wire 2023-02-02 19:32:08 -07:00
Josh Soref 2333f1142d spelling: suppress
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-01-01 14:43:35 -05:00
Josh Soref 0fcaab54f6 spelling: snapshotted
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-01-01 14:43:35 -05:00
Josh Soref 3ffa57c72f spelling: resumable
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-01-01 14:43:35 -05:00
Josh Soref a666424742 spelling: mbytes
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-01-01 14:43:35 -05:00
Josh Soref 9f898439e0 spelling: a lot
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-01-01 14:30:57 -05:00
Vinnie Okada 0c577fc735 Deprecate the --exclude option
Add a new option, --exclude-datasets, to replace --exclude. This makes
the naming more consistent now that there are options to filter both
snapshots and datasets.

Also add more information to the README about the distinction between
--exclude-datasets and --(in|ex)clude-snaps.
2022-12-24 12:59:59 -07:00
Vinnie Okada 3a1b1b006f Add new syncoid options to the README
Update the README with the new --include-snaps and --exclude-snaps
 syncoid options.
2022-12-24 12:55:13 -07:00
joelishness 5d469c4bb2
Update README.md
Fixed some typos
2022-10-03 21:36:26 -07:00
Juergen Heiles 8cf0144c02
Merge branch 'jimsalterjrs:master' into syncoid-hold 2021-11-13 21:09:48 +01:00
Lilis Iskandar 523d500609
Update README.md
Signed-off-by: Lilis Iskandar <lilis@veand.co>
2021-09-29 18:19:26 +08:00
JavaScriptDude 265d4a009e
Add Link to Wiki Detailing sanoid.conf Settings 2021-09-22 18:17:15 -04:00
rbike 2858fbe907 Docs update + error handling
updated in-program docs and readme,
check if matchingsnap exists before releasing hold
2021-03-03 13:49:13 +01:00
Christoph Klaffl 309c0866fa
implemented removal of conflicting snapshots with force-delete option 2020-12-07 22:40:28 +01:00
Christoph Klaffl bdd0dfb733
Merge branch 'master' into preserve-recordsize 2020-11-03 17:50:50 +01:00
Jim Salter a4cde57d29
Merge pull request #497 from phreaker0/scripts-snapshot-grouping
Scripts snapshot grouping
2020-11-01 17:47:11 -05:00
Jim Salter 25823b1006
Merge pull request #505 from phreaker0/docs-defaults-note
added note about the default options if some interval types aren't ...
2020-11-01 17:24:11 -05:00
Jim Salter 318f7993ef
Merge pull request #502 from phreaker0/docs-fix-argument
fix typo in argument description
2020-11-01 17:23:49 -05:00
Jim Salter 006f897d74
Merge pull request #500 from phreaker0/docs-cron-example
added cron setup example
2020-11-01 17:23:06 -05:00
Christoph Klaffl 9ab57e9bb4
added documentation regarding --keep-sync-snap option 2020-05-01 17:26:54 +02:00
Christoph Klaffl e1a6507455
direct connection will default to busybox nc again but can be switched to mbuffer 2020-04-02 21:37:06 +02:00
Christoph Klaffl fcae918ffa
updated readme regarding busybox nc -> mbuffer switch 2020-03-31 09:40:36 +02:00
Christoph Klaffl 84bc3164f0
implemented option for direct connection via socat and busybox nc 2020-02-21 20:34:28 +01:00
Christoph Klaffl eabe3aa791
added note about the default options if some interval types aren't sepcified 2020-02-12 21:31:21 +01:00
Christoph Klaffl d1a161ca72
fix typo in argument description 2020-02-12 20:30:52 +01:00
Christoph Klaffl a3f242d0d4
added cron setup example 2020-02-12 20:10:28 +01:00
Christoph Klaffl 0b582f6200
group snapshot creation together so pre/post scripts are only run once per dataset and prepare for future atomic grouping feature 2020-02-12 17:48:42 +01:00
Christoph Klaffl 34d6d44fa8
Merge branch 'master' into pr447 2020-02-11 17:45:54 +01:00
Christoph Klaffl d0ef3ec2d5
Merge branch 'master' into preserve-recordsize 2020-01-16 21:23:07 +01:00
Ben Wolsieffer 59a07f92b4 Add run-dir option. 2019-12-06 14:39:33 -05:00
Ben Wolsieffer a1f5e4c0c0 Add cache-dir option. 2019-12-06 14:37:07 -05:00