Merge pull request #269 from mozilla/train-118 r=@vladikoff

chore(release): Merge Release v1.118.1 into master

CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="1.118.1"></a>
+## 1.118.1 (2018-08-14)
+
+
+### Bug Fixes
+
+* **restify:** set keepAliveTimeout correctly on api.server object (#267) ([17a4715](https://github.com/mozilla/fxa-customs-server/commit/17a4715))
+* **restify:** set server.keepAliveTimeout to 120s, similar to in node6 (#266) ([c10d339](https://github.com/mozilla/fxa-customs-server/commit/c10d339))
+
+
+
 <a name="1.118.0"></a>
 # 1.118.0 (2018-08-08)
 

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-customs-server",
-  "version": "1.118.0",
+  "version": "1.118.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-customs-server",
-  "version": "1.118.0",
+  "version": "1.118.1",
   "description": "Firefox Accounts Customs Server",
   "author": "Mozilla (https://mozilla.org/)",
   "license": "MPL-2.0",