Merge release branch into master [skip ci]

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v2.0.2](https://github.com/nubisproject/nubis-base/tree/v2.0.2) (2017-10-24)
+[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v2.0.1...v2.0.2)
+
+**Closed issues:**
+
+- \[node\_exporter\] Expose nubis base version [\#704](https://github.com/nubisproject/nubis-base/issues/704)
+
 ## [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)
 
@@ -16,6 +23,12 @@
 - \[puppet\] Upgrade puppet modules [\#591](https://github.com/nubisproject/nubis-base/issues/591)
 - Remove credstash [\#523](https://github.com/nubisproject/nubis-base/issues/523)
 - Convert user-data to JSON via jq parsing [\#49](https://github.com/nubisproject/nubis-base/issues/49)
+- Tag v2.0.1 release [\#725](https://github.com/nubisproject/nubis-base/issues/725)
+
+**Merged pull requests:**
+
+- Merge v2.0.1 release into develop. \[skip ci\] [\#727](https://github.com/nubisproject/nubis-base/pull/727) ([tinnightcap](https://github.com/tinnightcap))
+- Update CHANGELOG for v2.0.1 release \[skip ci\] [\#726](https://github.com/nubisproject/nubis-base/pull/726) ([tinnightcap](https://github.com/tinnightcap))
 
 ## [v2.0.0](https://github.com/nubisproject/nubis-base/tree/v2.0.0) (2017-10-05)
 [Full Changelog](https://github.com/nubisproject/nubis-base/compare/v1.5.1...v2.0.0)
@@ -723,7 +736,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.1...v0.9.0)
+[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v0.79...v0.9.0)
 
 **Closed issues:**
 
@@ -739,11 +752,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.1](https://github.com/nubisproject/nubis-base/tree/v0.1) (2015-06-11)
-[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)
+[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)
 
 **Closed issues:**
 

nubis/builder/artifacts/v2.0.2/AMIs.json

@@ -0,0 +1,29 @@
+{
+  "builds": [
+    {
+      "name": "amazon-ebs-amazon-linux",
+      "builder_type": "amazon-ebs",
+      "build_time": 1508878189,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-af45e3c9,ap-northeast-2:ami-3f379251,ap-southeast-1:ami-45450426,ap-southeast-2:ami-6045a902,eu-central-1:ami-27c87348,eu-west-1:ami-81dd07f8,sa-east-1:ami-05ccb569,us-east-1:ami-02d27778,us-west-1:ami-1488b574,us-west-2:ami-b072bec8",
+      "packer_run_uuid": "937f707f-a40e-30c9-f77f-256047711b3e"
+    },
+    {
+      "name": "amazon-ebs-ubuntu",
+      "builder_type": "amazon-ebs",
+      "build_time": 1508878222,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-c946e0af,ap-northeast-2:ami-7d369313,ap-southeast-1:ami-f5420396,ap-southeast-2:ami-f04ba792,eu-central-1:ami-93ca71fc,eu-west-1:ami-0bd10b72,sa-east-1:ami-06ccb56a,us-east-1:ami-69dd7813,us-west-1:ami-1889b478,us-west-2:ami-3a8f4042",
+      "packer_run_uuid": "937f707f-a40e-30c9-f77f-256047711b3e"
+    },
+    {
+      "name": "amazon-ebs-centos",
+      "builder_type": "amazon-ebs",
+      "build_time": 1508878634,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-0e45e368,ap-northeast-2:ami-913590ff,ap-southeast-1:ami-974203f4,ap-southeast-2:ami-7344a811,eu-central-1:ami-40ca712f,eu-west-1:ami-d6d60caf,sa-east-1:ami-29cdb445,us-east-1:ami-f3d27789,us-west-1:ami-1e89b47e,us-west-2:ami-b672bece",
+      "packer_run_uuid": "937f707f-a40e-30c9-f77f-256047711b3e"
+    }
+  ],
+  "last_run_uuid": "937f707f-a40e-30c9-f77f-256047711b3e"
+}