manual: resolve backup conflict

This commit is contained in:
Semaphore
2026-03-14 17:05:08 -07:00
parent 97dee315f4
commit 6fd53020f6
8 changed files with 44 additions and 44 deletions

View File

@@ -17,8 +17,8 @@
"vzdump.cron": 3,
"vzdump.conf": 3,
"jobs.cfg": 3,
"ha/crm_commands": 251277,
"ha/manager_status": 251268,
"ha/crm_commands": 251341,
"ha/manager_status": 251332,
"ha/resources.cfg": 3,
"ha/rules.cfg": 3,
"ha/groups.cfg": 3,
@@ -45,26 +45,26 @@
"kvstore": {
"pm-node-01": {
"kv/static-info": 0,
"tasklist": 251471,
"tasklist": 251534,
"kv/cpuflags-tcg": 1,
"kv/cpuflags-kvm": 1,
"kv/version-info": 1,
"kv/network": 251332}
"kv/network": 251395}
,
"pm-node-02": {
"kv/static-info": 7,
"tasklist": 251507,
"tasklist": 251570,
"kv/cpuflags-tcg": 9,
"kv/cpuflags-kvm": 9,
"kv/network": 251333,
"kv/network": 251396,
"kv/version-info": 9}
,
"pm-node-03": {
"kv/static-info": 7,
"tasklist": 251436,
"tasklist": 251500,
"kv/cpuflags-tcg": 9,
"kv/cpuflags-kvm": 9,
"kv/network": 251327,
"kv/network": 251391,
"kv/version-info": 9}
}
}