Skip to content

Commit

Permalink
Merge pull request #21222 from hashicorp/d-changelog-link
Browse files Browse the repository at this point in the history
Fix broken CHANGELOG link, remove branch dictionary
  • Loading branch information
justinretzolk authored Oct 11, 2021
2 parents 858c563 + 601a1ab commit 30b9428
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2425,4 +2425,4 @@ BUG FIXES

For information on prior major releases, see their changelogs:

* [2.x and earlier](https://github.com/hashicorp/terraform-provider-aws/blob/release/2.x/CHANGELOG.md)
* [2.70.0 and earlier](https://github.com/hashicorp/terraform-provider-aws/blob/v2.70.0/CHANGELOG.md)
12 changes: 0 additions & 12 deletions docs/MAINTAINING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
- [yaml.v2 Updates](#yaml-v2-updates)
- [Pull Request Merge Process](#pull-request-merge-process)
- [Breaking Changes](#breaking-changes)
- [Branch Dictionary](#branch-dictionary)
- [Environment Variable Dictionary](#environment-variable-dictionary)
- [Release Process](#release-process)

Expand Down Expand Up @@ -318,17 +317,6 @@ When breaking changes to the provider are necessary we release them in a major v
- Add the issue/PR to the next major version milestone.
- Leave a comment why this is a breaking change or otherwise only being considered for a major version update. If possible, detail any changes that might be made for the contributor to accomplish the task without a breaking change.

## Branch Dictionary

The following branch conventions are used:

| Branch | Example | Description |
|--------|---------|-------------|
| `main` | `main` | Main, unreleased code branch. |
| `release/*` | `release/2.x` | Backport branches for previous major releases. |

Additional branch naming recommendations can be found in the [Pull Request Submission and Lifecycle documentation](contributing/pullrequest-submission-and-lifecycle.md#branch-prefixes).

## Environment Variable Dictionary

Environment variables (beyond standard AWS Go SDK ones) used by acceptance testing. See also the `aws/internal/envvar` package.
Expand Down

0 comments on commit 30b9428

Please sign in to comment.