Skip to content

Commit a5f9248

Browse files
committed
Merge pull request #25 from mengesb/release-v1.1.6
Release v1.1.6
2 parents ac180ce + 4d40c85 commit a5f9248

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ tf_ghe_server CHANGELOG
33

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

6+
v1.1.6 (2016-05-31)
7+
-------------------
8+
- [Brian Menges] - Add [CONTRIBUTING.md](CONTRIBUTING.md)
9+
- [Brian Menges] - Revise [README.md](README.md)
10+
611
v1.1.5 (2016-05-31)
712
-------------------
813
- [Brian Menges] - Update `ami_map` for [GitHub Enterprise v2.6.3](https://enterprise.github.com/releases/2.6.3/notes)

README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ Terraform GitHub Enterprise plan
77
* AWS (duh!)
88
* AWS subnet id
99
* AWS VPC id
10-
* SSL certificate/key for created instance
10+
* GitHub Enterprise license
11+
* GitHub Enterprise JSON configuration dump file
1112
* Terraform >= 0.6.14
1213
* Chef Server >= 12.x
1314
* Uses a public IP and public DNS
@@ -104,12 +105,10 @@ ami_map.<aws_region>-<ghe_version> = "value"
104105

105106
Variable `ghe_version` should be one of the following:
106107

107-
* 2.6.0 (default)
108-
* 2.5.4
109-
* 2.5.3
110-
* 2.5.2
111-
* 2.5.1
112-
* 2.5.0
108+
* 2.6.x (default; 2.6.0 - current)
109+
* 2.5.x (2.5.0 - 2.5.8)
110+
111+
Please refer to the [GitHub Enterprise Releases](https://enterprise.github.com/releases/) page for a list of current releases
113112

114113
Variable `aws_region` should be one of the following:
115114

0 commit comments

Comments
 (0)