Skip to content
Snippets Groups Projects
  • void's avatar
    6d88cb1c
    Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone · 6d88cb1c
    void authored
    # Conflicts:
    #	warpsrvint/docker_grafana/tasks/main.yml
    #	warpsrvint/docker_influx/tasks/main.yml
    #	warpsrvint/docker_kapacitor/tasks/main.yaml
    #	warpsrvint/docker_l4z0r/tasks/main.yml
    #	warpsrvint/docker_librenms/tasks/main.yml
    #	warpsrvint/docker_matestatdb/tasks/main.yml
    #	webserver/docker_alerta/tasks/main.yml
    #	webserver/docker_hackmd/tasks/main.yml
    #	webserver/docker_keycloak/tasks/main.yml
    6d88cb1c
    History
    Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone
    void authored
    # Conflicts:
    #	warpsrvint/docker_grafana/tasks/main.yml
    #	warpsrvint/docker_influx/tasks/main.yml
    #	warpsrvint/docker_kapacitor/tasks/main.yaml
    #	warpsrvint/docker_l4z0r/tasks/main.yml
    #	warpsrvint/docker_librenms/tasks/main.yml
    #	warpsrvint/docker_matestatdb/tasks/main.yml
    #	webserver/docker_alerta/tasks/main.yml
    #	webserver/docker_hackmd/tasks/main.yml
    #	webserver/docker_keycloak/tasks/main.yml