luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge Consul OSS branch 'master' at commit ce9cfc773d529ae4b8259d195323c0c350c1f9f1

This commit is contained in:
Alvin Huang 2019-08-21 16:07:04 -04:00
parent 5f9acb6894 2821b69dc9
commit 387557dc34
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/config.yml
View File

@ -90,7 +90,7 @@ jobs:
parallelism: 8 parallelism: 8
environment: environment:
<<: *ENVIRONMENT <<: *ENVIRONMENT
GOTAGS: '' # No tags for OSS but there are for enterprise GOTAGS: "" # No tags for OSS but there are for enterprise
steps: steps:
- checkout - checkout
- restore_cache: # restore cache from dev-build job - restore_cache: # restore cache from dev-build job
@ -116,7 +116,7 @@ jobs:
- image: *GOLANG_IMAGE - image: *GOLANG_IMAGE
environment: environment:
<<: *ENVIRONMENT <<: *ENVIRONMENT
GOTAGS: '' # No tags for OSS but there are for enterprise GOTAGS: "" # No tags for OSS but there are for enterprise
steps: steps:
- checkout - checkout
- restore_cache: # restore cache from dev-build job - restore_cache: # restore cache from dev-build job
@ -467,8 +467,7 @@ jobs:
- image: *GOLANG_IMAGE - image: *GOLANG_IMAGE
environment: environment:
ENVOY_VERSIONS: "1.8.0" ENVOY_VERSIONS: "1.8.0"
steps: steps: &ENVOY_INTEGRATION_TEST_STEPS
&ENVOY_INTEGRATION_TEST_STEPS
- checkout - checkout
# Get go binary from workspace # Get go binary from workspace
- attach_workspace: - attach_workspace:
@ -595,6 +594,7 @@ jobs:
} \ } \
] \ ] \
}" ${CONSUL_SLACK_WEBHOOK_URL} }" ${CONSUL_SLACK_WEBHOOK_URL}
git push --delete origin "${git_merge_branch}"
exit 1 exit 1
fi fi

2
website/source/docs/install/ports.html.md
View File

@ -25,7 +25,7 @@ Before running Consul, you should ensure the following bind ports are accessible
| HTTPS: The HTTPs API | disabled (8501)* | | HTTPS: The HTTPs API | disabled (8501)* |
| gRPC: The gRPC API | disabled (8502)* | | gRPC: The gRPC API | disabled (8502)* |
| LAN Serf: The Serf LAN port (TCP and UDP) | 8301 | | LAN Serf: The Serf LAN port (TCP and UDP) | 8301 |
| Wan Serf: The Serf WAN port TCP and UDP) | 8302 | | Wan Serf: The Serf WAN port (TCP and UDP) | 8302 |
| server: Server RPC address (TCP Only) | 8300 | | server: Server RPC address (TCP Only) | 8300 |
| Sidecar Proxy Min: Inclusive min port number to use for automatically assigned sidecar service registrations. | 21000 | | Sidecar Proxy Min: Inclusive min port number to use for automatically assigned sidecar service registrations. | 21000 |
| Sidecar Proxy Max: Inclusive max port number to use for automatically assigned sidecar service registrations. | 21255 | | Sidecar Proxy Max: Inclusive max port number to use for automatically assigned sidecar service registrations. | 21255 |