Merge Consul OSS branch 'master' at commit 683262a6
Showing
- .circleci/config.yml 12 additions, 0 deletions.circleci/config.yml
- .travis.yml 1 addition, 0 deletions.travis.yml
- CHANGELOG.md 12 additions, 1 deletionCHANGELOG.md
- agent/consul/state/catalog.go 1 addition, 1 deletionagent/consul/state/catalog.go
- agent/consul/state/catalog_test.go 65 additions, 0 deletionsagent/consul/state/catalog_test.go
- agent/local/state.go 9 additions, 3 deletionsagent/local/state.go
- api/api.go 3 additions, 3 deletionsapi/api.go
- test/integration/connect/envoy/xcase-consul-exec/setup.sh 0 additions, 0 deletionstest/integration/connect/envoy/xcase-consul-exec/setup.sh
- test/integration/connect/envoy/xcase-consul-exec/verify.bats 0 additions, 0 deletionstest/integration/connect/envoy/xcase-consul-exec/verify.bats
- website/scripts/deploy.sh 56 additions, 23 deletionswebsite/scripts/deploy.sh
- website/source/api/agent/connect.html.md 4 additions, 4 deletionswebsite/source/api/agent/connect.html.md
- website/source/api/agent/service.html.md 3 additions, 2 deletionswebsite/source/api/agent/service.html.md
- website/source/api/kv.html.md 1 addition, 1 deletionwebsite/source/api/kv.html.md
- website/source/docs/acl/acl-migrate-tokens.html.md 1 addition, 1 deletionwebsite/source/docs/acl/acl-migrate-tokens.html.md
- website/source/docs/agent/config_entries.html.md 51 additions, 34 deletionswebsite/source/docs/agent/config_entries.html.md
- website/source/docs/agent/options.html.md 9 additions, 9 deletionswebsite/source/docs/agent/options.html.md
- website/source/docs/agent/services.html.md 2 additions, 2 deletionswebsite/source/docs/agent/services.html.md
- website/source/docs/commands/acl/token.html.md.erb 1 addition, 1 deletionwebsite/source/docs/commands/acl/token.html.md.erb
- website/source/docs/commands/connect/envoy.html.md.erb 3 additions, 3 deletionswebsite/source/docs/commands/connect/envoy.html.md.erb
- website/source/docs/commands/connect/proxy.html.md.erb 2 additions, 2 deletionswebsite/source/docs/commands/connect/proxy.html.md.erb
Please register or sign in to comment