Merge lp:~corey.bryant/horizon/2015.1.1 into lp:~ubuntu-server-dev/horizon/kilo

[Corey Bryant]

[lp:~corey.bryant/horizon/2015.1.1]

238. By Corey Bryant on 2015-08-04

* Resynchronize with stable/kilo (bb05237) (LP: #1481008):
  - [d29a68c] Removing Network Profile support in stable/kilo
  - [cfb16ec] Add a conditional judgement to avoid invalid dict index
  - [824df76] Fix mock issues found due to new mock release
  - [82f63a5] Fix Create User form's fields sorting for Django 1.7
  - [f0691cf] changing email from user list deletes user passwd
  - [25c961f] fix delete action always cause error
  - [ec27165] Fix date pickers in metering modal
  - [8ed6a85] Wait until the image is registered in Sahara image test
  - [fcff73c] Skip test_{floatingip,image_register_unregister,create_delete_user} for now
  - [1e84c93] Handle errors during glance image updates correctly
  - [2fc3fcd] corrected the create volume from snapshot
  - [84da479] Escape the description param from heat template
  - [bafdabb] Prevent multiple form submission on table row actions
  - [0642fdd] Fixing data processing operations for alternate webroots
  - [2e8e70b] User should be able to update allocation pool values.
  - [61d3955] Don't pass read only attributes on neutron update
  - [78e9a99] I/O error uploading image
  - [6566057] Fix TemplateDoesNotExist at manage/unmanage volumes
  - [30dde70] Sanitation of metadata passed from Django
  - [322a74c] Inherit environment variables for tests that use nodeenv
  - [baf55ce] LBaas v1 Associate Monitor to Pool Fails
  - [bb05237] Fix exponentially growing AJAX updates for table rows

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-03 17:49:30 +0000
+++ debian/changelog	2015-08-04 16:45:43 +0000
@@ -1,3 +1,31 @@
+horizon (1:2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/kilo (bb05237) (LP: #1481008):
+    - [d29a68c] Removing Network Profile support in stable/kilo
+    - [cfb16ec] Add a conditional judgement to avoid invalid dict index
+    - [824df76] Fix mock issues found due to new mock release
+    - [82f63a5] Fix Create User form's fields sorting for Django 1.7
+    - [f0691cf] changing email from user list deletes user passwd
+    - [25c961f] fix delete action always cause error
+    - [ec27165] Fix date pickers in metering modal
+    - [8ed6a85] Wait until the image is registered in Sahara image test
+    - [fcff73c] Skip test_{floatingip,image_register_unregister,create_delete_user} for now
+    - [1e84c93] Handle errors during glance image updates correctly
+    - [2fc3fcd] corrected the create volume from snapshot
+    - [84da479] Escape the description param from heat template
+    - [bafdabb] Prevent multiple form submission on table row actions
+    - [0642fdd] Fixing data processing operations for alternate webroots
+    - [2e8e70b] User should be able to update allocation pool values.
+    - [61d3955] Don't pass read only attributes on neutron update
+    - [78e9a99] I/O error uploading image
+    - [6566057] Fix TemplateDoesNotExist at manage/unmanage volumes
+    - [30dde70] Sanitation of metadata passed from Django
+    - [322a74c] Inherit environment variables for tests that use nodeenv
+    - [baf55ce] LBaas v1 Associate Monitor to Pool Fails
+    - [bb05237] Fix exponentially growing AJAX updates for table rows
+
+ -- Corey Bryant <[e-mail]>  Tue, 04 Aug 2015 12:44:57 -0400
+
 horizon (1:2015.1.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release for OpenStack kilo. (LP: #1449744)