Merge release branch into develop [skip ci]

nubisproject · May 4, 2017 · abda6d2 · abda6d2
2 parents 82b2b5e + 8557f8d
commit abda6d2
Show file tree

Hide file tree

Showing 5 changed files with 3,231 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## [v1.4.2](https://github.com/nubisproject/nubis-skel/tree/v1.4.2) (2017-05-03)
+[Full Changelog](https://github.com/nubisproject/nubis-skel/compare/v1.4.1...v1.4.2)
+
+**Closed issues:**
+
+- Tag v1.4.2 release [\#94](https://github.com/nubisproject/nubis-skel/issues/94)
+
+**Merged pull requests:**
+
+- Update CHANGELOG for v1.4.2 release \[skip ci\] [\#95](https://github.com/nubisproject/nubis-skel/pull/95) ([tinnightcap](https://github.com/tinnightcap))
+
 ## [v1.4.1](https://github.com/nubisproject/nubis-skel/tree/v1.4.1) (2017-04-11)
 [Full Changelog](https://github.com/nubisproject/nubis-skel/compare/v1.4.0...v1.4.1)
 

diff --git a/nubis/builder/artifacts/AMIs.json b/nubis/builder/artifacts/AMIs.json
@@ -3,19 +3,19 @@
     {
       "name": "amazon-ebs-amazon-linux",
       "builder_type": "amazon-ebs",
-      "build_time": 1493835993,
+      "build_time": 1493911298,
       "files": null,
-      "artifact_id": "ap-northeast-1:ami-6ed2e409,ap-northeast-2:ami-6dac7103,ap-southeast-1:ami-6b40fa08,ap-southeast-2:ami-b62d26d5,eu-central-1:ami-0508d76a,eu-west-1:ami-e2171a84,sa-east-1:ami-e0a9c58c,us-east-1:ami-d684e8c0,us-west-1:ami-1786a177,us-west-2:ami-7931a919",
-      "packer_run_uuid": "2e2ed178-3214-9ef6-82ab-319d50f9c5b9"
+      "artifact_id": "ap-northeast-1:ami-e17c4d86,ap-northeast-2:ami-ffa07d91,ap-southeast-1:ami-5d23993e,ap-southeast-2:ami-3eccc75d,eu-central-1:ami-8127f8ee,eu-west-1:ami-858b86e3,sa-east-1:ami-91b6dafd,us-east-1:ami-51c9a647,us-west-1:ami-3e66405e,us-west-2:ami-e6e47f86",
+      "packer_run_uuid": "60871768-2578-c18e-6531-d00211a6532a"
     },
     {
       "name": "amazon-ebs-ubuntu",
       "builder_type": "amazon-ebs",
-      "build_time": 1493836289,
+      "build_time": 1493911490,
       "files": null,
-      "artifact_id": "ap-northeast-1:ami-0fd6e068,ap-northeast-2:ami-68a87506,ap-southeast-1:ami-0242f861,ap-southeast-2:ami-722e2511,eu-central-1:ami-0607d869,eu-west-1:ami-d01815b6,sa-east-1:ami-e3a9c58f,us-east-1:ami-5784e841,us-west-1:ami-7484a314,us-west-2:ami-0330a863",
-      "packer_run_uuid": "2e2ed178-3214-9ef6-82ab-319d50f9c5b9"
+      "artifact_id": "ap-northeast-1:ami-6979480e,ap-northeast-2:ami-34a67b5a,ap-southeast-1:ami-2b279d48,ap-southeast-2:ami-fcc3c89f,eu-central-1:ami-8027f8ef,eu-west-1:ami-b48b86d2,sa-east-1:ami-82b5d9ee,us-east-1:ami-13c7a805,us-west-1:ami-2598bf45,us-west-2:ami-16980376",
+      "packer_run_uuid": "60871768-2578-c18e-6531-d00211a6532a"
     }
   ],
-  "last_run_uuid": "2e2ed178-3214-9ef6-82ab-319d50f9c5b9"
+  "last_run_uuid": "60871768-2578-c18e-6531-d00211a6532a"
 }
diff --git a/nubis/builder/artifacts/v1.4.2_fb5e99fbab2dca86c007000bcc93950a08692827/AMIs.json b/nubis/builder/artifacts/v1.4.2_fb5e99fbab2dca86c007000bcc93950a08692827/AMIs.json
@@ -0,0 +1,21 @@
+{
+  "builds": [
+    {
+      "name": "amazon-ebs-amazon-linux",
+      "builder_type": "amazon-ebs",
+      "build_time": 1493911298,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-e17c4d86,ap-northeast-2:ami-ffa07d91,ap-southeast-1:ami-5d23993e,ap-southeast-2:ami-3eccc75d,eu-central-1:ami-8127f8ee,eu-west-1:ami-858b86e3,sa-east-1:ami-91b6dafd,us-east-1:ami-51c9a647,us-west-1:ami-3e66405e,us-west-2:ami-e6e47f86",
+      "packer_run_uuid": "60871768-2578-c18e-6531-d00211a6532a"
+    },
+    {
+      "name": "amazon-ebs-ubuntu",
+      "builder_type": "amazon-ebs",
+      "build_time": 1493911490,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-6979480e,ap-northeast-2:ami-34a67b5a,ap-southeast-1:ami-2b279d48,ap-southeast-2:ami-fcc3c89f,eu-central-1:ami-8027f8ef,eu-west-1:ami-b48b86d2,sa-east-1:ami-82b5d9ee,us-east-1:ami-13c7a805,us-west-1:ami-2598bf45,us-west-2:ami-16980376",
+      "packer_run_uuid": "60871768-2578-c18e-6531-d00211a6532a"
+    }
+  ],
+  "last_run_uuid": "60871768-2578-c18e-6531-d00211a6532a"
+}