Merge remote-tracking branch 'origin/master' into kopiczko/add-role.s…

…pec.allow.request.reason.required
gravitational · Nov 27, 2024 · a5165aa · a5165aa
2 parents 170468e + b465b04
commit a5165aa
Show file tree

Hide file tree

Showing 20 changed files with 838 additions and 2,503 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -627,7 +627,7 @@ outputs:
 is recommended that you migrate to v2 as soon as possible to benefit from new
 Machine ID features.
 
-For more details and guidance on how to upgrade to v2, see [docs](docs/pages/reference/machine-id/v14-upgrade-guide.mdx).
+For more details and guidance on how to upgrade to v2, see [docs](https://github.com/gravitational/teleport/blob/branch/v14/docs/pages/reference/machine-id/v14-upgrade-guide.mdx).
 
 ## 13.0.1 (05/xx/23)
 

diff --git a/api/types/provisioning.go b/api/types/provisioning.go
@@ -81,6 +81,7 @@ const (
 
 var JoinMethods = []JoinMethod{
 	JoinMethodAzure,
+	JoinMethodBitbucket,
 	JoinMethodCircleCI,
 	JoinMethodEC2,
 	JoinMethodGCP,