reflect changes in master and fix minor issues from latest commits

This commit is contained in:
Felix Kunde
2019-11-27 16:56:20 +01:00
5 changed files with 317 additions and 320 deletions
@@ -76,7 +76,6 @@ configuration:
log_s3_bucket: ""
wal_s3_bucket: ""
logical_backup:
log_s3_bucket: ""
logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"
logical_backup_s3_access_key_id: ""
logical_backup_s3_bucket: "my-bucket-url"