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 Apr 11, 2017
2 parents 8b1751a + fc9cc83 commit 86204ba
Show file tree
Hide file tree
Showing 6 changed files with 3,241 additions and 10 deletions.
13 changes: 5 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
# Change Log

## [v1.4.0](https://github.com/nubisproject/nubis-skel/tree/v1.4.0) (2017-03-23)
[Full Changelog](https://github.com/nubisproject/nubis-skel/compare/v1.4.0...v1.4.0)
[Full Changelog](https://github.com/nubisproject/nubis-skel/compare/v1.3.0...v1.4.0)

**Closed issues:**

- Tag v1.4.0 release [\#82](https://github.com/nubisproject/nubis-skel/issues/82)
- Remove package git from examples to facilitate simpler release [\#73](https://github.com/nubisproject/nubis-skel/issues/73)

## [v1.4.0](https://github.com/nubisproject/nubis-skel/tree/v1.4.0) (2017-03-21)
[Full Changelog](https://github.com/nubisproject/nubis-skel/compare/v1.3.0...v1.4.0)

**Closed issues:**

- Tag v1.4.0 release [\#88](https://github.com/nubisproject/nubis-skel/issues/88)
- Tag v1.4.0 release [\#76](https://github.com/nubisproject/nubis-skel/issues/76)

**Merged pull requests:**

- Merge v1.4.0 release into develop. \[skip ci\] [\#90](https://github.com/nubisproject/nubis-skel/pull/90) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v1.4.0 release \[skip ci\] [\#89](https://github.com/nubisproject/nubis-skel/pull/89) ([tinnightcap](https://github.com/tinnightcap))
- Merge v1.4.0 release into develop. \[skip ci\] [\#87](https://github.com/nubisproject/nubis-skel/pull/87) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v1.4.0 release \[skip ci\] [\#86](https://github.com/nubisproject/nubis-skel/pull/86) ([tinnightcap](https://github.com/tinnightcap))
- Merge v1.4.0 release into develop. \[skip ci\] [\#84](https://github.com/nubisproject/nubis-skel/pull/84) ([tinnightcap](https://github.com/tinnightcap))
Expand All @@ -28,6 +25,7 @@
- Update builder artifacts for v1.4.0 release [\#77](https://github.com/nubisproject/nubis-skel/pull/77) ([tinnightcap](https://github.com/tinnightcap))
- Update builder artifacts for v1.4.0-dev release [\#75](https://github.com/nubisproject/nubis-skel/pull/75) ([tinnightcap](https://github.com/tinnightcap))
- Remove package git from examples [\#74](https://github.com/nubisproject/nubis-skel/pull/74) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v1.3.0 release [\#72](https://github.com/nubisproject/nubis-skel/pull/72) ([tinnightcap](https://github.com/tinnightcap))

## [v1.3.0](https://github.com/nubisproject/nubis-skel/tree/v1.3.0) (2016-12-21)
[Full Changelog](https://github.com/nubisproject/nubis-skel/compare/v1.2.2-training...v1.3.0)
Expand All @@ -39,7 +37,6 @@

**Merged pull requests:**

- Update CHANGELOG for v1.3.0 release [\#72](https://github.com/nubisproject/nubis-skel/pull/72) ([tinnightcap](https://github.com/tinnightcap))
- Update builder artifacts for v1.3.0 release [\#71](https://github.com/nubisproject/nubis-skel/pull/71) ([tinnightcap](https://github.com/tinnightcap))
- update to nubis-travis v0.1.3 [\#69](https://github.com/nubisproject/nubis-skel/pull/69) ([gozer](https://github.com/gozer))
- Expose ldap groups [\#68](https://github.com/nubisproject/nubis-skel/pull/68) ([limed](https://github.com/limed))
Expand Down
21 changes: 21 additions & 0 deletions nubis/builder/artifacts/AMIs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"builds": [
{
"name": "amazon-ebs-amazon-linux",
"builder_type": "amazon-ebs",
"build_time": 1491917535,
"files": null,
"artifact_id": "ap-northeast-1:ami-b77a58d0,ap-northeast-2:ami-8cc012e2,ap-southeast-1:ami-eb4af488,ap-southeast-2:ami-db818fb8,eu-central-1:ami-db8a58b4,eu-west-1:ami-b92a10df,sa-east-1:ami-0e402262,us-east-1:ami-cb870fdd,us-west-1:ami-f2250092,us-west-2:ami-7a1f8f1a",
"packer_run_uuid": "1e642edc-037e-def8-5535-fe8bd2350f94"
},
{
"name": "amazon-ebs-ubuntu",
"builder_type": "amazon-ebs",
"build_time": 1491917772,
"files": null,
"artifact_id": "ap-northeast-1:ami-317b5956,ap-northeast-2:ami-eec21080,ap-southeast-1:ami-0d48f66e,ap-southeast-2:ami-1c838d7f,eu-central-1:ami-4b885a24,eu-west-1:ami-46310b20,sa-east-1:ami-b84123d4,us-east-1:ami-af860eb9,us-west-1:ami-922702f2,us-west-2:ami-c11d8da1",
"packer_run_uuid": "1e642edc-037e-def8-5535-fe8bd2350f94"
}
],
"last_run_uuid": "1e642edc-037e-def8-5535-fe8bd2350f94"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"builds": [
{
"name": "amazon-ebs-amazon-linux",
"builder_type": "amazon-ebs",
"build_time": 1491917535,
"files": null,
"artifact_id": "ap-northeast-1:ami-b77a58d0,ap-northeast-2:ami-8cc012e2,ap-southeast-1:ami-eb4af488,ap-southeast-2:ami-db818fb8,eu-central-1:ami-db8a58b4,eu-west-1:ami-b92a10df,sa-east-1:ami-0e402262,us-east-1:ami-cb870fdd,us-west-1:ami-f2250092,us-west-2:ami-7a1f8f1a",
"packer_run_uuid": "1e642edc-037e-def8-5535-fe8bd2350f94"
},
{
"name": "amazon-ebs-ubuntu",
"builder_type": "amazon-ebs",
"build_time": 1491917772,
"files": null,
"artifact_id": "ap-northeast-1:ami-317b5956,ap-northeast-2:ami-eec21080,ap-southeast-1:ami-0d48f66e,ap-southeast-2:ami-1c838d7f,eu-central-1:ami-4b885a24,eu-west-1:ami-46310b20,sa-east-1:ami-b84123d4,us-east-1:ami-af860eb9,us-west-1:ami-922702f2,us-west-2:ami-c11d8da1",
"packer_run_uuid": "1e642edc-037e-def8-5535-fe8bd2350f94"
}
],
"last_run_uuid": "1e642edc-037e-def8-5535-fe8bd2350f94"
}
Loading

0 comments on commit 86204ba

Please sign in to comment.