Skip to content

Commit

Permalink
Merge release branch into master [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
tinnightcap committed Nov 2, 2017
2 parents 9962d97 + f5b7875 commit 748b32b
Show file tree
Hide file tree
Showing 6 changed files with 4,475 additions and 6 deletions.
16 changes: 11 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
**Closed issues:**

- \[node\_exporter\] Expose nubis base version [\#704](https://github.com/nubisproject/nubis-base/issues/704)
- Tag v2.0.2 release [\#729](https://github.com/nubisproject/nubis-base/issues/729)

**Merged pull requests:**

- Merge v2.0.2 release into develop. \[skip ci\] [\#731](https://github.com/nubisproject/nubis-base/pull/731) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v2.0.2 release \[skip ci\] [\#730](https://github.com/nubisproject/nubis-base/pull/730) ([tinnightcap](https://github.com/tinnightcap))

## [v2.0.1](https://github.com/nubisproject/nubis-base/tree/v2.0.1) (2017-10-13)
[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v2.0.0...v2.0.1)
Expand Down Expand Up @@ -736,7 +742,7 @@
- Add support for 3 more Consul Server bootstrap options: [\#142](https://github.com/nubisproject/nubis-base/pull/142) ([gozer](https://github.com/gozer))

## [v0.9.0](https://github.com/nubisproject/nubis-base/tree/v0.9.0) (2015-07-23)
[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v0.79...v0.9.0)
[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v0.1...v0.9.0)

**Closed issues:**

Expand All @@ -752,11 +758,11 @@
- Move creation of /etc/puppet/nubis/{files,templates} to base image. Fixes \#134 [\#135](https://github.com/nubisproject/nubis-base/pull/135) ([gozer](https://github.com/gozer))
- Ubuntu repositories have very old versions of the ec2-ami-tools that just don't work at all. [\#130](https://github.com/nubisproject/nubis-base/pull/130) ([gozer](https://github.com/gozer))

## [v0.79](https://github.com/nubisproject/nubis-base/tree/v0.79) (2015-06-11)
[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v0.1...v0.79)

## [v0.1](https://github.com/nubisproject/nubis-base/tree/v0.1) (2015-06-11)
[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v1.35...v0.1)
[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v0.79...v0.1)

## [v0.79](https://github.com/nubisproject/nubis-base/tree/v0.79) (2015-06-11)
[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v1.35...v0.79)

**Closed issues:**

Expand Down
29 changes: 29 additions & 0 deletions nubis/builder/artifacts/v2.0.3/AMIs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"builds": [
{
"name": "amazon-ebs-amazon-linux",
"builder_type": "amazon-ebs",
"build_time": 1509653531,
"files": null,
"artifact_id": "ap-northeast-1:ami-c1f857a7,ap-northeast-2:ami-c6b410a8,ap-southeast-1:ami-c3d09da0,ap-southeast-2:ami-8625cbe4,eu-central-1:ami-7b29ac14,eu-west-1:ami-d4c060ad,sa-east-1:ami-232f544f,us-east-1:ami-d153f8ab,us-west-1:ami-a0330cc0,us-west-2:ami-8d39f2f5",
"packer_run_uuid": "9d201947-00de-1bfc-92ca-152f73e82e76"
},
{
"name": "amazon-ebs-ubuntu",
"builder_type": "amazon-ebs",
"build_time": 1509653916,
"files": null,
"artifact_id": "ap-northeast-1:ami-d0fa55b6,ap-northeast-2:ami-89b612e7,ap-southeast-1:ami-78d69b1b,ap-southeast-2:ami-e923cd8b,eu-central-1:ami-8f2eabe0,eu-west-1:ami-7ec26207,sa-east-1:ami-6a235806,us-east-1:ami-3a50fb40,us-west-1:ami-ba320dda,us-west-2:ami-063df67e",
"packer_run_uuid": "9d201947-00de-1bfc-92ca-152f73e82e76"
},
{
"name": "amazon-ebs-centos",
"builder_type": "amazon-ebs",
"build_time": 1509654259,
"files": null,
"artifact_id": "ap-northeast-1:ami-19f45b7f,ap-northeast-2:ami-75b7131b,ap-southeast-1:ami-bfd69bdc,ap-southeast-2:ami-2223cd40,eu-central-1:ami-e72da888,eu-west-1:ami-d1ff5fa8,sa-east-1:ami-172e557b,us-east-1:ami-c451fabe,us-west-1:ami-d3330cb3,us-west-2:ami-1b33f863",
"packer_run_uuid": "9d201947-00de-1bfc-92ca-152f73e82e76"
}
],
"last_run_uuid": "9d201947-00de-1bfc-92ca-152f73e82e76"
}
Loading

0 comments on commit 748b32b

Please sign in to comment.