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 Oct 5, 2017
2 parents ba62ef8 + 56504ad commit 012c17b
Show file tree
Hide file tree
Showing 8 changed files with 1,505 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ script:
- nubis/travis/run-checks
notifications:
slack:
secure: cz775OrJV4v0AQ2I56SAHRG9D7/1JMsesndMZaXMfycvrpqw1VsRUMKBJvNI9e9YRgoRR9q3acVVyMiJ2X3ooEdVEtXFfWrQaGJfWDLF+/UIL9EkhwAJVMh7UOnc9UMIlDUu+xkOzPj8BS7Bfxm3cwZINUZaRLDhkpGOEaL5TJb1q29fzqJF9UgKtOoWU/5VyBDAxpo0w7rShO6WUBlmnezKaUtV7u4OZv77tJlRAB0qefnDZb8up+hYK6QEjzYYOrZvN+JCJzdPtOBNkr77KKsKi/dd1fCymQiIJtn7jicw95o3ltIHbak1UxQBVSU5Sp3n4AMmOQkZe6GFSoWXgh8teJteol3fzAbrwv7/a8jvTjyY8iIzR9Kvlxz0oJn9e0tNrdgnGFLbcUnPg/TTsydsSmD7sqvdAnrylVYNFAtLkvMEXX2B2iTK+fJnstK6ICERrV0+HjRT1x+QxroDSLH8h3UtJfRFGnCNxaHnKpp9yijEOpyIdkCEhrv9pPLdByzHpcABfdFbjHMEZeQWJDnyfh6/Ds+Fh4Witgb3eQpNM+m5hwSYS3BuIlC9sR/zWRRN1ikzyyZlsU/wA9CHlhpVtO4KedFkl/8sMsvx9txX4BvghMoJoWHgn1myOhWx2jx51pKkJ8Y/AuUe8ZER5+s7QLg9c3MfuJ3NLhyIFDw=
secure: tXGO/uAeronHeag61Oz9QIaOoJdGvelfcuqpa8X+V2yjC31XFXavPPCG7pzcLVtKX5jcV+YOIaCTZeD3D+mcy/p8lpAzC4wItskmAMZwSuBDXZgeydyWjN50hw2qAgo5FLJW2qtBVDuvqrl30Qf752CNy/yn2Awiin4pv+1BJ1U7yUpjjGtayzv4kW4AZfKD1jJA0VLpO1WM7RX1iKEYGgH1lYyt6+XsLPZWehs8W8U3j9uTkBUjIYi6HzK3Lj4JX2qk7lg9TDLMXZh3xlFpaN7t3Aod5/om+B0O7C0BrCVuGL+631EPnwps7wU9ct0RZpfJsNSYI/tEySfw5LHRMT8BloP6BEHI22+mj1JatzlorcMU/Mj6YH/zxAvxApHkFjWG3cey3uhkam9scsFYQvdyqeAhGxKkJ6yjTBKmrzvwPXJmNjYxBVvQUcmd5vH5nzJ0NFO/zwKZhdvah+A4q3Q8UlSFW6iAhSU7n0eI5YZccKYQ2Zm32G84FD0dHBs7YrD7hBJlyFbiiIxsT3foKJZuELHvcXY6trAn0TTj+K/WcsE+rNoXzijhmxeKpiWSm5YbO/7tebG3Th4sx1bw7qMCrcQoLNUeYc7dXQxJlG3YHluRZoa2PE8YUBHiBNzFkq5L31QXfUBEnkOsd6xTwvH7r1RgOqQ/6YI7FDjlbfQ=
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
# Change Log

## [v2.0.0](https://github.com/nubisproject/nubis-db-admin/tree/v2.0.0) (2017-10-05)
[Full Changelog](https://github.com/nubisproject/nubis-db-admin/compare/v1.5.1...v2.0.0)

**Merged pull requests:**

- Arena Support [\#34](https://github.com/nubisproject/nubis-db-admin/pull/34) ([gozer](https://github.com/gozer))
- Update to nubis-travis v1.4.2 [\#33](https://github.com/nubisproject/nubis-db-admin/pull/33) ([tinnightcap](https://github.com/tinnightcap))
- Update nubis-travis to v1.4.0 [\#32](https://github.com/nubisproject/nubis-db-admin/pull/32) ([tinnightcap](https://github.com/tinnightcap))
- Migrate to moilla slack [\#31](https://github.com/nubisproject/nubis-db-admin/pull/31) ([tinnightcap](https://github.com/tinnightcap))

## [v1.5.1](https://github.com/nubisproject/nubis-db-admin/tree/v1.5.1) (2017-08-18)
[Full Changelog](https://github.com/nubisproject/nubis-db-admin/compare/v1.5.0...v1.5.1)

**Closed issues:**

- Tag instances with the project they are for [\#26](https://github.com/nubisproject/nubis-db-admin/issues/26)
- Tag v1.5.1 release [\#28](https://github.com/nubisproject/nubis-db-admin/issues/28)

**Merged pull requests:**

- Merge v1.5.1 release into develop. \[skip ci\] [\#30](https://github.com/nubisproject/nubis-db-admin/pull/30) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v1.5.1 release \[skip ci\] [\#29](https://github.com/nubisproject/nubis-db-admin/pull/29) ([tinnightcap](https://github.com/tinnightcap))
- Add NUBIS\_PROJECT tag [\#27](https://github.com/nubisproject/nubis-db-admin/pull/27) ([gozer](https://github.com/gozer))

## [v1.5.0](https://github.com/nubisproject/nubis-db-admin/tree/v1.5.0) (2017-06-24)
Expand Down
13 changes: 13 additions & 0 deletions nubis/builder/artifacts/v2.0.0/AMIs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"builds": [
{
"name": "amazon-ebs-amazon-linux",
"builder_type": "amazon-ebs",
"build_time": 1507233901,
"files": null,
"artifact_id": "ap-northeast-1:ami-81a477e7,ap-northeast-2:ami-a52df7cb,ap-southeast-1:ami-29d8a74a,ap-southeast-2:ami-7a21c218,eu-central-1:ami-968439f9,eu-west-1:ami-ec895f95,sa-east-1:ami-40a6d92c,us-east-1:ami-cd77b0b7,us-west-1:ami-144b7874,us-west-2:ami-b1d613c9",
"packer_run_uuid": "98412f64-797e-e299-0116-77a291ca98b8"
}
],
"last_run_uuid": "98412f64-797e-e299-0116-77a291ca98b8"
}
Loading

0 comments on commit 012c17b

Please sign in to comment.