Merge lp:~corey.bryant/heat/2014.2.1 into lp:~ubuntu-server-dev/heat/juno

[Corey Bryant]

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-16 18:51:57 +0000
+++ debian/changelog	2014-12-05 14:40:26 +0000
@@ -1,3 +1,31 @@
+heat (2014.2.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/juno (a27d371) (LP: #1398952):
+    - [9f30872] Remove check_uptodate.sh check from tox.ini
+    - [808b5c7] Make ResourceGroup updates update nested stacks
+    - [6958217] ResourceGroup don't special-case zero count
+    - [6f5dfaa] SoftwareDeployments make servers property updateable
+    - [dc1b99d] Use environment file in template-validate
+    - [7acee56] StackResource consider files in implementation_signature
+    - [5664854] Move implementation_signature to StackResource
+    - [0401e75] Correctly set CombinationAlarm repeat_actions
+    - [4b721a4] Use properties in ceilometer alarm not parsed_template('Properties')
+    - [b3db67b] Make sure that property defaults are converted correctly
+    - [1d6dc24] RandomString don't skip superclass validation
+    - [9f2d209] unconfigured clients look in the [clients] section for defaults
+    - [699cc62] Update sample conf for new oslo.db release
+    - [a76ba37] Mark stack_domain_admin_password as a secret option
+    - [e6c1292] Inherit roles for create_trust_context()
+    - [c9d671c] Always using domain id to create domain project or user
+    - [16215dd] Add CERT file support in heat-keystone-setup-domain
+    - [79e2300] Fix add_dependencies for floating_ip resource
+    - [840cedd] Correct CA cert argument for glanceclient
+    - [3f7d4bb] Tolerate null on Json db load
+    - [a27d371] Don't stop update immediately on error
+  * d/control: Add python-oslo.serialization to Build-Depends-Indep.
+
+ -- Corey Bryant <[e-mail]>  Fri, 05 Dec 2014 09:12:01 -0500
+
 heat (2014.2-0ubuntu1) utopic; urgency=medium
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2014-10-06 08:43:02 +0000
+++ debian/control	2014-12-05 14:40:26 +0000
@@ -46,6 +46,7 @@
  python-oslo.db (>= 1.0.0),
  python-oslo.i18n (>= 1.0.0),
  python-oslo.messaging (>= 1.4.0),
+ python-oslo.serialization (>= 1.0.0),
  python-oslo.utils (>= 1.0.0),
  python-oslosphinx (>= 2.2.0),
  python-oslotest (>= 1:1.1.0),