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 +1 @@
{"node_status":{"pm-node-02":"online","pm-node-03":"online","pm-node-01":"online"},"timestamp":1773532313,"service_status":{"vm:101":{"uid":"VJVtlWyv09GTXXkgzbw2Hg","node":"pm-node-01","running":1,"state":"started"},"vm:108":{"running":1,"state":"started","node":"pm-node-02","uid":"uylqElXCQ9BAfJip6ARXJA"},"vm:107":{"node":"pm-node-01","state":"started","running":1,"uid":"6OlMV/jFQQNAu8kTVGhf2g"},"vm:102":{"uid":"eIPNBTO6e+iG6BfSLxOk1Q","state":"started","running":1,"node":"pm-node-02"},"vm:103":{"node":"pm-node-02","state":"started","running":1,"uid":"6uQKS0GTkAZXt8MM/frXhw"},"vm:109":{"node":"pm-node-02","state":"stopped","uid":"2D/bm2jva3+YI/9livktKQ"},"vm:100":{"uid":"NYua7Fq6HWwKaSZAhrr59g","node":"pm-node-01","running":1,"state":"started"},"vm:106":{"node":"pm-node-02","state":"started","running":1,"uid":"dMuTYL920Vup2apnji7a2w"},"vm:105":{"node":"pm-node-01","state":"started","running":1,"uid":"DoY7DzxFN3XYFwrhFSrSwg"}},"master_node":"pm-node-01"}
{"node_status":{"pm-node-02":"online","pm-node-03":"online","pm-node-01":"online"},"timestamp":1773532953,"service_status":{"vm:101":{"uid":"xBlqOjlR8lh00pshVOFf+A","node":"pm-node-01","running":1,"state":"started"},"vm:108":{"running":1,"state":"started","node":"pm-node-02","uid":"jYvwAMaXHv5Mb6FWb6FJVg"},"vm:107":{"node":"pm-node-01","state":"started","running":1,"uid":"DtafaA/OvvZ9V5K+32PSHw"},"vm:102":{"uid":"8XZwyFkrS09tQZRqyCizRw","state":"started","running":1,"node":"pm-node-02"},"vm:103":{"node":"pm-node-02","state":"started","running":1,"uid":"iMl0RciBASpHTdrEtHBamg"},"vm:109":{"node":"pm-node-02","state":"stopped","uid":"2D/bm2jva3+YI/9livktKQ"},"vm:100":{"uid":"YfAvi3cagWSvKEtutoqi0A","node":"pm-node-01","running":1,"state":"started"},"vm:106":{"node":"pm-node-02","state":"started","running":1,"uid":"b10RblnZfnpZXPPC6e00NQ"},"vm:105":{"node":"pm-node-01","state":"started","running":1,"uid":"vid5So50nNV6+uSQIh+yVg"}},"master_node":"pm-node-01"}