Skip to content

Commit

Permalink
Merge pull request #25 from mengesb/release-v1.1.6
Browse files Browse the repository at this point in the history
Release v1.1.6
  • Loading branch information
mengesb committed May 31, 2016
2 parents ac180ce + 4d40c85 commit a5f9248
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ tf_ghe_server CHANGELOG

This file is used to list changes made in each version of the tf_ghe_server Terraform plan.

v1.1.6 (2016-05-31)
-------------------
- [Brian Menges] - Add [CONTRIBUTING.md](CONTRIBUTING.md)
- [Brian Menges] - Revise [README.md](README.md)

v1.1.5 (2016-05-31)
-------------------
- [Brian Menges] - Update `ami_map` for [GitHub Enterprise v2.6.3](https://enterprise.github.com/releases/2.6.3/notes)
Expand Down
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Terraform GitHub Enterprise plan
* AWS (duh!)
* AWS subnet id
* AWS VPC id
* SSL certificate/key for created instance
* GitHub Enterprise license
* GitHub Enterprise JSON configuration dump file
* Terraform >= 0.6.14
* Chef Server >= 12.x
* Uses a public IP and public DNS
Expand Down Expand Up @@ -104,12 +105,10 @@ ami_map.<aws_region>-<ghe_version> = "value"

Variable `ghe_version` should be one of the following:

* 2.6.0 (default)
* 2.5.4
* 2.5.3
* 2.5.2
* 2.5.1
* 2.5.0
* 2.6.x (default; 2.6.0 - current)
* 2.5.x (2.5.0 - 2.5.8)

Please refer to the [GitHub Enterprise Releases](https://enterprise.github.com/releases/) page for a list of current releases

Variable `aws_region` should be one of the following:

Expand Down

0 comments on commit a5f9248

Please sign in to comment.