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

@@ -1,5 +1,6 @@
{
"data": [
{"uid": 452, "time": 1773532457, "pri": 6, "tag": "pvedaemon", "pid": 2385865, "node": "pm-node-01", "user": "root@pam", "msg": "successful auth for user 'root@pam'"},
{"uid": 451, "time": 1773531660, "pri": 6, "tag": "pvedaemon", "pid": 2385865, "node": "pm-node-01", "user": "root@pam", "msg": "successful auth for user 'root@pam'"},
{"uid": 450, "time": 1773531533, "pri": 6, "tag": "pvedaemon", "pid": 2385865, "node": "pm-node-01", "user": "root@pam", "msg": "end task UPID:pm-node-01:00249C33:0EF94CC0:69B5EF48:vncshell::root@pam: OK"},
{"uid": 449, "time": 1773530952, "pri": 6, "tag": "pvedaemon", "pid": 2385863, "node": "pm-node-01", "user": "root@pam", "msg": "successful auth for user 'root@pam'"},
@@ -48,7 +49,6 @@
{"uid": 406, "time": 1773497243, "pri": 6, "tag": "pvedaemon", "pid": 2129, "node": "pm-node-01", "user": "root@pam", "msg": "successful auth for user 'root@pam'"},
{"uid": 405, "time": 1773496341, "pri": 6, "tag": "pvedaemon", "pid": 2128, "node": "pm-node-01", "user": "root@pam", "msg": "successful auth for user 'root@pam'"},
{"uid": 404, "time": 1773495433, "pri": 6, "tag": "pvedaemon", "pid": 2130, "node": "pm-node-01", "user": "root@pam", "msg": "successful auth for user 'root@pam'"},
{"uid": 403, "time": 1773494520, "pri": 6, "tag": "pvedaemon", "pid": 2129, "node": "pm-node-01", "user": "root@pam", "msg": "successful auth for user 'root@pam'"},
{"uid": 402, "time": 1773493615, "pri": 6, "tag": "pvedaemon", "pid": 2130, "node": "pm-node-01", "user": "root@pam", "msg": "successful auth for user 'root@pam'"}
{"uid": 403, "time": 1773494520, "pri": 6, "tag": "pvedaemon", "pid": 2129, "node": "pm-node-01", "user": "root@pam", "msg": "successful auth for user 'root@pam'"}
]
}