Merge train-134 into master

#832 r=vladikoff
mozilla · Apr 15, 2019 · a375a45 · a375a45
2 parents 4754f3c + 97e7a03
commit a375a45
Show file tree

Hide file tree

Showing 19 changed files with 40 additions and 13 deletions.
diff --git a/packages/fxa-auth-db-mysql/CHANGELOG.md b/packages/fxa-auth-db-mysql/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.134.3
+
+No changes.
+
 ## 1.134.2
 
 No changes.

diff --git a/packages/fxa-auth-db-mysql/npm-shrinkwrap.json b/packages/fxa-auth-db-mysql/npm-shrinkwrap.json
diff --git a/packages/fxa-auth-db-mysql/package.json b/packages/fxa-auth-db-mysql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-auth-db-mysql",
-  "version": "1.134.2",
+  "version": "1.134.3",
   "description": "MySQL backend for Firefox Accounts",
   "main": "index.js",
   "repository": {

diff --git a/packages/fxa-auth-server/CHANGELOG.md b/packages/fxa-auth-server/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.134.3
+
+### Bug fixes
+
+* reminders: output a timestamp with verification reminder logging (8902a33f5)
+* reminders: auth: verification reminders must not use sinon in production (58fa7aba6)
+
 ## 1.134.2
 
 ### Bug fixes

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

diff --git a/packages/fxa-content-server/CHANGELOG.md b/packages/fxa-content-server/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.134.3
+
+No changes.
+
 ## 1.134.2
 
 No changes.

diff --git a/packages/fxa-content-server/package.json b/packages/fxa-content-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-content-server",
-  "version": "1.134.2",
+  "version": "1.134.3",
   "description": "Firefox Accounts Content Server",
   "scripts": {
     "build-production": "NODE_ENV=production grunt build",

diff --git a/packages/fxa-customs-server/CHANGELOG.md b/packages/fxa-customs-server/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.134.3
+
+No changes.
+
 ## 1.134.2
 
 No changes.

diff --git a/packages/fxa-customs-server/npm-shrinkwrap.json b/packages/fxa-customs-server/npm-shrinkwrap.json
diff --git a/packages/fxa-customs-server/package.json b/packages/fxa-customs-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-customs-server",
-  "version": "1.134.2",
+  "version": "1.134.3",
   "description": "Firefox Accounts Customs Server",
   "author": "Mozilla (https://mozilla.org/)",
   "license": "MPL-2.0",

diff --git a/packages/fxa-email-event-proxy/package-lock.json b/packages/fxa-email-event-proxy/package-lock.json
diff --git a/packages/fxa-email-event-proxy/package.json b/packages/fxa-email-event-proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-email-event-proxy",
-  "version": "1.134.2",
+  "version": "1.134.3",
   "description": "Proxies events from Sendgrid to FxA SQS queues",
   "main": "index.js",
   "scripts": {

diff --git a/packages/fxa-email-service/CHANGELOG.md b/packages/fxa-email-service/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.134.3
+
+No changes.
+
 ## 1.134.2
 
 No changes.

diff --git a/packages/fxa-email-service/Cargo.lock b/packages/fxa-email-service/Cargo.lock
diff --git a/packages/fxa-email-service/Cargo.toml b/packages/fxa-email-service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fxa_email_service"
-version = "1.134.2"
+version = "1.134.3"
 publish = false
 edition = "2018"
 

diff --git a/packages/fxa-profile-server/CHANGELOG.md b/packages/fxa-profile-server/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.134.3
+
+No changes.
+
 ## 1.134.2
 
 No changes.

diff --git a/packages/fxa-profile-server/npm-shrinkwrap.json b/packages/fxa-profile-server/npm-shrinkwrap.json
diff --git a/packages/fxa-profile-server/package.json b/packages/fxa-profile-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-profile-server",
-  "version": "1.134.2",
+  "version": "1.134.3",
   "private": true,
   "description": "Firefox Accounts Profile service.",
   "scripts": {