Merge lp:~gandelman-a/ubuntu/saucy/horizon/2013.2.1 into lp:~ubuntu-server-dev/horizon/havana

[Adam Gandelman]

2013.2.1

2013.2.1

[lp:~gandelman-a/ubuntu/saucy/horizon/2013.2.1]

183. By Adam Gandelman on 2013-12-23

Rebase changelog to include security updates

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-18 18:48:02 +0000
+++ debian/changelog	2013-12-23 22:23:04 +0000
@@ -1,11 +1,56 @@
-horizon (1:2013.2.1-0ubuntu1) UNRELEASED; urgency=low
+horizon (1:2013.2.1-0ubuntu1) saucy-proposed; urgency=low
 
+  * Resynchronize with stable/havana (9668e80) (LP: #1262788):
+    - [d97bba1] precision of floating point metering stats is discarded
+      unnecessarily LP: 1241467
+    - [53047be] "Tenant" should be "Project" (Resource Usage panel) LP: 1250942
+    - [728b5d1] Subnet / Subnet details not marked as translatable LP: 1254026
+    - [9465e54] missing hover hint for instance:<type> meter in Metric dropdown
+      list LP: 1243241
+    - [842ba5f] Default port for The MS SQL Security Group is 1433 instead of
+      1443 LP: 1250029
+    - [631ee65] iso8601 debug message is annoying in dashboard unit test
+      LP: 1250554
+    - [1361a02] only meters associated with the first instance reported appear
+      in Metric dropdown list LP: 1243298
+    - [599d4a5] Persistent XSS in OpenStack Web UI for Instances LP: 1247675
+    - [7f804c9] Password Change needs to logout current user  LP: 1226829
+    - [3b621e7] The "Weight" parameter in Horizon's LBaaS member creation
+      dialog is mandatory while it's only optional in the cli command
+      LP: 1241004
+    - [b5b102e] i18n: "Filter" in "Flavor Access" tab of "Create Flavor"
+      workflow is not translatable LP: 1239927
+    - [0aba596] I18n: Localization of the role "Member" LP: 1255004
+    - [d66a483] detach volume dialog contains escaped html LP: 1252881
+    - [37f0128] English string for "Injected File Path Bytes" is wrong
+      LP: 1254049
+    - [ac2815c] ./templates/base.html.c:6: warning: unterminated string literal
+      LP: 1243526
+    - [6d02f2e] Cannot assign different translations for present and past
+      message of BatchAction LP: 1252082
+    - [655dc79] Resource Usage Page table views shows statistics in a wrong way
+      LP: 1249279
+    - [5d9684d] lbaas pool tcp LP: 1241713
+    - [040bebb] Some "Working" dialogs are not translatable LP: 1252074
+    - [852e5c8] Translation update for 2013.2.1 release LP: 1258462
+    - [9668e80] Updated from global requirements
+  * debian/patches/CVE-2013-6406: Dropped, applied upstream [599d4a5]
   * debian/patches/revert-stable-havana-requirements.patch: Revert
     version bumps to dependencies in stable/havana back to what was
     shipped with Saucy.
 
  -- Adam Gandelman <[e-mail]>  Wed, 18 Dec 2013 10:47:22 -0800
 
+horizon (1:2013.2-0ubuntu1.1) saucy-security; urgency=low
+
+  * SECURITY UPDATE: XSS in Volumes and Network Topology pages
+    - debian/patches/CVE-2013-6406: html.escape() various items in
+      volumes/tables.py and volume_snapshots/tables.py
+    - CVE-2013-6406 (also referred to as CVE-2013-6858)
+    - LP: #1247675
+
+ -- Jamie Strandboge <[e-mail]>  Tue, 03 Dec 2013 15:54:34 -0600
+
 horizon (1:2013.2-0ubuntu1) saucy; urgency=low
 
   * New upstream release (LP: #1236462).