Merge release branch into master branch [skip ci]

CHANGELOG.md

@@ -1,5 +1,34 @@
 # 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)
+
+**Implemented enhancements:**
+
+- Updating nubis-proxy puppet module [\#12](https://github.com/nubisproject/nubis-nat/issues/12)
+
+**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)
+
+**Merged pull requests:**
+
+- \[Centennial\] [\#214](https://github.com/nubisproject/nubis-nat/pull/214) ([gozer](https://github.com/gozer))
+- Use proper interface for squid exporter service [\#213](https://github.com/nubisproject/nubis-nat/pull/213) ([limed](https://github.com/limed))
+
+## [v2.0.3](https://github.com/nubisproject/nubis-nat/tree/v2.0.3) (2017-11-02)
+[Full Changelog](https://github.com/nubisproject/nubis-nat/compare/v2.0.2...v2.0.3)
+
+**Closed issues:**
+
+- Tag v2.0.3 release [\#210](https://github.com/nubisproject/nubis-nat/issues/210)
+
+**Merged pull requests:**
+
+- Merge v2.0.3 release into develop. \[skip ci\] [\#212](https://github.com/nubisproject/nubis-nat/pull/212) ([tinnightcap](https://github.com/tinnightcap))
+- Update CHANGELOG for v2.0.3 release \[skip ci\] [\#211](https://github.com/nubisproject/nubis-nat/pull/211) ([tinnightcap](https://github.com/tinnightcap))
+
 ## [v2.0.2](https://github.com/nubisproject/nubis-nat/tree/v2.0.2) (2017-10-24)
 [Full Changelog](https://github.com/nubisproject/nubis-nat/compare/v2.0.1...v2.0.2)
 

nubis/Puppetfile

@@ -4,7 +4,7 @@ mod 'nubis/nubis_nat',
     :git => 'https://github.com/nubisproject/nubis-puppet-nat.git',
     :ref => 'develop'
 
-mod 'tinnightcap/puppet-squid3',
+mod 'tinnightcap/squid3',
     :git => 'https://github.com/tinnightcap/puppet-squid3.git',
     :ref => '9e778ffca2f07d034717da29715e01def7712430'
 

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

@@ -0,0 +1,13 @@
+{
+  "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"
+    }
+  ],
+  "last_run_uuid": "6c33c2df-4692-2ac9-1806-2c85dd156388"
+}