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

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-26 10:56:16 +0000
+++ debian/changelog	2015-08-03 19:27:47 +0000
@@ -1,3 +1,39 @@
+heat (2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/kilo (536dc83) (LP: #1481008):
+    - [9ca4a53] Use action in check_*_complete method
+    - [ed52c86] Produce more meaningful exception messages in nested stacks
+    - [e35450a] Fix failures related to the mock 1.1.0 release
+    - [ac5e71f] test_resource for functional tests
+    - [c0d1b91] Improve StackValidationFailed response in properties
+    - [99f95f0] Count all nested stack resources with DB operations
+    - [5703a2f] Add domain when list users in heat-keystone-setup-domain
+    - [18742d1] Heat could not create samples with Ceilometer
+    - [a55f827] Missing template file on update fails silently
+    - [1b5ff07] Failed to import test module in test
+    - [b0be013] Add env storing for loaded environments
+    - [a3bc0f6] Fix heat-db-setup error on rhel7.1
+    - [3a7e7cb] Find root stack ID with database operations
+    - [38b47eb] Continue to check if nova task is in progress
+    - [8919a34] Catch exceptions in service status report
+    - [754851d] Fix block_device_mapping property validation when using get_attr
+    - [28a0639] Do not verify requirements on extension loading
+    - [7148a96] Backup new resource as soon as possible
+    - [da37773] Save updated-in-place resources to backup stack
+    - [be9af28] Report status when engine start
+    - [d2e70e4] Use snapshot's environment when stack restore
+    - [612d806] Fix integration tests for tox>2.0
+    - [ed2bed2] Fix property validation for TemplateResource during update
+    - [a5297fe] Get rid of circular references in Resource and Function
+    - [c7b1524] Sync oslo incubator
+    - [06a5c0e] Generate stack events for stack state transitions
+    - [aa4b90d] Update template paths for environment-mapped TemplateResources
+    - [2a6378c] Fix TypeError exception during cancel stack update
+    - [536dc83] Use SHA256 instead of SHA1 for resource signature
+  * d/p/fix-requirements.patch: Rebased.
+
+ -- Corey Bryant <[e-mail]>  Mon, 03 Aug 2015 14:29:26 -0400
+
 heat (2015.1.0-0ubuntu1.1) vivid; urgency=medium
 
   * debian/heat-common.install: install missing scripts (LP: #1453160):

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2015-04-30 13:58:35 +0000
+++ debian/patches/fix-requirements.patch	2015-08-03 19:27:47 +0000
@@ -1,14 +1,13 @@
-diff -Naurp heat-2015.1.0.orig/requirements.txt heat-2015.1.0/requirements.txt
---- heat-2015.1.0.orig/requirements.txt	2015-04-30 14:01:47.000000000 +0200
-+++ heat-2015.1.0/requirements.txt	2015-04-30 14:44:43.546753986 +0200
-@@ -38,9 +38,8 @@ python-saharaclient>=0.8.0,<0.9.0
- python-swiftclient>=2.2.0,<2.5.0
- python-troveclient>=1.0.7,<1.1.0
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -38,9 +38,8 @@
+ python-swiftclient<2.5.0,>=2.2.0
+ python-troveclient<1.1.0,>=1.0.7
  PyYAML>=3.1.0
 -qpid-python
- requests>=2.2.0,!=2.4.0
--Routes>=1.12.3,!=2.0
+ requests!=2.4.0,>=2.2.0
+-Routes!=2.0,>=1.12.3
 +Routes>=1.12.3
  six>=1.9.0
- SQLAlchemy>=0.9.7,<=0.9.99
+ SQLAlchemy<=0.9.99,>=0.9.7
  sqlalchemy-migrate>=0.9.5