diff options
author | Valery Piashchynski <[email protected]> | 2021-01-13 18:34:54 +0300 |
---|---|---|
committer | Valery Piashchynski <[email protected]> | 2021-01-13 18:34:54 +0300 |
commit | 43d5149a4af5ce6743c3de2bfddac2ab6a50c819 (patch) | |
tree | c78b139bed7f4ec7f92f24addf08675c83c94bc5 | |
parent | 2a1c6092056c9dc1d725e393da97b72eb65071c4 (diff) | |
parent | f18e7f6920590ee6f2e59be508518b70a4611638 (diff) |
Merge remote-tracking branch 'origin/master' into 2.0v2.0.0-beta6
# Conflicts:
# .github/workflows/build.yml
# .rr.yaml
# cmd/rr/cmd/root.go
# cmd/rr/cmd/serve.go
# cmd/rr/http/debug.go
# cmd/rr/http/metrics.go
# cmd/rr/http/workers.go
# cmd/util/config.go
# cmd/util/cprint.go
# cmd/util/debug.go
# cmd/util/rpc.go
# config.go
# config_test.go
# controller.go
# controller_test.go
# error_buffer_test.go
# errors_test.go
# pipe_factory_test.go
# pkg/socket/socket_factory_test.go
# plugins/http/config.go
# plugins/http/handler.go
# plugins/http/request.go
# plugins/http/response.go
# plugins/http/uploads.go
# plugins/metrics/config_test.go
# plugins/reload/config.go
# plugins/rpc/config.go
# protocol.go
# protocol_test.go
# server.go
# server_config.go
# server_config_test.go
# server_test.go
# service/container.go
# service/container_test.go
# service/entry_test.go
# service/env/config_test.go
# service/env/service_test.go
# service/gzip/config_test.go
# service/gzip/service.go
# service/gzip/service_test.go
# service/headers/config_test.go
# service/headers/service.go
# service/headers/service_test.go
# service/health/config_test.go
# service/health/service.go
# service/health/service_test.go
# service/http/config_test.go
# service/http/fcgi_test.go
# service/http/rpc_test.go
# service/http/service.go
# service/http/service_test.go
# service/http/ssl_test.go
# service/limit/config.go
# service/limit/config_test.go
# service/limit/controller.go
# service/limit/state_filter.go
# service/metrics/rpc_test.go
# service/metrics/service_test.go
# service/rpc/service.go
# service/rpc/service_test.go
# service/static/config.go
# service/static/config_test.go
# service/static/service.go
# service/static/service_test.go
# socket_factory.go
# state_test.go
# static_pool.go
# static_pool_test.go
# tests/plugins/http/attributes_test.go
# tests/plugins/http/handler_test.go
# tests/plugins/http/uploads_config_test.go
# tests/plugins/http/uploads_test.go
# tests/plugins/reload/config_test.go
# tests/plugins/rpc/config_test.go
# tools/worker_table.go
# util/state.go
# util/state_test.go
# worker.go
# worker_test.go
-rwxr-xr-x | bors.toml | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -15,6 +15,6 @@ status = [ 'Build docker image', ] -required_approvals = 1 +required_approvals = 0 delete_merged_branches = true timeout-sec = 1800 |