Skip to content

Commit

Permalink
backport of commit 4019348
Browse files Browse the repository at this point in the history
  • Loading branch information
nywilken committed Nov 28, 2023
1 parent a2b3487 commit 4b6b2f1
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
2 changes: 2 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@

# release configuration

/.release/ @hashicorp/release-engineering
/.github/workflows/build.yml @hashicorp/release-engineering
19 changes: 9 additions & 10 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.
"Business Source License" is a trademark of MariaDB Corporation Ab.
Business Source License is a trademark of MariaDB Corporation Ab.

Parameters

Licensor: HashiCorp, Inc.
Licensed Work: Packer Version 1.10.0 or later. The Licensed Work is (c) 2023
HashiCorp, Inc.
Licensed Work: Packer 1.10.0. The Licensed Work is (c) 2023 HashiCorp, Inc.
Additional Use Grant: You may make production use of the Licensed Work, provided
Your use does not include offering the Licensed Work to third
parties on a hosted or embedded basis in order to compete with
HashiCorp's paid version(s) of the Licensed Work. For purposes
HashiCorps paid version(s) of the Licensed Work. For purposes
of this license:

A "competitive offering" is a Product that is offered to third
A competitive offering is a Product that is offered to third
parties on a paid basis, including through paid support
arrangements, that significantly overlaps with the capabilities
of HashiCorp's paid version(s) of the Licensed Work. If Your
of HashiCorps paid version(s) of the Licensed Work. If Your
Product is not a competitive offering when You first make it
generally available, it will not become a competitive offering
later due to HashiCorp releasing a new version of the Licensed
Work with additional capabilities. In addition, Products that
are not provided on a paid basis are not competitive.

"Product" means software that is offered to end users to manage
Product means software that is offered to end users to manage
in their own environments or offered as a service on a hosted
basis.

"Embedded" means including the source code or executable code
from the Licensed Work in a competitive offering. "Embedded"
Embedded means including the source code or executable code
from the Licensed Work in a competitive offering. Embedded
also means packaging the competitive offering in such a way
that the Licensed Work must be accessed or downloaded for the
competitive offering to operate.
Expand Down Expand Up @@ -86,7 +85,7 @@ Licensor or its affiliates (provided that you may use a trademark or logo of
Licensor as expressly required by this License).

TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
AN AS IS BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
TITLE.
1 change: 1 addition & 0 deletions command/hcl2_upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ var knownPlugins = map[string]string{
"googlecompute": "github.com/hashicorp/googlecompute",
"qemu": "github.com/hashicorp/qemu",
"vagrant": "github.com/hashicorp/vagrant",
"virtualbox": "github.com/hashicorp/virtualbox",
"vmware": "github.com/hashicorp/vmware",
"vsphere": "github.com/hashicorp/vsphere",
}
Expand Down
2 changes: 1 addition & 1 deletion version/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.0
1.10.0
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var (
// A pre-release marker for the version can also be specified (e.g -dev). If this is omitted
// The main version number that is being run at the moment.

Version = "1.11.0"
Version = "1.10.0"

// A pre-release marker for the version. If this is "" (empty string)
// then it means that it is a final release. Otherwise, this is a pre-release
Expand Down

0 comments on commit 4b6b2f1

Please sign in to comment.