Merge train-126 into master

#2764 r=vbudhram
mozilla · Nov 29, 2018 · d590d6e · d590d6e
2 parents 43745a6 + 5de9e88
commit d590d6e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="1.126.2"></a>
+## [1.126.2](https://github.com/mozilla/fxa-auth-server/compare/v1.126.1...v1.126.2) (2018-11-29)
+
+
+### Bug Fixes
+
+* **metrics:** ensure email sent amplitude events include device id ([03a2f2e](https://github.com/mozilla/fxa-auth-server/commit/03a2f2e))
+
+
+
 <a name="1.126.1"></a>
 ## [1.126.1](https://github.com/mozilla/fxa-auth-server/compare/v1.126.0...v1.126.1) (2018-11-28)
 

diff --git a/fxa-oauth-server/npm-shrinkwrap.json b/fxa-oauth-server/npm-shrinkwrap.json
diff --git a/fxa-oauth-server/package.json b/fxa-oauth-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-oauth-server",
-  "version": "1.126.1",
+  "version": "1.126.2",
   "private": true,
   "description": "Firefox Accounts OAuth2 server.",
   "scripts": {

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-auth-server",
-  "version": "1.126.1",
+  "version": "1.126.2",
   "description": "Firefox Accounts, an identity provider for Mozilla cloud services",
   "bin": {
     "fxa-auth": "./bin/key_server.js"