Skip to content

Commit

Permalink
backport of commit a10c94d
Browse files Browse the repository at this point in the history
  • Loading branch information
nathancoleman committed Oct 31, 2023
1 parent 97d92ad commit 006a7c7
Show file tree
Hide file tree
Showing 8,536 changed files with 44,427 additions and 202,994 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 0 additions & 3 deletions .changelog/17107.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/17155.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/17481.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/17593.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/17694.txt

This file was deleted.

4 changes: 2 additions & 2 deletions .changelog/17754.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
```release-note:feature
ui: Display the Consul agent version in the nodes list, and allow filtering and sorting of nodes based on versions.
```
ui: consul version is displayed in nodes list with filtering and sorting based on versions
```
3 changes: 0 additions & 3 deletions .changelog/17831.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/17936.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18007.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18300.txt

This file was deleted.

3 changes: 3 additions & 0 deletions .changelog/18303.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
connect: update supported envoy versions to 1.23.12, 1.24.10, 1.25.9, 1.26.4
```
3 changes: 0 additions & 3 deletions .changelog/18324.txt

This file was deleted.

7 changes: 0 additions & 7 deletions .changelog/18336.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18367.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18439.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18504.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18560.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18573.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18583.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18646.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18668.txt

This file was deleted.

7 changes: 0 additions & 7 deletions .changelog/18708.txt

This file was deleted.

7 changes: 0 additions & 7 deletions .changelog/18719.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18769.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18813.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18816.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18943.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18983.txt

This file was deleted.

26 changes: 0 additions & 26 deletions .changelog/18994.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/19077.txt

This file was deleted.

3 changes: 3 additions & 0 deletions .changelog/19120.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
api-gateway: fix matching for different hostnames on the same listener
```
3 changes: 0 additions & 3 deletions .changelog/19218.txt

This file was deleted.

3 changes: 3 additions & 0 deletions .changelog/19273.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:security
connect: update supported envoy versions to 1.24.12, 1.25.11, 1.26.6 to address [CVE-2023-44487](https://github.com/envoyproxy/envoy/security/advisories/GHSA-jhv4-f7mr-xx76)
```
3 changes: 0 additions & 3 deletions .changelog/19306.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/19311.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/19314.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/19389.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/_18366.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/_18422.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/_6074.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/_6870.txt

This file was deleted.

14 changes: 2 additions & 12 deletions .copywrite.hcl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
schema_version = 1

project {
license = "BUSL-1.1"
copyright_year = 2023
license = "MPL-2.0"
copyright_year = 2013

# (OPTIONAL) A list of globs that should not have copyright/license headers.
# Supports doublestar glob patterns for more flexibility in defining which
Expand All @@ -19,21 +19,11 @@ project {

# ignore specific test data files
"agent/uiserver/testdata/**",
"internal/resourcehcl/testdata/**",

# generated files
"agent/structs/structs.deepcopy.go",
"agent/proxycfg/proxycfg.deepcopy.go",
"agent/grpc-middleware/rate_limit_mappings.gen.go",
"agent/uiserver/dist/**",

# ignoring policy embedded files
"agent/structs/acltemplatedpolicy/policies/ce/**",

# licensed under MPL - ignoring for now until the copywrite tool can support
# multiple licenses per repo.
"sdk/**",
"api/**",
"proto-public/**",
]
}
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

blank_issues_enabled: false
contact_links:
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

version: 2
updates:
Expand Down
2 changes: 1 addition & 1 deletion .github/pr-labeler.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

pr/dependencies:
- vendor/**/*
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/changelog_checker.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0


set -euo pipefail
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/get_runner_classes.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

#
# This script generates tag-sets that can be used as runs-on: values to select runners.
Expand Down
26 changes: 0 additions & 26 deletions .github/scripts/get_runner_classes_windows.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .github/scripts/metrics_checker.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

set -uo pipefail

Expand Down
7 changes: 4 additions & 3 deletions .github/scripts/notify_slack.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0


set -uo pipefail

Expand All @@ -12,8 +13,8 @@ if [[ $GITHUB_REF_NAME == "main" ]]; then
COMMIT_MESSAGE=$(git log -1 --pretty=%B | head -n1)
SHORT_REF=$(git rev-parse --short "${GITHUB_SHA}")
curl -X POST -H 'Content-type: application/json' \
--data \
"{ \
--data \
"{ \
\"attachments\": [ \
{ \
\"fallback\": \"GitHub Actions workflow failed!\", \
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/rerun_fails_report.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

#
# Add a comment on the github PR if there were any rerun tests.
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/set_test_package_matrix.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

set -euo pipefail
export RUNNER_COUNT=$1
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/verify_artifact.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0


set -euo pipefail
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/verify_bin.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0


set -euo pipefail
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/verify_deb.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0


set -euo pipefail
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/verify_docker.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0


set -euo pipefail
Expand Down
Loading

0 comments on commit 006a7c7

Please sign in to comment.