Merge release branch into master branch [skip ci]

CHANGELOG.md

@@ -1,14 +1,27 @@
 # Change Log
 
-## [v2.0.4](https://github.com/nubisproject/nubis-nat/tree/v2.0.4) (2017-12-08)
-[Full Changelog](https://github.com/nubisproject/nubis-nat/compare/v2.0.3...v2.0.4)
+## [v2.1.0](https://github.com/nubisproject/nubis-nat/tree/v2.1.0) (2018-02-03)
+[Full Changelog](https://github.com/nubisproject/nubis-nat/compare/v2.0.4...v2.1.0)
 
 **Implemented enhancements:**
 
 - Updating nubis-proxy puppet module [\#12](https://github.com/nubisproject/nubis-nat/issues/12)
 
 **Closed issues:**
 
+- Tag v2.1.0 release [\#217](https://github.com/nubisproject/nubis-nat/issues/217)
+- \[squid-exporter\] Use squid exporter instead of snmp [\#197](https://github.com/nubisproject/nubis-nat/issues/197)
+
+**Merged pull requests:**
+
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#219](https://github.com/nubisproject/nubis-nat/pull/219) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#218](https://github.com/nubisproject/nubis-nat/pull/218) ([nubis-automation](https://github.com/nubis-automation))
+
+## [v2.0.4](https://github.com/nubisproject/nubis-nat/tree/v2.0.4) (2017-12-08)
+[Full Changelog](https://github.com/nubisproject/nubis-nat/compare/v2.0.3...v2.0.4)
+
+**Closed issues:**
+
 - \[squid-exporter\] Update squid exporter [\#206](https://github.com/nubisproject/nubis-nat/issues/206)
 - Tag v2.0.4 release [\#215](https://github.com/nubisproject/nubis-nat/issues/215)
 
@@ -34,7 +47,6 @@
 
 **Closed issues:**
 
-- \[squid-exporter\] Use squid exporter instead of snmp [\#197](https://github.com/nubisproject/nubis-nat/issues/197)
 - Tag v2.0.2 release [\#207](https://github.com/nubisproject/nubis-nat/issues/207)
 
 **Merged pull requests:**

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

@@ -0,0 +1,21 @@
+{
+  "builds": [
+    {
+      "name": "amazon-ebs-centos",
+      "builder_type": "amazon-ebs",
+      "build_time": 1517616041,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-1dfb917b,ap-northeast-2:ami-d41cbfba,ap-southeast-1:ami-c55413b9,ap-southeast-2:ami-4b27df29,eu-central-1:ami-d223b9bd,eu-west-1:ami-462f403f,sa-east-1:ami-d982cdb5,us-east-1:ami-4e252534,us-west-1:ami-5f030c3f,us-west-2:ami-c27cc6ba",
+      "packer_run_uuid": "6c33c2df-4692-2ac9-1806-2c85dd156388"
+    },
+    {
+      "name": "amazon-ebs-centos",
+      "builder_type": "amazon-ebs",
+      "build_time": 1518035420,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-d594e2b3,ap-northeast-2:ami-a6ae0cc8,ap-southeast-1:ami-98beffe4,ap-southeast-2:ami-a017ecc2,eu-central-1:ami-9985e1f6,eu-west-1:ami-40f19939,sa-east-1:ami-d0327cbc,us-east-1:ami-9cfdf5e6,us-west-1:ami-2f6f614f,us-west-2:ami-1a9f1862",
+      "packer_run_uuid": "c6089f03-fa3d-b0ba-9c88-e41d8e1c04c1"
+    }
+  ],
+  "last_run_uuid": "c6089f03-fa3d-b0ba-9c88-e41d8e1c04c1"
+}