Merge release branch into master branch [skip ci]

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "dpaste"]
 	path = dpaste
 	url = https://github.com/bartTC/dpaste.git
-[submodule "nubis/travis"]
-	path = nubis/travis
-	url = https://github.com/nubisproject/nubis-travis.git

.travis.yml

@@ -1,19 +1,16 @@
+sudo: required
+
 language: ruby
-sudo: false
-gemfile: nubis/travis/Gemfile
-cache:
-  bundler: true
-  directories:
-  - "${HOME}/bin"
-  - nubis/librarian-puppet
-addons:
-  apt:
-    sources:
-    - debian-sid
-    packages:
-    - shellcheck
+
+services:
+  - docker
+
+before_install:
+  - docker pull nubisproject/nubis-travis:master
+
 script:
-- nubis/travis/run-checks
+  - docker run --mount type=bind,source="$(pwd)",target=/nubis/files nubisproject/nubis-travis:master
+
 notifications:
   slack:
     secure: hCKjKQ2vZHPC5Q+Bz2WtjCAVmBxrAu37LUKRHX/h9Hfg8mZlZPRszwYiIUXCTXNDm9wEHiiwt8N6Ne3Fwyf+yn3VheRyEdUIPadPmubUT24EWx0BLkmCR+5ttMqzCjHg7DGYcGMc2QeLPIQeLOkGRHfz4jynngzU/Ds6OqLz2lw=

CHANGELOG.md

@@ -1,14 +1,24 @@
 # Change Log
 
-## [v2.1.0](https://github.com/nubisproject/nubis-dpaste/tree/v2.1.0) (2018-02-05)
+## [v2.2.0](https://github.com/nubisproject/nubis-dpaste/tree/v2.2.0) (2018-04-06)
+[Full Changelog](https://github.com/nubisproject/nubis-dpaste/compare/v2.1.0...v2.2.0)
+
+**Merged pull requests:**
+
+- Upgrade nubis-travis [\#160](https://github.com/nubisproject/nubis-dpaste/pull/160) ([tinnightcap](https://github.com/tinnightcap))
+
+## [v2.1.0](https://github.com/nubisproject/nubis-dpaste/tree/v2.1.0) (2018-02-07)
 [Full Changelog](https://github.com/nubisproject/nubis-dpaste/compare/v2.0.4...v2.1.0)
 
 **Closed issues:**
 
+- Tag v2.1.0 release [\#157](https://github.com/nubisproject/nubis-dpaste/issues/157)
 - Tag v2.1.0 release [\#154](https://github.com/nubisproject/nubis-dpaste/issues/154)
 
 **Merged pull requests:**
 
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#159](https://github.com/nubisproject/nubis-dpaste/pull/159) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#158](https://github.com/nubisproject/nubis-dpaste/pull/158) ([nubis-automation](https://github.com/nubis-automation))
 - Update CHANGELOG for v2.1.0 release \[skip ci\] [\#156](https://github.com/nubisproject/nubis-dpaste/pull/156) ([nubis-automation](https://github.com/nubis-automation))
 - Update CHANGELOG for v2.1.0 release \[skip ci\] [\#155](https://github.com/nubisproject/nubis-dpaste/pull/155) ([nubis-automation](https://github.com/nubis-automation))
 

nubis/builder/artifacts/v2.2.0_41f866a171b3692fe7fe10ae94efbbb9c91985a0/AMIs.json

@@ -0,0 +1,13 @@
+{
+  "builds": [
+    {
+      "name": "amazon-ebs-ubuntu",
+      "builder_type": "amazon-ebs",
+      "build_time": 1523034022,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-4122343d,ap-northeast-2:ami-ba349bd4,ap-southeast-1:ami-857357f9,ap-southeast-2:ami-605e9002,eu-central-1:ami-1ab0eef1,eu-west-1:ami-18b2eb61,sa-east-1:ami-0ca2f460,us-east-1:ami-ba46efc7,us-west-1:ami-21c9d941,us-west-2:ami-dd1472a5",
+      "packer_run_uuid": "ca848d13-bbcc-20e6-bba9-c7235b43bd0d"
+    }
+  ],
+  "last_run_uuid": "ca848d13-bbcc-20e6-bba9-c7235b43bd0d"
+}