cyteen
/
sanoid
mirror of https://github.com/jimsalterjrs/sanoid
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
449 Commits 2 Branches 20 Tags 4.3 MiB
Commit Graph

449 Commits

Author SHA1 Message Date
Christoph Klaffl c3e20fdefc
FreeBSD sed needs a different syntax 2019-01-09 17:41:16 +01:00
Jim Salter 8da79ddd2b
Merge pull request #321 from phreaker0/freebsd-tests 
make tests work on FreeBSD
 2019-01-08 16:55:13 -05:00
Christoph Klaffl ea482ce7b6
make tests work on FreeBSD 2019-01-08 20:10:38 +01:00
Jim Salter 582ab5b715
Merge pull request #318 from jimsalterjrs/revert-181-zfs-recursion 
Revert "Zfs Recursion"
 2019-01-06 15:42:34 -05:00
Jim Salter 50a2374021
Revert "Zfs Recursion" 2019-01-06 15:41:18 -05:00
Jim Salter 6882c91208
Merge pull request #181 from jMichaelA/zfs-recursion 
Zfs Recursion
 2019-01-06 15:33:18 -05:00
Jim Salter ade8e2cd67
Merge pull request #301 from benyanke/patch-1 
Improved documentation on --no-command-checks
 2019-01-06 15:29:51 -05:00
Jim Salter 165faee706
remove spurious line break from HTML 2019-01-06 15:29:29 -05:00
Jim Salter 64a86ac8ff
Merge pull request #317 from ppcontrib/fixbookmark 
fix for #316 - CRITICAL ERROR: bookmarks couldn't be listed for <volume>
 2019-01-06 15:27:06 -05:00
WG Dev f941d7f782 fix for #316 - CRITICAL ERROR: bookmarks couldn't be listed for <volume> 2019-01-06 10:46:24 +01:00
Christoph Klaffl 4daafca9cf
prevent problems with shell expansion and codestyle 2018-12-20 01:33:35 +01:00
Sam Allred 1605a60c62
CLIMATE-1151: added config option to use zfs recursion 2018-12-20 01:14:47 +01:00
Ben Yanke 8d88c4743e
improved documentation on --no-command-checks 2018-12-20 00:45:12 +01:00
Jim Salter a7cb1e2226
Merge pull request #308 from phreaker0/monitor-period-case-insensitive 
made time units case insensitive and removed monthlies
 2018-12-18 18:42:45 -05:00
Christoph Klaffl ac80a75315
made time units case insensitive and removed monthlies 2018-12-19 00:36:10 +01:00
Jim Salter f1f31412af
Merge pull request #306 from phreaker0/monitor-time-period 
support monitor time period suffixes
 2018-12-17 13:08:48 -05:00
Christoph Klaffl cfab4eafdf
added/fixed documentation 2018-12-16 22:02:14 +01:00
Christoph Klaffl 2ece13eccf
allow time units to be used for monitoring warn/crit values 2018-12-16 21:54:43 +01:00
Jim Salter dc4df15e2e
fix broken monthly_warn monthly_crit in sanoid.defaults.conf 2018-12-14 10:44:45 -05:00
Jim Salter 1019cc5b65
Merge pull request #216 from shodanshok/master 
Added sanoid:force-prune, syncoid:no-clone-rollback and syncoid:no-rollback
 2018-12-13 11:01:10 -05:00
Gionatan Danti 8568ac3e10 Fix missing coma 2018-12-10 11:21:43 +01:00
Gionatan Danti 210e0aae64 Introduced (un)forced recv when using bookmarks also 2018-12-07 17:38:45 +01:00
Gionatan Danti 1ed37e9891 Resolve a conflict 2018-12-06 09:26:22 +01:00
Gionatan Danti 17be840590 Updated to latest upstream 2018-12-06 09:18:29 +01:00
Jim Salter e186f3c66e
Merge pull request #263 from phreaker0/prepare-release 
prepare for v2.0.0 release
 2018-12-04 17:44:43 -05:00
