cscott/oadp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git weirndness

Browse Source
This commit is contained in:
Conan Scott
2026-01-03 08:45:32 +11:00
parent 64f3347058
commit 8457a529f7
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/stateful-backups.yaml
View File

@@ -60,7 +60,6 @@ spec:
timeout: 5m timeout: 5m
onError: Continue onError: Continue
<<<<<<< HEAD
# Gitea PostgreSQL: checkpoint before backup # Gitea PostgreSQL: checkpoint before backup
#- name: gitea-postgres-checkpoint #- name: gitea-postgres-checkpoint
# includedNamespaces: # includedNamespaces:
@@ -79,9 +78,7 @@ spec:
# timeout: 2m # timeout: 2m
# onError: Continue # onError: Continue
# Authentik PostgreSQL: checkpoint before backup # Authentik PostgreSQL: checkpoint before backup
======= # Authentik PostgreSQL: checkpoint before backup
# Authentik PostgreSQL: checkpoint before backup
>>>>>>> 082f471 (Allow snapshits for NFS (hopefully))
- name: authentik-postgres-checkpoint - name: authentik-postgres-checkpoint
includedNamespaces: includedNamespaces:
- authentik - authentik