From cca35c3c1e113ba4c1405e1db7fdec235b71ec0b Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Thu, 12 Apr 2012 10:31:20 -0600
Subject: [PATCH] document hotfixes for issue #1423 and issue #1439 in
 0.2012.04.11.2

---
 ChangeLog              | 2 ++
 scripts/browserid.spec | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6e778a367..337919a09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ train-2012.04.11:
   * improve password update in account manager screen: #1388, #1389
   * developers link now points to MDN: #1397
   * fix issues that were introduced while implementing the above features: #1349, #1348, #1354, #1357, #1374, #1399, #1400, #1408, #1395, #1406, #1405, #1390, #1391
+  * (hotfix 2012.04.12) return 400 rather than 500 for invalid params to stage_user or stage_email: #1429
 
 train-2012.03.28:
   * work towards better user messaging for when cookies are disabled: #1167, #1302
@@ -28,6 +29,7 @@ train-2012.03.28:
   * (hotfix 2012.04.10) final 40 production locales merged: #1412
   * (hotfix 2012.04.10) update l10n-all.json to have all locales (complete and in-progress) as well as en-US and db-LB
   * (hotfix 2012.04.10) fix more rigorous checking of email inputs to WSAPI: domain checking of 'site' parameter was validating hostnames rather than domains.
+  * (hotfix 2012.04.12) fix /signup page on browserid.org: #1429
 
 train-2012.03.14:
   * BrowserID now speaks Bulgarian
diff --git a/scripts/browserid.spec b/scripts/browserid.spec
index 8fcbeb26e..b6f602aed 100644
--- a/scripts/browserid.spec
+++ b/scripts/browserid.spec
@@ -2,7 +2,7 @@
 
 Name:          browserid-server
 Version:       0.2012.04.11
-Release:       1%{?dist}_%{svnrev}
+Release:       2%{?dist}_%{svnrev}
 Summary:       BrowserID server
 Packager:      Pete Fritchman <petef@mozilla.com>
 Group:         Development/Libraries
-- 
GitLab