Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into add-proxy-support
Browse files Browse the repository at this point in the history
  • Loading branch information
cyrilgdn committed Apr 16, 2022
2 parents 806a768 + f6cd810 commit 6b1921c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@v3.0.1

- name: Setup Go
uses: actions/setup-go@v2
Expand All @@ -20,6 +20,6 @@ jobs:
- run: go mod vendor

- name: Run golangci-lint
uses: golangci/golangci-lint-action@v2.5.2
uses: golangci/golangci-lint-action@v3.1.0
with:
version: v1.40
2 changes: 1 addition & 1 deletion website/docs/index.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ The following arguments are supported:
* `connect_timeout` - (Optional) Maximum wait for connection, in seconds. The
default is `180s`. Zero or not specified means wait indefinitely.
* `max_connections` - (Optional) Set the maximum number of open connections to
the database. The default is `4`. Zero means unlimited open connections.
the database. The default is `20`. Zero means unlimited open connections.
* `expected_version` - (Optional) Specify a hint to Terraform regarding the
expected version that the provider will be talking with. This is a required
hint in order for Terraform to talk with an ancient version of PostgreSQL.
Expand Down

0 comments on commit 6b1921c

Please sign in to comment.