Christoph Klaffl 5fd4ff04bb
Merge branch 'master' into prepare-release 2018-12-04 23:42:18 +01:00
Jim Salter 25b4cf8285
Merge pull request #300 from phreaker0/fix-perl-warning 
fixed a regression which causes perl warnings
 2018-12-04 17:37:23 -05:00
Christoph Klaffl 3a1ffe8554
fixed a regression which causes perl warnings 2018-12-04 23:33:18 +01:00
Christoph Klaffl 00a9c6f6b5
added changed from recently merged PR's 2018-12-04 23:12:16 +01:00
Christoph Klaffl e162433389
Merge branch 'master' into prepare-release 2018-12-04 23:11:36 +01:00
Jim Salter 23a0ce2e06
Update CHANGELIST 2018-12-04 16:33:03 -05:00
Jim Salter a8f2275328
Merge pull request #248 from phreaker0/force-delete 
force delete flag
 2018-12-04 16:30:25 -05:00
Christoph Klaffl 0c217ced8b
Merge branch 'master' into force-delete 2018-12-04 22:15:54 +01:00
Jim Salter 7f8055df5d
Merge pull request #254 from spheenik/master 
Add xz compression
 2018-12-04 16:07:45 -05:00
Jim Salter 1042414911
Merge pull request #286 from phreaker0/no-sleep 
removed sleeping between snapshot taking
 2018-12-04 16:05:51 -05:00
Christoph Klaffl be3cbb0e77
Merge branch 'master' into master 2018-12-04 22:03:06 +01:00
Jim Salter 95a79af395
Merge pull request #140 from lopsided98/master 
Add '--no-privilege-elevation' option to bypass root check.
 2018-12-04 16:02:35 -05:00
Jim Salter b5dcb699f2
Merge pull request #267 from phreaker0/fix-recursive-parsing 
parse values for recursive key like the others booleans, previously a…
 2018-12-04 15:57:54 -05:00
Ben Wolsieffer 7d742914e5 Add '--no-privilege-elevation' option to bypass root check. 2018-12-04 15:57:00 -05:00
Christoph Klaffl 3ca13dcf82
Merge branch 'master' into fix-recursive-parsing 2018-12-04 21:56:56 +01:00
Jim Salter 61115712e8
Merge pull request #163 from phreaker0/weekly 
implemented weekly period
 2018-12-04 15:53:46 -05:00
Jim Salter bb79e7b5ec
Merge pull request #247 from phreaker0/bookmarks 
implemented support for zfs bookmarks as fallback
 2018-12-04 15:49:00 -05:00
Christoph Klaffl 157ab36698
Merge branch 'master' into weekly 2018-12-04 21:48:18 +01:00
Jim Salter 8ea06823f8
Merge pull request #261 from phreaker0/key-warning 
show warning if a key is ignored from a template
 2018-12-04 15:45:53 -05:00
Jim Salter 869c255b6a
Merge pull request #262 from phreaker0/fix-typo 
fix typo
 2018-12-04 15:44:10 -05:00
Jim Salter 249d35cc3e
Merge pull request #264 from phreaker0/ignore-unknown-type 
ignore unknown interval type to prevent perl warnings
 2018-12-04 15:39:48 -05:00
Christoph Klaffl a0b983ee6e
warn if unknown interval type is used 2018-12-04 21:38:15 +01:00
Christoph Klaffl 9267d20a8c
Merge branch 'master' into ignore-unknown-type 2018-12-04 21:36:52 +01:00
Jim Salter aba870c965
Merge pull request #266 from phreaker0/fix-warnings 
fix uninitialized value warning in debug mode on initial run (no snap…
 2018-12-04 15:36:00 -05:00
Jim Salter 40dfb455b5
Merge pull request #268 from phreaker0/parameters 
added all available syncoid/sanoid parameters to README
 2018-12-04 15:33:08 -05:00