extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-12-22 15:11:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

pruning: fix YAML representation of PruneKeepRegex

Browse Source
This commit is contained in:
Christian Schwarz 2018-10-11 13:07:52 +02:00
parent 01668a989e
commit 93c90cd705
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.go
View File

@ -218,7 +218,7 @@ type PruneKeepLastN struct {
type PruneKeepRegex struct { // FIXME rename to KeepRegex type PruneKeepRegex struct { // FIXME rename to KeepRegex
Type string `yaml:"type"` Type string `yaml:"type"`
Regex string `yaml:"prefix"` Regex string `yaml:"regex"`
} }
type LoggingOutletEnum struct { type LoggingOutletEnum struct {
@ -341,7 +341,7 @@ func (t *PruningEnum) UnmarshalYAML(u func(interface{}, bool) error) (err error)
"not_replicated": &PruneKeepNotReplicated{}, "not_replicated": &PruneKeepNotReplicated{},
"last_n": &PruneKeepLastN{}, "last_n": &PruneKeepLastN{},
"grid": &PruneGrid{}, "grid": &PruneGrid{},
"prefix": &PruneKeepRegex{}, "regex": &PruneKeepRegex{},
}) })
return return
} }

4
config/samples/pull_ssh.yml
View File

@ -21,8 +21,8 @@ jobs:
grid: 1x1h(keep=all) | 24x1h | 14x1d grid: 1x1h(keep=all) | 24x1h | 14x1d
regex: "^zrepl_.*" regex: "^zrepl_.*"
keep_receiver: keep_receiver:
- type: prefix - type: regex
prefix: keep_ regex: keep_
- type: grid - type: grid
grid: 1x1h(keep=all) | 24x1h | 35x1d | 6x30d grid: 1x1h(keep=all) | 24x1h | 35x1d | 6x30d
regex: "^zrepl_.*" regex: "^zrepl_.*"