commit 371bbdea47dce1c7ccea9b55dc769d48c38a4167
Merge: 1354bc8 79a1159
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 22 05:54:03 2014 +0000

    Merge "Refactor MySQL long text support"

commit 1354bc80d56331e65089afa0a1ac6347e781f71f
Merge: fd74056 75af33a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 22 05:53:54 2014 +0000

    Merge "Fix incorrect resource types in docs/comment/code"

commit fd74056103ab4352e65119ba35886d34d31f9969
Merge: 9bdec5c 74c4362
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 22 05:51:36 2014 +0000

    Merge "Turn block_device_mapping.volume_size to int"

commit 9bdec5c5a9f17dcb69de6933d3aca7acc6176c79
Merge: f6dfc71 9e0b8b0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 22 05:51:27 2014 +0000

    Merge "heat_keystoneclient migrate auth_token/service_catalog to v3 API"

commit f6dfc7143c0b140346edd681a47e0aa5316b5d0f
Merge: 7406a33 54016d8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 22 05:45:19 2014 +0000

    Merge "new method 'HeatTestCase.patchobject'"

commit 7406a334863035108d50fbf15549824a1a57e138
Merge: 834eb42 e313efc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 21 08:36:17 2014 +0000

    Merge "Use oslo crypto"

commit 834eb42e2e1aa0048a10708b5a598204da98ec1b
Merge: b7bf3c8 9e50403
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 19 09:45:15 2014 +0000

    Merge "Fix ceilometer alarm properties schema"

commit b7bf3c8d206871bc66e2a64514ed03e56ad5919e
Merge: e6cba78 d6b777e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 19 09:45:07 2014 +0000

    Merge "Convert heat_keystoneclient user enable/disable logic to v3 API"

commit e6cba78eaf5e876c73e19c2cef1c1a108d0d792f
Merge: 0cf09a7 72756be
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 19 09:45:04 2014 +0000

    Merge "Convert heat_keystoneclient user-delete logic to v3 API"

commit 0cf09a754e6cf20df7914f36a8a848771f574c49
Merge: e9d2c73 301a894
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 19 08:46:36 2014 +0000

    Merge "Convert heat_keystoneclient user-create logic to v3 API"

commit e9d2c7315202c2527f1d1b4b6a17bc233f58123e
Merge: 1b723d0 37200ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 19 01:07:40 2014 +0000

    Merge "Using _handle_not_found_exception in resources"

commit 1b723d0c00245cc17a3648d6ba0b18a7e5e1101c
Merge: f86f512 2980723
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jan 18 22:43:04 2014 +0000

    Merge "New middleware to handle SSL termination proxies"

commit f86f51255e3f7ae5a609d74bd31a312437b3104b
Merge: bca680b 2904084
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jan 18 21:37:37 2014 +0000

    Merge "Don't query for resource during stack creation"

commit 75af33a8029a8765d9219821212e676e5b319927
Author: huangtianhua <huangtianhua@huawei.com>
Date:   Fri Jan 17 17:29:50 2014 +0800

    Fix incorrect resource types in docs/comment/code
    
    The template guide documentation references OS::Compute::Server in several
    places, and there are similar errors in the environment code comments and
    environment test code. Also there is a similar issue with template guide
    reference to Rackspace::Compute::Server, and a minor typo/spelling issue.
    
    Change-Id: Iafbf405a328bdd8222c277efe5b52d7f8f589635
    Closes-Bug: #1270078

commit 54016d8af61fd1091278f79a7fa8e2b5ed3760b0
Author: Swann Croiset <swann@oopss.org>
Date:   Thu Jan 16 17:32:11 2014 +0100

    new method 'HeatTestCase.patchobject'
    
    This patch introduce this method helper to use mockpatch from Oslo
    and so benefit of mock and fixtures
    
    Change-Id: Iac3c0d17a77f33b1ebf2ddc69db8237998947925

commit 9e0b8b0d1508938806df44a419b398c657f75830
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jan 13 17:02:14 2014 +0000

    heat_keystoneclient migrate auth_token/service_catalog to v3 API
    
    These work the same regardless of the client version
    
    Change-Id: I2ee4a90f4ca5c58226abd2a9660c1a7bdabb1a08
    blueprint: keystone-v3-only

commit d6b777e12616d33a932bc4ca1035e8f7c9bea5f1
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jan 13 16:57:14 2014 +0000

    Convert heat_keystoneclient user enable/disable logic to v3 API
    
    Migrate the enable_stack_user and disable_stack_user functions
    to use the v3 API.
    
    Change-Id: Ieebc94cf09ba952d0ec0499091ba52906d6fe9cb
    blueprint: keystone-v3-only

commit 72756bef6a345257211612e98bad7f33d294f1c3
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 10 17:18:38 2014 +0000

    Convert heat_keystoneclient user-delete logic to v3 API
    
    Migrate the delete_stack_user function to use the v3 API.
    
    While making this change, the old retry workaround (which
    IIRC was due to a Folsom-era keystone bug) has been removed
    as testing indicates it is no longer required.
    
    Change-Id: I6e04ecc3efbb230952ee269f560bdce1115fb9ea
    blueprint: keystone-v3-only

commit 301a894ae9ace52bbb926788e2b5eabc16da2d12
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 10 16:32:54 2014 +0000

    Convert heat_keystoneclient user-create logic to v3 API
    
    Migrate the calls to create the stack user and assign the
    stack user role to the v3 API (still using the default domain)
    
    Change-Id: I34d07cd6c61aa7fccbd386f01504cb18a1f09803
    blueprint: keystone-v3-only

commit 74c4362421e967f77bc9c1fcaf7bbaeb51cadcad
Author: Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com>
Date:   Wed Jan 15 18:48:30 2014 +0200

    Turn block_device_mapping.volume_size to int
    
    Integer instead of string will allow better constrain implementation
    plus Nova expects such parameter to be an integer.
    
    This change is backward compatible, as it still accepts string values.
    
    Change-Id: I599ea2bf77a187cc53f864a9e1a42755142211ff
    Closes-Bug: #1267889

commit 79a1159b34bf54679afeafc50ef072aa6bc7db73
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Fri Jan 17 17:34:58 2014 +0800

    Refactor MySQL long text support
    
    Seperate Json into two classes: LongText and Json. So type LongText
    can be reused in both models and migration, for example, reused by
    software config model(config).
    
    Change-Id: If6a8f77e656ad17ee465cb4724d5e28962c0efef

commit bca680bc912d523e23e3a58934cbf1c44d344464
Merge: 201b362 8e2f66a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 17 05:57:30 2014 +0000

    Merge "Add way to group exceptions in DependencyTaskGroup"

commit 201b36255adb0aa992f66ed1d375beba22c940f5
Merge: 8fec58f 594dd45
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 17 05:05:38 2014 +0000

    Merge "Fix comparison with singletons"

commit 8fec58f15853c7b15813429e799a140410ce4593
Merge: e4d149e 929fa9c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 16 15:40:11 2014 +0000

    Merge "Remove heat-cli-guide"

commit e4d149e95f6847fc077f28b1fa3e3ef4cd15f0b3
Merge: 8f1d922 ece77d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 16 09:18:38 2014 +0000

    Merge "Add _() to rackspace resource strings"

commit 8f1d922f8bbf8d7400af7d890cc56cd2cb3af56f
Merge: aaa4132 74951a0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 16 09:18:30 2014 +0000

    Merge "Add contrib to py26 and py27 gates"

commit 9e504033844149d250ed54191759fec406f62535
Author: Sergey Kraynev <skraynev@mirantis.com>
Date:   Tue Dec 24 09:27:18 2013 -0500

    Fix ceilometer alarm properties schema
    
    The patch contains the following changes:
    
    Type changes:
     - evaluation_periods from String to Integer
     - threshold from String to Number
     - period from String to Integer
    
    Next options are not required now:
     - evaluation_period
     - statistic
     - period
     - comparison_operator
    
    Change-Id: I645673ca7bf52649322e3f4adf851145b9d1a244
    Closes-Bug: #1261390
    (cherry picked from commit ffc913cb930748e0cba0df5b485255d4ec41d5ee)

commit aaa4132b892b753e1cace20bcea268236fe18730
Merge: 982f9d2 9684ee4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 15 23:08:11 2014 +0000

    Merge "Added heat url in config for heat standalone mode"

commit 982f9d2e50202df400387672b9e65189e5a350d0
Merge: 704a47c 16ec039
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 15 21:25:45 2014 +0000

    Merge "Implement neutron metering resources"

commit 704a47c165e338d7cd408cb8db103d591235edf5
Merge: cceba5d faca2b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 15 21:25:37 2014 +0000

    Merge "Add stack id and resource id in logs"

commit cceba5dfec6cb5322bb271850c20add03bdb8427
Merge: 8e7a86d f31295b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 15 19:01:38 2014 +0000

    Merge "Close SSH connections in Cloud Servers resource"

commit 8e7a86dd7e359aed6060667072516544493b99c1
Merge: e3f6a7f 02f3d70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 15 18:48:25 2014 +0000

    Merge "Fix heat-keystone-setup error when try to create heat user"

commit e3f6a7f184e674614d7c24bc7f24f3e380944d4e
Merge: 21f97a0 5235a31
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 15 07:56:46 2014 +0000

    Merge "Let Integer property convert strings to numbers"

commit 929fa9cfdd281df5bf31fe8ad957a195e15ffab2
Author: Andreas Jaeger <aj@suse.de>
Date:   Sat Jan 11 11:55:40 2014 +0100

    Remove heat-cli-guide
    
    The heat command line clients are documented now better in the
    OpenStack End User Guide:
    
    http://docs.openstack.org/user-guide/content/heat-stack-create.html
    http://docs.openstack.org/user-guide/content/heat_client_commands.html
    
    The content here is thus not needed anymore, as the README.rst says:
    "This documentation should eventually end up in the OpenStack
    documentation repositories `api-site` and `openstack-manuals`."
    
    Change-Id: I297252d7f8eee383ce6252a5db44111630fbe29b

commit e313efce5160ec48b0d7b292dbfea4b2311ebcd3
Author: Angus Salkeld <angus.salkeld@rackspace.com>
Date:   Wed Jan 15 12:31:58 2014 +1000

    Use oslo crypto
    
    Use olso crypto as the new encryption solution.
    
    Change-Id: I80b76dc5acef5362c49c437bdefdf88f08983fc4
    Closes-bug: #1251647

commit 21f97a026228d8258f9bfd7c66c7a94d05b54cb9
Merge: 0c83ac2 8dc6ba3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 14 19:04:25 2014 +0000

    Merge "Add filter and pagination to stack_get_all"

commit 29807237cb87e337f95cc2c46cf434b09515a9b3
Author: Pablo Andres Fuente <pablo.a.fuente@intel.com>
Date:   Fri Dec 27 10:07:04 2013 -0300

    New middleware to handle SSL termination proxies
    
    The Heat API doesn't behave properly if it is behind an SSL termination
    proxy. If this is the case, the HTTP redirections and the links
    returned in the REST response bodies are build using http protocol
    instead of https.
    
    To handle this situation, a new middleware was added. The purpose of the
    SSLMiddleware is to update the wsgi.url_scheme environment variable of
    the request with the value contained in an HTTP header that can be
    configured in heat.conf (by default: 'X-Forwarded-Proto')
    
    Change-Id: I418cd8cf2fb2a5fb3f630b4945084fb6eab57310
    Closes-Bug: #1235555

commit ece77d17864fb2174f661c4204ff07a197477ac6
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Tue Dec 17 13:58:05 2013 -0600

    Add _() to rackspace resource strings
    
    As part of fix to bug #1249217, all the translation strings were
    included in _(), but rackspace resources were ignored.
    This change is to fix translation strings in rackspace resources.
    
    Change-Id: I2a422746693136636cc137e2e9cc1bd3a7e6bb01
    Closes-Bug: #1261545

commit 9684ee4546762f425029988573a11c0418ed92ee
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Tue Dec 31 12:25:55 2013 +0800

    Added heat url in config for heat standalone mode
    
    And use heat url for heat standalone mode in client heat.
    
    Closes-Bug: #1255713
    
    Change-Id: Ibbb0c53bd88b77b4444b652cebbd06034f69cebe

commit 5235a3197a89f7c30d38bc7985cdc395e83a9d15
Author: Sergey Kraynev <skraynev@mirantis.com>
Date:   Fri Jan 10 07:09:21 2014 -0500

    Let Integer property convert strings to numbers
    
    This patch give backward compability in case changing
    properties schema of resources.
    Now property Integer may try convert string to integer.
    
    Closes-bug: #1267924
    Change-Id: I8eeb482e1d2bdbb4afa1378a3d751c206658f23a

commit 0c83ac25a912843cfdee3ecd8bfb70921d326974
Merge: 1b8c1b2 1bcd662
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 14 02:32:41 2014 +0000

    Merge "Fix showing events on swift."

commit 1b8c1b20919b477337757dcdf12c98823fc79346
Merge: f75369e 46125db
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 14 02:27:02 2014 +0000

    Merge "Implements Nova FloatingIP resources"

commit faca2b6a010e1eeb884ca4b81613e9bd1d4f34fc
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Tue Sep 17 12:24:08 2013 -0500

    Add stack id and resource id in logs
    
    Where applicable, the stack and resource id's will be added in the logs
    that reference those stacks and/or resources.
    
    blueprint log-resource-stack-id
    
    Change-Id: I70958ddd4904d70ff26c7ad28e2f7fe951881198
    Co-Authored-By: Daniel Givens <daniel.givens@rackspace.com>

commit f75369eecfcaa185ed10c6be8727428f79b7bff0
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Mon Jan 13 14:51:19 2014 -0600

    Update heat.conf.sample
    
    A new version of python-keystoneclient introduces an option,
    include_service_catalog, so heat.conf.sample should be updated.
    
    Closes-Bug: #1268614
    Change-Id: I3caf012d1ecfd852b736f52a1269f742449ffee9

commit faced88fd4ee5a463e8d5091bf9696850809c407
Merge: b644708 36e9eaa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 13 11:04:37 2014 +0000

    Merge "Include a format version in generated templates"

commit b6447082a4c3b832afb4a783151a6e28f6dcfe93
Merge: f236328 f767cff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 13 11:04:29 2014 +0000

    Merge "Generate provider templates with Boolean params correctly"

commit f2363287a1a36d3032beb049c71cb2f528b6402c
Merge: 4b4b4e2 bc7af47
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 13 11:03:42 2014 +0000

    Merge "Correct use of Fn::Split in generated provider templates"

commit 4b4b4e2d11a1d163fcaddc56ff7fc484630a9176
Merge: 0edbb85 ae1f66c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 13 10:28:21 2014 +0000

    Merge "I18N support for InvalidContentType exception"

commit 594dd453a8bc967d722be213de6f422e8e4aede4
Author: Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com>
Date:   Wed Dec 18 13:34:31 2013 +0200

    Fix comparison with singletons
    
    Many plases in tests code use assertEqual(AA, None),
    the same with True and False and negatives of such comparisons.
    
    As comparison to singletons must use `is` operator, appropriate usage
    is assertIs, assertIsNot, assertIsNone, assertIsNotNone
    
    These assertions are provided by the `testtools` package,
    so this change is not breaking backward compatibility with Python 2.6
    
    This second patch inlcudes the other half of the files touched by these
    changes to ease the review.
    
    Change-Id: I9965ae158f3e0dc49b93b9357a32a302ac7dc735
    Closes-Bug: #1259023

commit 0edbb85d1d6de8604a3244d6b507124e01f9ce73
Merge: ab7e5d0 f574a01
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 12 21:51:00 2014 +0000

    Merge "Convert Server to new Schema format"

commit ab7e5d0d1c2d75b36c41ba1509946ef002f16ef7
Merge: 6ef25ad e9916f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 12 14:25:57 2014 +0000

    Merge "update pom.xml files with clouddocs-maven-plugin version 1.12.2"

commit 6ef25ad86fda21e6dd0ec44532a6783dc8d43316
Merge: 6cf46ae 10f193e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 12 14:25:49 2014 +0000

    Merge "Fix asserttion of types"

commit 6cf46ae90ce1e6fd95e210fd2719e1616afd2f83
Merge: 9324732 36c0382
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 12 13:51:35 2014 +0000

    Merge "Use the new Schema class for template generation"

commit 93247329a336ec7dd7e9f312932b67d666413d9d
Merge: 4b5140b 2c2257a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jan 11 20:24:28 2014 +0000

    Merge "Remove superfluous tag schema from Volume"

commit 4b5140bfe7dc5455b134bf5a31dd8622e4b8dd74
Merge: 1addad6 19948b1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jan 11 18:51:19 2014 +0000

    Merge "Fix get_column_num problem in heat-keystone-setup"

commit 10f193ee9221acaba19b22e913c0092ba07e492c
Author: Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com>
Date:   Sat Jan 4 08:32:19 2014 +0200

    Fix asserttion of types
    
    Some code in tests is uisng assertTrue(isinstance(A, B))
    or assertEqual(B, type(A)). assertIsInstance must be used instead.
    
    assertIsInstance is provided by testtools package, so this change is not
    breaking backward compatibility with Python 2.6.
    
    Closes-Bug: #1259941
    
    Change-Id: Ib601aebabc0ff0318cd87cc199c808e6b59f7c9f

commit 1addad60d4a69ca3ed8c2b0b5ffd448a7acc304f
Merge: e450253 8758337
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jan 11 06:31:37 2014 +0000

    Merge "Fixes duplicate calling add_constructor()"

commit e450253315418a5d47b5c7ab4d2e25a8387d7766
Merge: 6cfa424 af064c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 22:49:39 2014 +0000

    Merge "Added session_persistence property to VIP"

commit 6cfa4240024770eea823734120f749065df2fa5f
Merge: ab32a8d 6cb6d30
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 20:21:48 2014 +0000

    Merge "log warning, when $SERVICE_HOST is localhost"

commit 1bcd6625b44b70b1fddef4b7d46ccf32a7fa7a26
Author: Chmouel Boudjnah <chmouel@enovance.com>
Date:   Mon Jan 6 07:37:18 2014 -0800

    Fix showing events on swift.
    
    We don't need to auth again since we already have a valid preauthurl and
    preauthtoken already.
    
    Change-Id: Ic48b1bfccaef8f47b46fffb5a014a05b0ce37a9c
    Closes-Bug: 1263799

commit e9916f7fddca0a632f086968b5a81f488dd10fbc
Author: Diane Fleming <diane.fleming@rackspace.com>
Date:   Fri Jan 10 13:02:03 2014 -0600

    update pom.xml files with clouddocs-maven-plugin version 1.12.2
    
    Change-Id: I5d4633bd53697deafe5c2348d581b81186e6ab1c
    author: diane fleming

commit 29040846ae3093a04cc7e06dcddb17127b7f0afd
Author: Thomas Herve <thomas.herve@enovance.com>
Date:   Tue Dec 24 13:22:26 2013 +0100

    Don't query for resource during stack creation
    
    In Resource.__init__, we unconditionally make a query on the resource
    table even if the stack hasn't been stored yet and stack.id is None. The
    patch adds a simple conditon to skip it.
    
    Change-Id: Ic8f915d6bb82c95db0a65b029b09b864c1348f3d

commit ab32a8d2e624f54ee2d20a6368b8c8cc965d4c9d
Merge: 366c35f 1d32cd9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 12:54:56 2014 +0000

    Merge "Add documentation for multi-engine"

commit 37200ba7fe857d37ff06080d9785f303abb403c1
Author: Sergey Kraynev <skraynev@mirantis.com>
Date:   Fri Jan 10 03:04:07 2014 -0500

    Using _handle_not_found_exception in resources
    
    This patch replace duplicate code in neutron resources on
    function _handle_not_found_exception defined in parent class.
    
    Change-Id: I7f86f52a8d00590c83aad01bc26507c78f01ddbb
    Closes-bug: #1267729

commit 366c35f0d157297d48825d1939f9bbdb15a7298c
Merge: 5e9fad1 6b1b49a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 09:07:04 2014 +0000

    Merge "Fix unused variables 2/2: enable unused var check"

commit 5e9fad18cd9b37b5d136c1fbd84c2d97dc69744e
Merge: f7e0634 9174668
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 09:06:35 2014 +0000

    Merge "Fix unused variables 1/2: add more asserts"

commit 16ec03928f7fbe385e9d564ffd78e6da7bbeeaa5
Author: Sergey Kraynev <skraynev@mirantis.com>
Date:   Fri Dec 13 04:30:20 2013 -0500

    Implement neutron metering resources
    
    Two new resources were added:
     - MeteringLabel
     - MeteringRule
    
    These resources are realisation in heat neutron's
    resources: metering-label and metering-label-rule.
    
    Change-Id: I700dac3fa12d8202b873957542dba6ee1605c3e3
    Implements: blueprint neutron-metering-resources

commit f7e06345d917b0b924bdef2d118d02c5230599aa
Merge: 7672c66 36ba808
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 06:09:26 2014 +0000

    Merge "Tolerate deleted trust on stack delete"

commit 7672c6671bd85572c402eb0f27adbeb7b20ecaa9
Merge: fb08e84 638f827
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 06:09:18 2014 +0000

    Merge "Update Loadbalancer default template to F20 image"

commit fb08e84ca9e0241bf0691198bd9aaa7e3db38593
Merge: 0eec302 cee1f6b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 05:38:23 2014 +0000

    Merge "remove obsolete comment from rackspace clients.py"

commit 0eec3026a44fa89d9adf4407ab58b212e374f5af
Merge: 4060bac cd853f6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 04:18:29 2014 +0000

    Merge "heat_keystoneclient revise get_ec2_keypair"

commit 4060bac9ce73c36b3003e9fec78279e6b9978dd6
Merge: 8b982e8 7214c14
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 04:18:21 2014 +0000

    Merge "Store AccessKey secret_key in resource data"

commit 8b982e8e3e28d0831ae04f2252c80307ff3983cb
Merge: a2ad11f f5e30ec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 03:12:39 2014 +0000

    Merge "Add ability to configure Heat and Trove client options"

commit a2ad11f17ab5197df6a71c6f1587f1aa09b4dcc8
Merge: 1536665 1d4d4a4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 01:39:10 2014 +0000

    Merge "Fix more regressions in contrib"

commit 15366656eb7d6574947551741b5194f95cb5e69a
Merge: a407980 bddf2a9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 01:39:02 2014 +0000

    Merge "Remove override of "patch" function"

commit a407980d4fa98488a153c530b963865084552592
Merge: e20b79c b86ad81
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 01:38:54 2014 +0000

    Merge "Enable parallel while deleting neutron resources"

commit e20b79c81c5e43e61d9c4d4e963206b1808ac364
Merge: 42cd54d a1e90af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 01:38:46 2014 +0000

    Merge "Introduce a way to trace a resource's implementation"

commit 42cd54dcf4f9e89707862fbc4ef0e1c4721a06df
Merge: 9e39f5f 4943af6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 10 01:38:32 2014 +0000

    Merge "Service authorize stack user from provided stack"

commit 2c2257ad85e2ffb16443d781c40cc4d7c507eeac
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 9 19:23:24 2014 -0500

    Remove superfluous tag schema from Volume
    
    This should have been removed by 20fc94a93a4e3e6839ee8465ee2dcf0d60a6be06.
    
    Change-Id: I709958ef88731aff65b8321496a59ef28190c8b3

commit 36e9eaa371d53f5eb86ac86d64887bb542c44c6e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 9 19:16:04 2014 -0500

    Include a format version in generated templates
    
    Change-Id: Iceefec80132e575bd957de06a871dd75dcda55e3

commit f767cff77174d9a5b852ddeb9b1c6426f31637d4
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 9 19:16:04 2014 -0500

    Generate provider templates with Boolean params correctly
    
    There is no Boolean parameter type, so properties of that type should be
    converted to String parameters when generating a provider template from a
    resource.
    
    Change-Id: I779c17694da9dd1c0c0d3cc7deff924911d72bd4

commit bc7af47d2b7c84071101b2c357189da0d2020be2
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 9 19:16:04 2014 -0500

    Correct use of Fn::Split in generated provider templates
    
    The argument to Fn::Split is a list containing the delimiter to split on
    and the string to split. The former was omitted when using it in generated
    templates.
    
    This is good news, because it looks like nobody is using this feature.
    CommaDelimtedLists don't really cut it for list parameters anyway, since
    each list item may be e.g. a Map, so in the medium term we should convert
    these over to using the Json parameter type in some way.
    
    Change-Id: I02e0833d7032baa092bca97bd015659da07a9bae

commit f574a01e9a26522ed3459faf2ad41dc7feb3a659
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 9 19:16:04 2014 -0500

    Convert Server to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: I2da66244760f782e774b332b07b08e526ce5a7ba

commit 36c0382d645d1a3451978468f052520df7ae9221
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 9 19:16:37 2014 -0500

    Use the new Schema class for template generation
    
    Fixes bug 1265209
    
    Change-Id: I66255246e273dba414d9230b6e92bb86390dc8af

commit f31295b7e66005cf282fb43d7d0d7c05c1222db9
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Wed Jan 8 13:37:40 2014 -0600

    Close SSH connections in Cloud Servers resource
    
    Previously, it was possible that a failed stack or hung script could
    cause an SSH connection to remain open.  This ensures that the SSH
    connections are always closed.
    
    Closes-Bug: #1267173
    Change-Id: Ie31ddb8370349ad67c7f63916e6b3b202904da23

commit 9e39f5fdadb25ceb60c240bcefc46fd31187676b
Merge: b0756fa b477191
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 9 18:03:50 2014 +0000

    Merge "Update log message for scale out/in"

commit 8dc6ba39f3d6ad56894ebb82810a1458daff41ae
Author: Richard Lee <rblee88@gmail.com>
Date:   Wed Dec 18 15:53:21 2013 -0600

    Add filter and pagination to stack_get_all
    
    This change prepares the ground for calls that are not tenant-scoped
    to make use of the filter and paging capabilities.
    
    Implements: blueprint management-api
    Change-Id: I4862752999629666b46da20c2713edc950c5d52e

commit b0756fa4ff1169f23242fbcabcfe4056de6d0c0a
Merge: 66e7f1b 6e2dc8a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 9 09:29:18 2014 +0000

    Merge "Improve tools/uninstall-heat"

commit 66e7f1b078bf348374e656c9319d0230cc60b10c
Merge: ecee9d3 c772307
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 9 09:29:10 2014 +0000

    Merge "Validate number of instance metadata entries"

commit ecee9d35ed5193eb68bf7db3abaaed505b2e5de8
Merge: 2a339f9 fe127cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 9 09:25:08 2014 +0000

    Merge "Fix schema format in template generation unit tests"

commit 2a339f9f8fe1156285719b0668771f16eaa2a4e2
Merge: ba2503c 7233ba1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 9 09:24:24 2014 +0000

    Merge "Avoid error on double-delete of nested stack"

commit 02f3d7023537742ab98d361ebc495876d824db20
Author: jufeng <jufeng@cn.ibm.com>
Date:   Tue Jan 7 16:01:09 2014 +0800

    Fix heat-keystone-setup error when try to create heat user
    
    Unset OS_SERVICE_TOKEN and OS_SERVICE_ENDPOINT temporarily to make
    sure this command can run even if the OS_SERVICE_TOKEN and
    OS_SERVICE_ENDPOIN exist in shell environment.
    Remove die_if_not_set in get_data function, because there maybe no
    data in get_data function, for example, if the heat user does not
    exist, the die_if_not_set will be in error.
    Remove die_if_not_set after keystone user-list for the same reason.
    
    Change-Id: I132f975ac2da21e6ad7431ae326ad9bd538e4696
    Closes-Bug: #1266670

commit 46125db7fc551096aefa7921947655abda49af71
Author: Serg Melikyan <smelikyan@mirantis.com>
Date:   Wed Dec 18 14:11:01 2013 +0400

    Implements Nova FloatingIP resources
    
        https://blueprints.launchpad.net/heat/+spec/nova-networking-floatingip
    
    This code aims to add support OS::Nova::FloatingIP
    and OS::Nova::FloatingIPAssociation in Heat.
    
    Change-Id: I678f8a099b97c0fb46bf1056203fc9bafe3032aa
    Implements: blueprint nova-networking-floatingip

commit 8e2f66ac603acd3e2f0f283e21e3a62477ca86d4
Author: Richard Lee <rblee88@gmail.com>
Date:   Wed Dec 11 17:38:12 2013 -0600

    Add way to group exceptions in DependencyTaskGroup
    
    DependencyTaskGroup currently aborts execution if any exceptions are
    raised.  This commit provides a way of aggregating all the exceptions
    during execution and re-raising them only at the end.
    
    blueprint stack-check
    
    Change-Id: I6af314cc112f9286c8b38739870c6fa8b4ba9b5a

commit 6b1b49af7bde32c5983aaef32023f414e331526d
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Wed Dec 18 16:46:56 2013 +0800

    Fix unused variables 2/2: enable unused var check
    
    To make code simple and clean and enable unused local variables(F841)
    check.
    
    Change-Id: I420e4b3c8845efc616d447922122167af383dbc1

commit 9174668355e14545c55c17dcf1066fb735df095e
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Tue Jan 7 11:49:02 2014 +0800

    Fix unused variables 1/2: add more asserts
    
    Add test asserts for some unused local variables to make test better.
    
    Change-Id: I8c830b4680a2ffe8bf1b7cbd44cd1dce5b27c919

commit cd853f699496fc7d7e98d4c5cbe7deda8eb5a360
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 16 17:31:11 2013 +0000

    heat_keystoneclient revise get_ec2_keypair
    
    Modify get_ec2_keypair so it's no longer making assumptions about the
    number of keypairs a user has, instead we provide create_ec2_keypair,
    which just creates and returns a keypair, and get_ec2_keypair just gets
    a specified keypair by user and access key ID.
    
    It's now up to the calling resources to manage the lifecycle of the keypairs
    (which they should be doing anyway..).  Also make the user_id optional.
    
    Change-Id: I28aa0c2d764b9e957302269598a5910346363d0f
    Related-Bug: #1089261
    blueprint: instance-users

commit 7214c146f1c2582e293ded65bf6947c50f617534
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 23 20:45:13 2013 +0000

    Store AccessKey secret_key in resource data
    
    Similar to the change for SignalResponder, store the secret key
    encrypted in resource data, rather than requesting it from keystone
    every time the user requests the SecretKey attribute.
    
    Unlike SignalResponder (which stores the signed URL after using
    the keypair to sign the request), we need this to be backwards
    compatible, to cope with upgrading heat with stacks in the DB
    which contain the AccessKey resource but don't have the secret
    stored.
    
    blueprint: instance-users
    Related-Bug: #1262177
    
    Change-Id: I92826a6dc028b151d98c0a5e2f6ec27db4b744b9

commit 638f827c63d867467e2e3f66c83e0d66a3327b45
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jan 6 10:11:40 2014 +0000

    Update Loadbalancer default template to F20 image
    
    Update the hard-coded default template for the LoadBalancer
    resource, so it uses an image called F20-x86_64-cfntools
    
    The Fedora cloud images now contain heat-cfntools, and I've
    tested with Fedora-x86_64-20-20131211.1-sda.qcow2, downloaded
    from http://fedoraproject.org/en/get-fedora#clouds and it works.
    
    You can download this image direct to glance by doing:
    
    glance image-create --name F20-x86_64-cfntools --disk-format qcow2 \
         --container-format bare --is-public true --copy-from \
         http://cloud.fedoraproject.org/fedora-20.x86_64.qcow2
    
    For users of other distros, you can now override the default
    template by copying the built-in template and specifying whatever
    image or LB configuration you wish, see
    https://review.openstack.org/#/c/64874/
    
    Change-Id: I95e0451b03118a75be0a25f512304649eae42356
    Closes-Bug: #1234375

commit 36ba80820ba7b2693c996283ac1418fefd357b50
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jan 6 11:31:15 2014 +0000

    Tolerate deleted trust on stack delete
    
    Currently if a trust has already been deleted, the stack delete
    fails and the stack becomes undeletable, so instead catch the
    NotFound exception on trust delete, as there's nothing to do.
    
    Change-Id: I1346cefdf6c5f2dea2bc9e2fdd4b9e7b14d60c31
    Closes-Bug: #1266434

commit 8758337fe4b0dbbc0d80d469baa7803ad1f6bf2b
Author: huangtianhua <huangtianhua@huawei.com>
Date:   Wed Jan 8 15:57:05 2014 +0800

    Fixes duplicate calling add_constructor()
    
    Remove duplicate code in template_format.py
    
    Change-Id: Ia5b9a2d55a6f81cc370b5c8a4a94ceac77ff6ba8
    Closes-Bug: #1267005

commit 4943af6b4e19f62278448d1bbf6e1555ac245a81
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Nov 27 15:55:05 2013 +1300

    Service authorize stack user from provided stack
    
    Currently _authorize_stack_user requires that an EC2
    keypair comes from an AccessKey resource (or some other resource
    which uses the access_key as its resource_id).
    
    This change avoids the separate db resource lookup, and checks
    the provided stack for a resource which has an associated access_key.
    
    This could be an AccessKey resource, or any resource which has
    registered an access allowed handler via register_access_allowed_handler.
    
    Additionally, the credential_id does not have to be the AccessKey of a
    keypair. credential_id could be any value meaningful to the resource
    which registers the handler.
    
    Since resources are lazy loaded, register_access_allowed_handler will not
    be called until resources are loaded. This loading is triggered in
    access_allowed by accessing the resources property.
    
    One of the objectives of hot-software-config is to reduce the
    amount of template scaffolding required to enable software configuration.
    This change means that an OS::Nova::Server resource wouldn't need
    an associated OS::Heat::AccessPolicy, AWS::IAM::User, AWS::IAM::AccessKey
    just so that os-collect-config can poll for metadata changes (note that
    the actual change that does this for OS::Nova::Server is pending).
    
    partial blueprint: hot-software-config
    Change-Id: I52a12ad3cd750ed724893abcd6dc1084b925c089

commit ba2503c2ff07d0cfc58d6b6f6aa483c14f658197
Merge: a23c722 40c7410
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 8 00:57:11 2014 +0000

    Merge "Test db migration 31"

commit 74951a03fd1b06424d0c4893b609630e575c737f
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Tue Dec 10 11:15:36 2013 -0600

    Add contrib to py26 and py27 gates
    
    Change-Id: I6e3792bd1fa7076d51321d788d1c272b178339e1
    Closes-Bug: #1251380

commit 1d4d4a421df4526e5f9e564652c33edd533efd5c
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Mon Jan 6 16:48:29 2014 -0600

    Fix more regressions in contrib
    
    Changes to contrib resources to use the new properties Schema caused
    regressions in the Cloud LoadBalancer resource.
    
    Change-Id: I46a19ef4b0248a6c60f11f963350975c6b86349c

commit 7233ba1b14417d62b05034105fde17d9c7cdc5cf
Author: Pablo Andres Fuente <pablo.a.fuente@intel.com>
Date:   Tue Dec 17 17:01:04 2013 -0300

    Avoid error on double-delete of nested stack
    
    When deleting a stack that has a nested stack previously deleted, the
    process fails because the nested stack cannot be retrieved from the
    database.
    To solve the bug, the nested stack is now retrieved from the database
    ignoring the deleted stacks before the deletion process begins. Then
    a NotFound exception is raised, and then when it's catched the nested
    stack will be ignored.
    
    Change-Id: Ib863527dbfb0200b833a4e90b5a4fd50f469c1ce
    Closes-Bug: #1261436

commit a23c7227d1756ec395f19d38f9c2e3bf90b6148a
Merge: e3688f5 2572e75
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 7 21:31:01 2014 +0000

    Merge "Replace try...except...pass block with assertRaises"

commit b86ad8113add2379e3efde5d6e2d696935db30ed
Author: cbjchen@cn.ibm.com <cbjchen@cn.ibm.com>
Date:   Tue Dec 17 16:24:12 2013 +0800

    Enable parallel while deleting neutron resources
    
    The confirm delete task was run immediately after creation in
    handle_delete, which blocked the whole DependencyTaskGroup.
    This patch gives other delete jobs a chance to run by stepping
    the delete task in check_delete_complete.
    
    Change-Id: I9ced21d3f98d949bd099bead27ac7b3e2d1090de

commit e3688f5f1a808412fa9f1efe72d23adc9ecb2b24
Merge: aa322b2 0a6d0b8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 7 04:36:03 2014 +0000

    Merge "Use oslo db.migration script"

commit f5e30ec3d4c705d6be6b25a590142133df7e1160
Author: JordanP <jordan.pittier-ext@cloudwatt.com>
Date:   Mon Jan 6 13:37:42 2014 +0000

    Add ability to configure Heat and Trove client options
    
    Make the client parameters "ca_file", "cert_file" "insecure" and
    "key_file" configurable for Heat client and Trove client.
    Partial-Bug: #1263165
    
    Change-Id: If5e1669327db91fa2e0482b429611757df21fa88

commit aa322b27a3dcc3f81b4fff98bb78458e2b1276c5
Merge: 86edcb0 4ed56ac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 7 00:10:54 2014 +0000

    Merge "Refactor Instance#_check_active"

commit bddf2a9c1f6dc74a5ff79f1396d7620db0b99225
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Fri Dec 20 16:30:09 2013 -0600

    Remove override of "patch" function
    
    Overriding the patch method with an incompatable argument
    list breaks contrib tests that used the version from
    TestCase. This method was introduced in commit
    3eda05a9b0b69803a0269f2aa344d14e5823bf6d but removing this
    method does not affect other tests.
    
    Change-Id: Iaecd171e5a548b2843b46e7c4b8ef48c52af6db6
    Closes-Bug: 1263241

commit cee1f6b0780f16b4976b161f39d5406b364c3982
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Mon Jan 6 15:50:36 2014 -0600

    remove obsolete comment from rackspace clients.py
    
    Removing outdated comment from clients.py.
    
    Change-Id: I06a86555996112130fdb7847de5d20042670c818

commit fe127cfd666d5d3687148b55d2ed6552f0a277a1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jan 6 15:32:26 2014 -0500

    Fix schema format in template generation unit tests
    
    Change-Id: I0c13d972100596e33e3f439e97326144a7fabbb4

commit c77230782924126755b7fa90fe12a544046b7c73
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Thu Dec 12 13:05:18 2013 -0600

    Validate number of instance metadata entries
    
    The Server resource arbitrarily limits instance metadata to five
    entries, when the actual provider's maxServerMeta limit could be much
    higher.  Make the Server resource check the provider's maxServerMeta
    absolute limit and enforce that limit in validate().
    
    Change-Id: Ic00fc6f3a41ae783e43bd7f2df8663263d9cbf90
    Closes-Bug: #1260427

commit 86edcb0ba8aec2650db0c5a81a89e74b93431e44
Merge: 015daff c3d8fae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 6 04:35:00 2014 +0000

    Merge "Fixes typo of explanation on exception.py"

commit 015daff84aaa56fecf61631c6ad639da387f257a
Merge: a86d5fb 6602396
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 6 04:02:23 2014 +0000

    Merge "Fix regression in Rackspace Cloud Servers tests"

commit a86d5fbc2e813928ced8d163e0d32a214d78687e
Merge: 22a3b89 1cb1c00
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 6 02:06:09 2014 +0000

    Merge "Filter resource types by support status"

commit 22a3b895641277cec4579acfe6a56d897314af15
Merge: 75b38b3 88b8e20
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 6 02:01:12 2014 +0000

    Merge "add assertion to heat-keystone-setup script"

commit 75b38b38fa29b1007063f6b3ec0761898ab435ab
Merge: b81f794 e542742
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 6 01:23:21 2014 +0000

    Merge "Deleted TEMPDIR on exit"

commit b81f794c9eac449ec6477687b9a6857517f7e5e0
Merge: 48c7758 746a0ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 6 01:23:13 2014 +0000

    Merge "Make LoadBalancer nested stack template configurable"

commit 48c77581d0afb173988a729cf103036b0be9c31c
Merge: 7472d60 dc06ab2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 6 01:03:15 2014 +0000

    Merge "Add test coverage for SignalResponder delete"

commit 7472d60836c122012d4267b421890d08ace72f2e
Merge: 177946f 8cdf982
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 6 01:03:07 2014 +0000

    Merge "Add policy enforcement to ReST API"

commit a1e90afac4ab504b299e58c6902f25a2fec3ca66
Author: Angus Salkeld <angus@salkeld.id.au>
Date:   Mon Jan 6 10:55:21 2014 +1100

    Introduce a way to trace a resource's implementation
    
    We need a way to know whether a resource is really the
    same during update. This is driven by TemplateResource
    but not totally specific to it.
    
    The problem is:
    if you update a template with no changes (except for environment
    or files changes) we need to know which resources to update.
    
    This patch adds a "implementation_signature()" method that gives
    us a mechanism to keep track of implementation changes like:
    - a change in an environment mapping a resource to a new/different implementation
    - a change in the content of a TemplateResource
    
    And can distinguish between schema changes (requiring replacement) and
    incremental changes (that can be updated in place).
    
    Change-Id: I780074a827e3f51dede47a81f15e29dbe4d08804
    Closes-bug: #1254966

commit 177946fce7c2f5fe31088c371ffacc4b541a98c9
Merge: 5165780 7c005f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 5 17:34:00 2014 +0000

    Merge "Do not override cloud-init cloud_config_modules"

commit 8cdf982210fa996e49961844a9b583336ec3f17b
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Dec 19 18:08:03 2013 +0000

    Add policy enforcement to ReST API
    
    Currently the native API lacks support for enforcing policy via
    policy.json, as is possible for the aws-compatible APIs.
    
    So modify and rename the tenant_local decorator to also enforce
    policy, and add tests to ensure the API controllers are all
    using the decorator on their actions
    
    Change-Id: Id80d576d5ff5e546da42dbf08ebd653005af14ff
    blueprint: request-scoping-policy

commit 2572e753c224f77643de099dfb13a7e11b46f7c1
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Fri Jan 3 16:36:53 2014 +0800

    Replace try...except...pass block with assertRaises
    
    To make the test logic looks tidy and clean.
    
    Change-Id: Id278524a8d4b8bf953f6c3d250e47be04c5edb55

commit 1d32cd9ce7e784bc6139f5e6cac829e8b6a320a0
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Mon Dec 23 16:26:17 2013 -0600

    Add documentation for multi-engine
    
    Describe how to set up Heat for a multi-engine deployment in the
    document on scaling Heat.
    
    blueprint multi-engine-docs
    Change-Id: I5db28b3bc8f5f5dda2d86d052223159adef5f5f0

commit 746a0ed4ad2273d0e67b896efbb6d7a69f9f4c77
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 3 16:56:58 2014 +0000

    Make LoadBalancer nested stack template configurable
    
    Reviving work originally posted by Angus Salkeld under
    https://review.openstack.org/#/c/21405/
    
    This is to enable the various distros to easily override the
    hard-coded default nested template (which currently only supports
    Fedora 17) with a template approporate to their distro, and
    enables deployers to specify their own template (although the
    latter use-case will probably be catered for via a provider
    template implementation long-term).
    
    Change-Id: I0a4eccb23b2eebbf31b7aabf0fe85ab31f0ca971
    Partial-Bug: #1234375
    Co-Authored-By: Angus Salkeld <angus@salkeld.id.au>

commit 6e2dc8ab58ed620de80f13c01da152c67b5cb9a5
Author: DennyZhang <denny@unitedstack.com>
Date:   Thu Jan 2 10:27:42 2014 -0600

    Improve tools/uninstall-heat
    
    Inform users that the script doesn't remove related role/user from keystone.
    
    Change-Id: Ia0a7cb37ae568e37c86ff9047361c42186c21ab4

commit 4ed56ac24a474104682aee95078ecade846cbe90
Author: Richard Lee <rblee88@gmail.com>
Date:   Wed Dec 11 17:09:49 2013 -0600

    Refactor Instance#_check_active
    
    Currently, Instance#_check_active both checks whether the server is
    active and attaches the volume. This commit separates that logic.
    
    blueprint stack-check
    Change-Id: I7fe805efc089535667e8d3840d79ade07430040c

commit 51657807ae68ff41f0126a9a71f470f51d7ae31f
Merge: 1514e1b 9bb03ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 3 13:36:18 2014 +0000

    Merge "EventService exception handling to not log errors"

commit 1514e1b41f4e9f61148e01b2763cd66a18c13219
Merge: 9900be8 92da04a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 3 12:46:31 2014 +0000

    Merge ""mountpoint" should not be required parameter"

commit 40c7410df31dd851267592641cbdfc54ac2f8410
Author: Angus Salkeld <angus@salkeld.id.au>
Date:   Fri Jan 3 20:26:45 2014 +1100

    Test db migration 31
    
    Add some data into the db and make sure the alter table works.
    
    Change-Id: I13df69198e3dcdc6f4ab562041bfadb890782328

commit 9900be889e5a4d7ca3dc627c4f847dcd1412057b
Merge: d708cda 1bcc657
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 3 07:45:24 2014 +0000

    Merge "Sort the output of config/generator.py by group name"

commit ae1f66c32513639c74a00b8038d7278048d2d0ef
Author: huangtianhua <huangtianhua@huawei.com>
Date:   Fri Jan 3 11:25:52 2014 +0800

    I18N support for InvalidContentType exception
    
    The error message of InvalidContentType exception should support i18n as
    other exceptions.
    
    Change-Id: I7a4c15eb69fbc1fd6e2caa9c0503685ec8b53941
    Closes-Bug: #1265694

commit d708cdafbb73df712137a1040d83c7e1abc58330
Merge: 72fdedc 49224f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 3 05:32:59 2014 +0000

    Merge "Add new Ceilometer combination alarm resource"

commit 72fdedcf1b82b61ba8f55ab0784eb4912d27b308
Merge: b15954c 0dcb30c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 3 05:32:37 2014 +0000

    Merge "update rackspace clients.py"

commit c3d8fae6847e365b2933618843f0643962b45510
Author: huangtianhua <huangtianhua@huawei.com>
Date:   Fri Jan 3 10:21:01 2014 +0800

    Fixes typo of explanation on exception.py
    
    Something like:
    unvavailable -> unavailable
    
    Change-Id: I2f94532862e46d2a1371b819fa6adf2eb9cb3992
    Closes-Bug: #1265687

commit 19948b15614a4b5daac4c29a256a8c01da6acaa9
Author: DennyZhang <denny@unitedstack.com>
Date:   Thu Dec 12 19:16:43 2013 -0600

    Fix get_column_num problem in heat-keystone-setup
    
    get_column_num function searches the second line of command output,
    to get the field number for a specific field.
    
    But output of 'keystone user-list' may have an extra line: 'WARNING:
    Bypassing authentication using a token & endpoint ...'
    
    This messes up the functionality of get_column_num function
    
    Closes-bug: #1260556
    Change-Id: I8c6e7f939466154c5e31e6f019e20fb855e15878

commit 0a6d0b8b405dc73fe7d91cbca797d06f4f9fa1a4
Author: Angus Salkeld <angus@salkeld.id.au>
Date:   Fri Jan 3 10:54:49 2014 +1100

    Use oslo db.migration script
    
    Turn Heat's migration script into a simple wrapper around olso's.
    The api is a bit different so for now keep ours inplace.
    All that our script does is find the path to the migration_repo
    and call the oslo code. No point having two implementations in the
    same codebase.
    
    Change-Id: I0aa3e10890f924d77268f4118dae53b446e193eb

commit b15954c02e070f8d3457c40590527f1bf433c021
Merge: b3a17f3 cf4ffd8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 2 21:22:57 2014 +0000

    Merge "Rename scaleout_apis.rst -> scale_deployment.rst"

commit 0dcb30c08ea9c024e0f95c132ea0fb55bba6c0c5
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Mon Dec 16 15:39:32 2013 -0600

    update rackspace clients.py
    
    Overriding trove method in rackspace clients.py to work with
    openstack Trove resource (OS::Trove::Instance).
    
    Closes-Bug: #1261514
    Change-Id: Ie203fed4ae1e0af66ed0d9b0add5a288972b9c47

commit 6cb6d30bc0de9298d6d1744707081880dd62acc5
Author: DennyZhang <denny@unitedstack.com>
Date:   Thu Jan 2 10:58:55 2014 -0600

    log warning, when $SERVICE_HOST is localhost
    
    Warn users, if heat-keystone-setup can only use localhost as $SERVICE_HOST.
    And remove an extra whitespace.
    
    Change-Id: I1b2a1b93212b6ab0ca092bb6c834255ee75176ca

commit b3a17f36093ee4b822c8482d345e46b63cc3530d
Merge: 23fb420 2c6e8eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 2 15:18:35 2014 +0000

    Merge "Enhance message for watch rule"

commit 23fb420cfb668ce9fed02e129dee4f3327c189b7
Merge: 63b8d8a e6a9225
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 2 14:38:02 2014 +0000

    Merge "Remove redundant word from OS::Nova::Server"

commit 63b8d8ab5d7abbc8eab1eb968ffeaa80a957bef4
Merge: d52dd0b a070019
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 2 13:28:53 2014 +0000

    Merge "Remove usage of mox class"

commit d52dd0b8ee5344aade603cf0de2b3c3af8a67e46
Merge: b0ca362 091b463
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 2 12:13:32 2014 +0000

    Merge "Use WithScenarios base class instead of load_tests"

commit b0ca362bac7adda68b40b8e975a3e7fa7768a592
Merge: 604b851 bfc1ee4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 2 11:21:56 2014 +0000

    Merge "Add test for AutoScalingGroup resize and metadata"

commit a0700194f2ae476693d8d88a9a7534acb32bbba5
Author: Thomas Herve <thomas.herve@enovance.com>
Date:   Thu Dec 26 18:21:41 2013 +0100

    Remove usage of mox class
    
    We have a base test class already that does the cleaning, we don't need
    to use mox base class, which uses a different pattern for the stub
    object.
    
    Change-Id: I5fce772bd330f9fb0fca5821ab200b55c0fb7358

commit 604b8519d1aa8781aceae69102f6b022ead107c5
Merge: 0df3bc7 4f4e053
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 2 07:11:53 2014 +0000

    Merge "Empty files shouldn't contain copyright nor license"

commit 1bcc65762f664c283a9dd6f2731199a6c873c641
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Tue Dec 31 12:41:17 2013 +0800

    Sort the output of config/generator.py by group name
    
    To avoid huge changes in the output when adding new option groups.
    
    Sync from oslo commit 4b3e32b980cf1d028da9325b21183ff635fbe043.
    
    Closes-Bug: #1258363
    
    Change-Id: I9173a38d4d548ce641e19ada30f86148c1f0c53f

commit 92da04a174687152e84b12e6ed4bf63b0e51f708
Author: huangtianhua <huangtianhua@huawei.com>
Date:   Thu Jan 2 11:02:09 2014 +0800

    "mountpoint" should not be required parameter
    
    The nova server supports attaching a volume to a server without taking
    device name, so the "mountpoint" should not be required parameter on
    VolumeAttachment in heat.
    
    Change-Id: If5c978345c916a319cc150fe7edd86d5056c5b1f
    Closes-Bug: #1265419

commit e542742e1d77b709de78cfeb59991b0b955fe647
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Tue Dec 31 14:33:37 2013 +0800

    Deleted TEMPDIR on exit
    
    To avoid undeleted tmp.XXXXXXXXX directories left in /tmp, and output
    unified style patch for later apply.
    
    Change-Id: I6069c3cf36e345e5101ae3cf884e647c1d42030e

commit b4771910ab3f0620fc7ba5c4750b313d5ef6132b
Author: Jay Lau <liugya@cn.ibm.com>
Date:   Wed Jan 1 09:17:55 2014 -0500

    Update log message for scale out/in
    
    When create two stacks with same template with autoscaling group,
    then when scale out/in, the log message would be as
    (HadoopSlaveScaleUpPolicy is my scale up alarm and HadoopSGroup is
    my autoscaling group):
    
    HadoopSlaveScaleUpPolicy Alarm, adjusting Group HadoopSGroup by 1
    
    From above log message, I do not know which stack is being scaled up.
    
    This patch add scale group id to the log message so that we can know
    which group is being scale out/in.
    
    Change-Id: Ie4862e9738c652b813b3dae01f9aeb3557e79b9a
    Closes-Bug: #1265315

commit e6a9225a2af2c03d5efb62009bb31858870520f4
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Dec 31 08:39:19 2013 -0800

    Remove redundant word from OS::Nova::Server
    
    All parameters not marked as "Required" are optional. The documentation
    generated from the schemas will already note this, so having the word in
    the description is redundant.
    
    Change-Id: I1df10c598969e97d5c1c8ecd1c2896a59ae1d2d1
    Closes-Bug: #1225845

commit 2c6e8ebab498b8e7e4476f2f3d01da8ba5776ae6
Author: Jay Lau <liugya@cn.ibm.com>
Date:   Tue Dec 31 11:14:17 2013 +0800

    Enhance message for watch rule
    
    When heat engine log message for watch rule, it will log message
    as following:
    WATCH: stack:86ef85cb-994c-4481-bb4d-2bb556236dbd,
    watch_name:a1-MEMAlarmHigh ALARM
    
    We should update it to:
    WATCH: stack:86ef85cb-994c-4481-bb4d-2bb556236dbd,
    watch_name:a1-MEMAlarmHigh, new_state:ALARM
    
    This patch also enables I18N for this log message.
    
    Change-Id: I23a825a8b5bed621c7d3fc3e582e853e52a3e69d

commit 6602396f5c76389656d0ab1012b3870fa5d2e6a8
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Mon Dec 30 11:08:06 2013 -0600

    Fix regression in Rackspace Cloud Servers tests
    
    Commit 63b7f14403 introduced a regression in the Rackspace Cloud Server
    tests.  Instance.volumes() now relies on its VOLUME property's default.
    Since CloudServer inherits volumes() from Instance but defines its own
    VOLUMES property, its VOLUMES property should also have a default.
    
    Closes-Bug: #1265034
    Change-Id: Ib17337c5d06aedf65da5497ad48858d649ba4e96

commit 0df3bc702b3371227a343d5c73bf626f2fae4f25
Merge: 3b0aa2e ecc6448
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Dec 30 14:12:36 2013 +0000

    Merge "Imported Translations from Transifex"

commit bfc1ee4609b29b30c4db9c76c5768f2dcd41643e
Author: Alexander Chudnovets <achudnovets@mirantis.com>
Date:   Wed Dec 25 19:11:55 2013 +0200

    Add test for AutoScalingGroup resize and metadata
    
    Added a test to ensure that AutoScalingGroup
    updates related resources after scaling up.
    
    Change-Id: I88e1d832f4909f417af9e860a829c7e5f20ce0d5
    Related-Bug: #1227627

commit 3b0aa2e9121ab6d82526688d164e0799028844c7
Merge: c9f9a21 e01e7b1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 30 12:53:48 2013 +0000

    Merge "Do not use python built-ins as variable names"

commit ecc6448452f8cfb1aace1dcd34faaab08054f03c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Dec 30 06:05:34 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I785d8d5c050cbc0a1bbecc56fd4e56e9366b82d7

commit c9f9a214ce2f1a0c9e91c5b6ee128a0ae92a77f9
Merge: 0ba07ac 3ea6e8c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 29 05:35:05 2013 +0000

    Merge "Fix a typo in the README for docs"

commit cf4ffd82156f86bebe193e495dcedd3099d71abc
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Mon Dec 23 16:02:38 2013 -0600

    Rename scaleout_apis.rst -> scale_deployment.rst
    
    The multi-engine docs will be added to the file currently named
    scaleout_apis.rst.  Renaming it to scale_deployment.rst to make the name
    more generic.
    
    blueprint multi-engine-docs
    Change-Id: I038d775a065ccd22da9ec0dbc3d8fa5a806ca020

commit 0ba07aca8a256c97a9763d85d0d7dd7797248fb6
Merge: f6751f2 4802897
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 27 14:00:02 2013 +0000

    Merge "Fix misused assertTrue in unit tests"

commit f6751f272dc07385277a5ae81a00b4e6086b337f
Merge: ef8b312 6d44a07
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 27 10:20:49 2013 +0000

    Merge "Fix SignalResponder signature response when deleted"

commit 091b463e8f2187fbf573e54c70eac242a5c847ac
Author: Thomas Herve <thomas.herve@enovance.com>
Date:   Thu Dec 26 15:43:32 2013 +0100

    Use WithScenarios base class instead of load_tests
    
    To support test scenarios, we now override load_tests in the module
    using them. To support alternate test runners and not needing that, the
    patch makes the Heat test base class inherit testsceanios.WithScenarios.
    
    Change-Id: Ie2435e41c466c0687bb1dd95080dcac7c837aaba

commit 1cb1c00fb636c89fbefcc56e60ed9fcbd25810e6
Author: Julia Varlamova <jvarlamova@mirantis.com>
Date:   Wed Nov 20 17:27:42 2013 +0400

    Filter resource types by support status
    
    Now heat resources haven't support status. We want service providers
    to have a way to assign support status metadata to resources. And
    then user should be able to filter resource types by support status
    when quering the api for resource types.
    
    Add processing of query parameter support_status to list_resource_types
    function in heat/api to filter resources by. List_resource_types
    returns a list of resources with a certain status or a list of all
    resource types by default.
    
    Add filtering on the server.
    
    Add changes to tests:
    - test_rpc_client.py
    - test_api_openstack_v1.py
    - test_engine_service.py
    
    Implements bp filter-resources-by-support
    
    Change-Id: I719c0d690886153adb698aea4695ddd526e7a4af

commit e01e7b1d2947571c4a4e0520c5724f5bee393eb5
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Wed Dec 18 15:03:06 2013 +0800

    Do not use python built-ins as variable names
    
    `property' and `exit' in python are built-in classes, we should not
    use them as variable name.
    
    Change-Id: If02d6ac2bd3bd4f1d4bb3e5a2589421e12a4b8e6

commit ef8b312df8828aadc6f55c018c1270cd90fd515c
Merge: e5a023c ae347b8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 24 15:34:56 2013 +0000

    Merge "Add migration test framework"

commit dc06ab2e62f923b93bc27ff540ca128b4e7be0fd
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 18 21:07:00 2013 +0000

    Add test coverage for SignalResponder delete
    
    Add coverage for the case where the user has been deleted out of band
    and keystoneclient raises a NotFound exception.  Brings coverage of
    SignalResponder up to 100%
    
    Change-Id: I29ea94b052f807072d98e05768e6a1973df5d40d

commit 6d44a07abf88cc722d3a8f065b936746205eca23
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 18 18:43:21 2013 +0000

    Fix SignalResponder signature response when deleted
    
    The test_FnGetAtt_delete_not_found test previously did nothing
    because the rsrc.delete() was just getting a generator function
    and not actually doing the delete.  This uncovered that we'd throw
    an error trying to get the AlarmUrl after resource deletion, so
    ensure we return None when the credentials have been deleted.
    
    Change-Id: I7edbaeae26a53e8e424195d2b389b7d45b414da5

commit 3ea6e8c54f3253778178dca174b8e156611c1c1e
Author: Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com>
Date:   Fri Dec 20 18:03:03 2013 +0200

    Fix a typo in the README for docs
    
    Package `oslo.sphinx` is wronlgy referred to as `oslo-sphinx`.
    
    Change-Id: I15711aa54c82d97b622fbceb821b4aca3315d49c

commit e5a023c41cd526f30f3a159a7f4ceadd2d0b66b4
Merge: 73f7d68 76287eb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Dec 24 12:37:09 2013 +0000

    Merge "Imported Translations from Transifex"

commit 4f4e0530e57ceff120b8f4c605643bbabb821aab
Author: ZhiQiang Fan <zhiqiang.fan@huawei.com>
Date:   Tue Dec 24 20:26:42 2013 +0800

    Empty files shouldn't contain copyright nor license
    
    http://docs.openstack.org/developer/hacking/#openstack-licensing
    
    Change-Id: I5fc4e19a47c2a26df0fed78f3e06daad6157694c
    Closes-Bug: #1262424

commit 73f7d6886abb80dce492bb13f0e6662099f4ec61
Merge: f503241 a96c432
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 24 12:25:44 2013 +0000

    Merge "Don't provide default values to properties.get()"

commit f503241009876f7ad7c227ff4eebe7e9c1e677c3
Merge: f0bc492 f204ad2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 24 12:21:17 2013 +0000

    Merge "Remove useless validate methods"

commit 76287eb6e6169e6eae1c0012c271679d0a70cacb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Dec 24 06:05:51 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9ea211d7529c6d0351aeb6c1cf8432b4af5da2dc

commit a96c432c7d335bfb956e7b2fc342d5c7d8fddc9b
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Tue Dec 17 14:56:09 2013 -0600

    Don't provide default values to properties.get()
    
    The properties of a resource are known, so we don't need to provide
    default values to properties.get().
    
    Change-Id: I2c28d9fe41db589a885c458dba35780aabed87c0

commit f0bc492b0e9f0d2c816d621366e6c5b540a9ab38
Merge: c64d74a 60f6adf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 23 18:46:49 2013 +0000

    Merge "rackspace: Convert CloudLoadBalancer to new Schema format"

commit c64d74a4f27178121b55aded89332a599593c26a
Merge: 9e3cc77 69029e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 23 18:46:41 2013 +0000

    Merge "rackspace: Convert resources to new Schema format"

commit 9e3cc774d08691e04ba11fb0169815579ee84f3f
Merge: 9bc4197 0c3c611
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 23 14:53:35 2013 +0000

    Merge "Let users specify metadatas on swift accounts."

commit af064c7a5304c672f7d71e4c8df5f69c195c739a
Author: Serg Melikyan <smelikyan@mirantis.com>
Date:   Tue Dec 10 14:51:36 2013 +0400

    Added session_persistence property to VIP
    
    Added new property session_persistance to the OS::Neutron::LoadBalancer
    resource attribute VIP. Now user can configure session stickness feature
    in Neutron LBaaS.
    
    Change-Id: I9afd1a8c222110899a90a940e7a549278c4467b7
    Closes-Bug: #1259078

commit 9bc41976d5274b73f94170e9f5c226f1d5026dd0
Merge: 9fad47d 893a8c9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 23 13:41:03 2013 +0000

    Merge "Change loglevel for certain failures"

commit 9fad47dc46b3360767582f318a5ea7f4ddfef6e5
Merge: 4633033 811d901
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Dec 23 13:39:10 2013 +0000

    Merge "Updated from global requirements"

commit 46330339d43552a8091560c7e6b22612dbf97acc
Merge: ba18946 082f505
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 23 13:27:30 2013 +0000

    Merge "Remove unnecessary setUp call"

commit ba18946d2f7602ae4bc7dd9af0462590689c5455
Merge: 0cd7bb6 bd72ad1
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Dec 23 13:27:26 2013 +0000

    Merge "Imported Translations from Transifex"

commit 0cd7bb64c44b19132c5cb6d43f1629602c819271
Merge: 37e74a3 ba9c290
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 23 13:20:39 2013 +0000

    Merge "SignalResponder store access/secret in resource data"

commit 37e74a3c06381785f15f99391f626d40fe1a158a
Merge: 77406e7 f67cd21
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 23 11:22:39 2013 +0000

    Merge "Add support for multiple encryption methods"

commit 811d901f25c318cc689a2f204b284c4ef6ffe5e4
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Dec 23 10:59:30 2013 +0000

    Updated from global requirements
    
    Change-Id: I6ddaccfc07132a9d18f3ffdfe1b5919e85b88300

commit 77406e729a0f305a4424b2a7060ae5bd6b4dec4c
Merge: a5702d8 a5d55c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 23 10:04:06 2013 +0000

    Merge "Use property name constants in CinderVolume"

commit a5702d81d06defef57a66a78b636ff05679cee46
Merge: 860212d 63b7f14
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 23 10:02:51 2013 +0000

    Merge "Add a schema for the AWS::EC2::Instance Volumes property"

commit 49224f5bcec7b79a9e924ca92769e3f3423b3d39
Author: Thomas Herve <thomas.herve@enovance.com>
Date:   Fri Dec 13 17:39:02 2013 +0100

    Add new Ceilometer combination alarm resource
    
    This patch introduces a new OS::Ceilometer::CombinationAlarm resource
    allowing the creation of combination alarms in Ceilometer.
    
    Implements: blueprint ceilometer-combination-alarms
    Change-Id: I8d7ba7f210423a5e7a1b1f1b86007fabdade7482

commit bd72ad17a0d5162603cb52f11634cb3c6d572b94
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Dec 23 06:06:07 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iff22a95603f04855b25f465df07784f07d17a6ec

commit 893a8c980c288bc8a53471d0618e8af9692cb653
Author: DennyZhang <denny@unitedstack.com>
Date:   Sun Dec 22 22:59:17 2013 -0600

    Change loglevel for certain failures
    
    Change Log.info to Log.error/Log.warning to make trouble shooting
    more apparent
    
    Change-Id: Ie293df0c941414da8fb035e4d4b170a0a4c9d397

commit 0c3c611491d0b4c8672a337b2d8b8c94af9d4b9b
Author: Chmouel Boudjnah <chmouel@enovance.com>
Date:   Sun Dec 22 02:19:20 2013 -0800

    Let users specify metadatas on swift accounts.
    
    Change-Id: Ifc9d046759be1be88ad0d7a51dc73ba370a49d8f
    Implements: blueprint swift-tempurl

commit 7c005f19c65f07f37aa7920c1e4147b6623931c3
Author: Clint Byrum <clint@fewbar.com>
Date:   Sat Dec 21 01:47:15 2013 -0800

    Do not override cloud-init cloud_config_modules
    
    In the past it may have been necessary to do this but it causes problems
    for users of advanced features. We should be able to operate with the
    default OS configuration of cloud-init.
    
    Change-Id: Ic26bffb17b1870d656fea72cf3da3dfe2b7f44d0
    Closes-Bug: #1263297

commit 860212d210440eed376fff6c001aec92aae5ec03
Merge: 529fdb3 249387d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 20 16:59:25 2013 +0000

    Merge "Adds parameter_groups to HOT specification."

commit 529fdb3cda2fadfa85bf7df791170c0fb40a28f4
Merge: 1d4c784 151bfa1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 20 09:16:26 2013 +0000

    Merge "SignalResponder, set resource_id in the correct place"

commit 480289776ece24f25baae47952917269e6355a4b
Author: Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com>
Date:   Thu Dec 19 13:23:06 2013 +0200

    Fix misused assertTrue in unit tests
    
    The patch merged under review https://review.openstack.org/#/c/61816/3
    still uses assertTrue instead of assertEqual.
    
    This patch properly corrects this.
    
    Change-Id: I09fd4b7355dd721b513febd0669cb1368b5cda19
    Closes-Bug: #1226374

commit 1d4c784a4bcf41043e2f38232ed3f55540c48b82
Merge: adec077 7cca457
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 20 08:36:42 2013 +0000

    Merge "wsgi.Resource exception handling to not log errors"

commit ae347b81caa478602a4656847a1899e05f4fda1f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Dec 20 12:32:58 2013 +1100

    Add migration test framework
    
    This is partly taken from nova and uses the oslo-incubator test migration
    framework.
    
    Change-Id: Ia09e3dd2e85917607025a8cf82aa259445c2c24f

commit 082f5051097f74c612a9711c22484fd2eaa29f81
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Dec 19 14:15:04 2013 -0800

    Remove unnecessary setUp call
    
    A setUp method that just upcalls to the parent setUp is redundant and
    can be removed.
    
    Change-Id: Id3acee286e551622f4fcfa29934d18e52f4fd47d

commit adec0770263e0a3cb1bd00e956b07beb0db0a531
Merge: 8a08db7 5b4eae9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 19 20:58:18 2013 +0000

    Merge "Fix copy/paste errors in API docstrings"

commit 8a08db720d60d7bf13d17a2854da86bcbfffb87c
Merge: 94cf1a4 0b0fb95
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 19 18:24:33 2013 +0000

    Merge "Simplify update_with_template() method"

commit 88b8e20f1ce367a3affefe20c45a1708e8a06bc3
Author: DennyZhang <denny@unitedstack.com>
Date:   Thu Dec 12 19:30:41 2013 -0600

    add assertion to heat-keystone-setup script
    
    Defensive check for various critical steps in the script
    
    Change-Id: I9df01011940d80532787c3acaf0cc8ec10e97cc8
    closes-bug: #1260561

commit 94cf1a404b649b72192c1ca0db79178ad11b093b
Merge: cd3d2c9 0ae13c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 19 17:02:27 2013 +0000

    Merge "Convert numeric values in instance metadata to strings"

commit cd3d2c9e0913157dc7234319d3cfd826299b5105
Merge: a2fd035 db4f855
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 19 15:55:03 2013 +0000

    Merge "Convert Neutron resources to new Schema format"

commit a2fd03533f727cd4807c68d9d9b4ae0c2441bcc8
Merge: e7f0bb0 95acc9b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 19 14:13:11 2013 +0000

    Merge "Use property name constants in Ceilometer alarm"

commit e7f0bb01d4749c44edc1c03d7ea935b530417c00
Merge: 80a3777 14fce9f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 19 12:50:56 2013 +0000

    Merge "Add nested resource references to resource group"

commit 0b0fb9594d28ab2fa03b4d31c688179ed4d97816
Author: Simon Pasquier <simon.pasquier@bull.net>
Date:   Wed Dec 18 10:49:13 2013 +0100

    Simplify update_with_template() method
    
    self.nested() was tested against None at 2 different places in the
    method. It is now tested once and if it is None, the method fails
    early.
    
    Change-Id: I1296003b359b463126536f3e45c09bd2f22aa18b

commit 80a37778a5bd4fdfdbca5c5b422e45baaaf2d6d9
Merge: d4cc50c 062fd9c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 19 04:29:47 2013 +0000

    Merge "Convert AWS network resources to new Schema format"

commit 5b4eae9ace3591a984bfe48bcb63fb2711b5bf18
Author: huangtianhua <huangtianhua@huawei.com>
Date:   Tue Dec 17 12:02:20 2013 +0800

    Fix copy/paste errors in API docstrings
    
    Fix some inappropriate docstring, like:
    
    1. "Gets detailed information for a stack" as the docstring for show() in
       events.py
    2. "Lists summary information for all resources" as the docstring for
       index() in events.py
    3. "Gets detailed information for a stack" as the docstring for show() in
       resources.py
    4. "Gets detailed information for a stack " as the docstring for
       metadata() in resources.py
    
    Change-Id: I38fc6a18224d1537bf6981ba60bffc31768b7443
    Closes-Bug: #1261615

commit d4cc50c6853c215871a681f06501db265822a9f2
Merge: 8ae4104 f6efb82
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 19 01:58:55 2013 +0000

    Merge "Convert [Cinder]VolumeAttachment to new Schema format"

commit db4f855eb8c7675aec8510b0056056057925282a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:30:03 2013 -0500

    Convert Neutron resources to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: I4753d5c73bfb01badc39e9e9a6b1343f60c55088

commit 8ae4104377a16449c7dff47d40d932f19e02fa0a
Merge: 7f8fca5 aaa9258
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 18 21:56:02 2013 +0000

    Merge "Add sanity check to ensure user_id can be trusted"

commit 7f8fca59671ce8556b9f0e6680ff9fa2d3465afb
Merge: 140024d 831b236
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 18 21:55:54 2013 +0000

    Merge "Correct create_trust_context docstring"

commit 140024d2eabe9a7ecbb9ebda6d492f1edea15edb
Merge: 2d5821c a87fee9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 18 21:53:01 2013 +0000

    Merge "rackspace: Convert Scaling resources to new Schema format"

commit 2d5821c48ace6c38a354069481546155efee6f92
Merge: e8c7454 aa51f82
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 18 20:30:44 2013 +0000

    Merge "Fix misused assertTrue in unit tests"

commit 7cca4576f09616d6dbf7cec0d5127b04daafd248
Author: Pablo Andres Fuente <pablo.a.fuente@intel.com>
Date:   Fri Dec 13 16:51:47 2013 -0300

    wsgi.Resource exception handling to not log errors
    
    In order to not log some exceptions as errors, the
    wsgi.Resource.__call__() was modified.
    Instead of check if an exception is a HTTPBadRequest or a HTTPNotFound,
    now all the exceptions that are not childs of HTTPError are raised
    directly, without logging, translation or disguise.
    If the exception is a child of HeatException, then the exception is
    tranlated but not logged as an error. When this exception reaches the
    Fault Wrapper Middleware it is logged as debug.
    Some unused, or only use in test, exceptions were removed.
    
    Change-Id: I105eeb74a55dcabc79cd3926dd88da0e19d1e1f1
    Closes-Bug: #1231133

commit e8c745487df5d1708fe395ffe3a6a6fb1a7b67d8
Merge: e254082 6929d02
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 18 18:19:14 2013 +0000

    Merge "Add an external gateway property to neutron router"

commit ba9c290212363efc242b659826a7f9d18ac1fed5
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 16 17:17:13 2013 +0000

    SignalResponder store access/secret in resource data
    
    We need to stop relying on the logic in heat_keystoneclient which
    assumes there is only one keypair per user, as this assumption
    may not remain true in future.
    
    So instead, store the access/secret key in the DB as resource data,
    which is probably better from a performance perspective anyway, and
    will also allow SignalResponder subclasses to potentially override
    the default credentials implementation more easily.
    
    Change-Id: I7952181f30c94848acf358ab34cf17b6281d43ac
    Partial-Bug: #1089261
    blueprint: instance-users

commit 151bfa1d119900f897f7185cba9f1b437b44654e
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 18 12:08:43 2013 +0000

    SignalResponder, set resource_id in the correct place
    
    If there is an error creating the ec2 keypair, but we have created
    a user, we will lose track of the user id and be unable to delete
    
    Change-Id: Ib8704f1054dd16003849700c659d0fea83c13916
    Closes-Bug: #1262177

commit e2540828f5ef4831157590e85f3c5e992ffef09c
Merge: b7f3c62 1735b6f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 18 14:51:35 2013 +0000

    Merge "Convert Instance to new Schema format"

commit aaa925837e2bc8fde560409ea4ea9e40381acdcd
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Dec 12 17:18:15 2013 +0000

    Add sanity check to ensure user_id can be trusted
    
    Due to bug #1239303 the wrong user could be used when obtaining a
    trust-scoped v2 token, so add a sanity check to ensure we can rely on
    the user_id, using the trustor_user_id (which we currently store but
    don't use) to ensure impersonation is working as expected.
    
    Change-Id: I0481a4d96c514d0d61676d27f615c735e89ad03e

commit 831b236778b4700fc57cd7d4b2212e88d23fcfc5
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 11 17:27:27 2013 +0000

    Correct create_trust_context docstring
    
    The docstring in heat_keystoneclient create_trust_context incorrectly
    references a test on deferred_auth_method which ended up happening in
    parser.Stack, so correct it to accurately reflect the code.
    
    Change-Id: I0d763b44a57e9b9e641e36c418445441702db07e

commit b7f3c62f653f3bd86171158a4ee8ddea6b629a1d
Author: Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com>
Date:   Thu Dec 12 15:43:47 2013 +0200

    Fix comparison with singletons
    
    Many plases in tests code use assertEqual(AA, None),
    the same with True and False and negatives of such comparisons.
    
    As comparison to singletons must use `is` operator, appropriate usage
    is assertIs, assertIsNot, assertIsNone, assertIsNotNone
    
    These assertions are provided by the `testtools` package,
    so this change is not breaking backward compatibility with Python 2.6
    
    This first patch inlcudes roughly half of the files touched by these changes
    (up to and including test_n* sans `contrib` code) to ease the review.
    
    Partial-Bug: #1259023
    
    Change-Id: If6779c9230cf73ab93165a00040d1ca32d087c80

commit 6929d020eb542995c187f9fecd206c1aeb95d235
Author: Bartosz Górski <bartosz.gorski@ntti3.com>
Date:   Tue Nov 26 12:35:25 2013 -0800

    Add an external gateway property to neutron router
    
    Deprecates existing RouterGateway resource and adds external_gateway property
    to neutron Router resource to set up the gateway.
    
    Change-Id: Ic61a817e699d2a005c4eb2c5d7b23ae9a70567c0
    Closes-Bug: #1246064

commit 494f3eaaaf81567b882ecbf3eff5233b21df4524
Merge: c348c84 3fc0eab
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 18 07:54:08 2013 +0000

    Merge "Add support for rebuild --preserve-ephemeral."

commit c348c84950e6f81de0a4f4033a49b054b0adae18
Merge: 2780233 db64206
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 18 07:19:07 2013 +0000

    Merge "Don't pass swift headers as None"

commit 27802330c7b41db07f547f7823a121b803225e1e
Merge: 2eb4f34 c6bc01e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 17 23:08:21 2013 +0000

    Merge "Prevent tempest from failing upon ActionInProgress"

commit 69029e72548fb100d62142c8dc5dd2ab5172b2cd
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:30:05 2013 -0500

    rackspace: Convert resources to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: I2aa4c86b6b7d8931e6526fdb9a56b4b982045270

commit c6bc01e658dd898c1a39f04d032e9c44f258b7e6
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Mon Dec 16 16:32:01 2013 -0600

    Prevent tempest from failing upon ActionInProgress
    
    Jenkins occasionally fails in the 'check-tempest-dsvm-postgres-full'
    test.  The tempest tests sometimes try to delete the same stack twice
    and an ActionInProgress exception is raised.  This results in ERROR
    messages in the log file, which causes the tempest test to fail.
    
    The fix is to decorate the StackLock.acquire method with
    client_exceptions, which "allows the declaration of expected exceptions
    that the RPC layer should not consider fatal, and not log as if they
    were generated in a real error scenario."
    
    Closes-Bug: #1261433
    Change-Id: I0692b9d5cf03501ba532b40abf4e567134cda057

commit 14fce9f6e8bf841cc9acb7ecd299760d9ac6bf1c
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Wed Dec 11 18:22:18 2013 -0600

    Add nested resource references to resource group
    
    Originally, there was no way to get references to the
    resources inside the resource group. This prevented
    things like attaching volumes to instances in the group.
    This patch allows both aggregated as well as indexed
    access to ref id's of the nested resources.
    
    Closes-Bug: #1259830
    Change-Id: Id13eb6edd91bfc34d8bab05f429e761fe89ed799

commit 2eb4f34cbc2ec8b88c08e02561c259e43a1065d3
Merge: 4d9c94d 54f3f1d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 17 14:12:31 2013 +0000

    Merge "Add OS::Neutron::RouterL3Agent for router.py"

commit 4d9c94db6fe1b8d5ecd6e23f03224800960ca0d0
Merge: d4fc46c 005b64a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 17 08:06:57 2013 +0000

    Merge "WaitCondition Count property is now updatable"

commit d4fc46ce4e8eb4d00aec0ff30ccf13eb55db065f
Merge: 3610203 db62730
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 17 07:14:04 2013 +0000

    Merge "Convert OSDBInstance to new Schema format"

commit 3fc0eab56e7932da822c3ce32c3529cc3db33509
Author: Robert Collins <rbtcollins@hp.com>
Date:   Tue Dec 17 15:05:39 2013 +1300

    Add support for rebuild --preserve-ephemeral.
    
    This new extension going into Nova permits preserving the ephemeral
    partition during a rebuild, getting enough functionality to preserve
    state - e.g. on baremetal instances - without Cinder.
    
    DocImpact
    Change-Id: Ibc4c24bb2efb82c11699231ae76e2755a753a706

commit db64206035ac486342354825374d78be0bab5ff7
Author: Chmouel Boudjnah <chmouel@enovance.com>
Date:   Sun Dec 15 18:05:03 2013 +0100

    Don't pass swift headers as None
    
    If we set an header as None for a container swiftclient would just pass
    it to httplib which convert it to string and set the None string into
    it. This could not be changed in swiftclient to keep backward
    compatibility lords happy so make sure that heat doesn't do that.
    
    Closes-Bug: 1259571
    Change-Id: Ida1d2cec87e44264f9a7d69a1e220b544b33b63c

commit 062fd9c431778dc62ace61f9da7150c44df971c6
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:30:01 2013 -0500

    Convert AWS network resources to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: I96f2b5b5c3529280ff420328115d7e1ec2592a0a

commit a5d55c73a47baf2f63937ffeff238ff34da3bd44
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 16 13:59:20 2013 -0500

    Use property name constants in CinderVolume
    
    blueprint property-schema-conversion
    
    Change-Id: I38719a21ec89bbc8b74f57184a83a92c1cfb7dda

commit f6efb828d51173b02ecf0cffa17a27c9329d0c21
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:29:59 2013 -0500

    Convert [Cinder]VolumeAttachment to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: I93eeab88683d380c6dfe3433918792e328e71dd2

commit 63b7f1440343a05761b7a99420db928867cd34a8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 16 13:04:52 2013 -0500

    Add a schema for the AWS::EC2::Instance Volumes property
    
    Change-Id: I1d2e6854d0fe81d5d0b9272f65502d71a39ad511

commit 1735b6f11da1ad9b10cc34c17a22c893712e5cea
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:29:58 2013 -0500

    Convert Instance to new Schema format
    
    Also, the HA Restarter.
    
    blueprint property-schema-conversion
    
    Change-Id: I64d7a963cc96d82538b9fc8a2965c9a11a3a7a83

commit 60f6adf013c2fb41acd1e92c5b1994b743accff5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:30:06 2013 -0500

    rackspace: Convert CloudLoadBalancer to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: I1b322041dc3c746cc67a38da2b1395ce6bd59f98

commit a87fee9fde28e835dd0e642fce17109accfa2e19
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:30:05 2013 -0500

    rackspace: Convert Scaling resources to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: I292b638e31cc4de9690d8680824a20662a902bcd

commit 9bb03efbaa0a0e898f92ecb7c7f570ae095f63fe
Author: Pablo Andres Fuente <pablo.a.fuente@intel.com>
Date:   Mon Dec 16 15:40:31 2013 -0300

    EventService exception handling to not log errors
    
    In order to not log a StackNotFound exception as an error, the
    identify_stack() method is now decorated with the
    heat.openstack.common.rpc.client_exceptions wrapper.
    
    Change-Id: I51adcfe4d86d312c9887e51e6c113f99e0f1b783
    Closes-Bug: #1231135

commit 005b64ae30838a4a75078a5f52704690ce3077ef
Author: Pablo Andres Fuente <pablo.a.fuente@intel.com>
Date:   Tue Dec 10 16:41:12 2013 -0300

    WaitCondition Count property is now updatable
    
    The Count property of WaitCondition resource was modified to be
    updatable.
    Now, when that property is updated, the WaitCondition and the associated
    WaitConditionHandle are no longer being regenerated.
    
    Change-Id: If234b7a1400ff1b2c17fc24c436d8f64f4b1fd88
    Closes-Bug: #1228362

commit 95acc9b54175ba55a003a7296b20bcd3e81b9870
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 16 11:14:47 2013 -0500

    Use property name constants in Ceilometer alarm
    
    blueprint property-schema-conversion
    
    Change-Id: Id0b3877e18cff7c37da1ded3802480c6f5355d7d

commit 3610203dacde1dfd4e82cad31fa4b880244874aa
Merge: 1379500 3eda05a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 16 15:19:50 2013 +0000

    Merge "Add oslo mock fixture"

commit f204ad21ec78f01f402b168a0abb78b2254fc313
Author: Thomas Herve <thomas.herve@enovance.com>
Date:   Mon Dec 16 16:05:44 2013 +0100

    Remove useless validate methods
    
    Remove the validate methods of s3 and swift resources, as they don't
    provide any value and hide validation of properties.
    
    Change-Id: I5b9f7aef828d5e4d7cdebfd2bd550feaae545c90
    Closes-Bug: #1260643

commit 13795004d228810c2ec4d8e28f9a7fdc308f5ad5
Merge: 21ea2bf a043dbc
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Dec 16 12:00:21 2013 +0000

    Merge "Imported Translations from Transifex"

commit 21ea2bfa17b8ba76dd51334c3715b84ab58e32af
Merge: 562cdea 15e2fed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 16 11:06:33 2013 +0000

    Merge "Improve autoscaling error message"

commit 562cdea32880ec4cdb7980a84a9fc9ffc6315678
Merge: 02dfcf9 444bc43
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 16 09:53:22 2013 +0000

    Merge "Fix stack_get_by_name does not list nested stack issue"

commit 02dfcf949b240b46d12f5b64982433bead454528
Merge: da94b07 37919c6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 16 09:50:39 2013 +0000

    Merge "oslo: add the crypto module"

commit da94b075da2b1490aa7ef2721bb81028fee60b32
Merge: 9913d5b cb0a2a0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 16 09:49:16 2013 +0000

    Merge "Enables db2 server disconnects to be handled pessimistically"

commit 9913d5be69580b1e80b494257c7b38e8e0e8f482
Merge: 0ceb85d 20fc94a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 16 09:46:03 2013 +0000

    Merge "Convert [Cinder]Volume to new Schema format"

commit f67cd2182823e4f4173aabd9c67e5ba3b0a20d92
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Dec 16 19:59:18 2013 +1100

    Add support for multiple encryption methods
    
    We use only one encrypt() method but it returns the method to decrypt
    the data. This way we can change the encryption mechanism but
    always have a way to know how to decrypt whatever is stored.
    
    Change-Id: I2315a33105a8766f69d02f0617af39a9dae19ddf
    Partial-bug: #1251647

commit a043dbc3ec7cf15f353a6ffe2b03a4a6a5c63096
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Dec 16 06:06:20 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I3e551f9c9eb4f5b81f58f5503218665f2b80b0d1

commit 37919c6b955e9f9b87d4dc76056efce858c63b1d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Dec 3 21:24:36 2013 +1100

    oslo: add the crypto module
    
    This is to be used instead of the hand rolled heat/common/crypt.py.
    
    Partial-bug: #1251647
    Change-Id: I622b9d0c942075f99fdbaff470906123c631504a

commit 0ceb85dda3a2b36589c23372865e1be9e9fa814c
Merge: 0835712 65d2e8a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 16 02:53:33 2013 +0000

    Merge "Remove unused dumps validation in JsonParam value"

commit 083571254350c336a64cbd050d886492ece8c025
Merge: 474e6e3 0583740
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 16 02:06:38 2013 +0000

    Merge "Allow docker plugin to run w/o deps"

commit 474e6e3b97500a433bf20059b5b6a636386d2f5a
Merge: eb15010 6fd9222
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 16 01:11:04 2013 +0000

    Merge "Utilize stack-lock for multi-engine support"

commit eb15010e49f579ac30dbca2e54acdb3a6c008b00
Merge: 7fd500a 0bccbf3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 16 01:07:10 2013 +0000

    Merge "Update tox.ini to use new features"

commit 15e2fed46a25663d779849480321caba4d67eece
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Dec 16 11:41:46 2013 +1100

    Improve autoscaling error message
    
    If we can't find the autoscaling group name produce a more
    meaningful error message.
    
    Change-Id: Id7ecae67c9ca8eca0c45b365e9a58caee212c2c9
    Closes-bug: #1260111

commit 7fd500a5fbb4bcff48a925d06c5e27653201f694
Merge: 4ef6565 02bd04c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 16 00:21:03 2013 +0000

    Merge "Add support for network name for os::nova::Server"

commit 4ef656501ff068d8f0201c7eca06109e00160ccf
Merge: 55a41bd b2c93a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 15 23:38:51 2013 +0000

    Merge "Convert Swift resources to new Schema format"

commit 55a41bd98c2e411d5d8017daadc9a314a680fffd
Merge: 23c9489 314f731
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 15 23:28:12 2013 +0000

    Merge "Convert resources to new Schema format"

commit 23c9489b12002e0671cbf485f65ceea26eeb100e
Merge: f0a104b 4099fbb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 15 23:28:04 2013 +0000

    Merge "Convert User resources to new Schema format"

commit f0a104b71b959cce54ebbfe78f86b87693d9f6a4
Merge: fb6ad0a 2543c63
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 15 23:26:20 2013 +0000

    Merge "Use ScaledResource as type for InstanceGroup members"

commit fb6ad0aa23e630bed253f7e23479f196d327baac
Merge: 530132d 885bb4c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 15 23:26:13 2013 +0000

    Merge "Convert Ceilometer Alarms to new Schema format"

commit 530132d9afb3ea82dfbca3f721487f2505f61e94
Merge: 1c983b1 560720f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 15 23:16:37 2013 +0000

    Merge "tests: Don't access properties_schema directly"

commit 1c983b1882531b351b4df83919f3e1fe9df121e3
Merge: 9f2378f e889b86
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 14 07:58:46 2013 +0000

    Merge "Don't replace (and log) the same resource entry"

commit 9f2378fc02871af899e4f959e21416313f8ef1be
Merge: 5bc9038 ba57220
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 14 02:32:00 2013 +0000

    Merge "Implement engine listener service for multi-engine support"

commit 5bc9038a684a2f605a0bf63940b72824ae0f5006
Merge: 81e07c9 c1fae45
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 13 23:18:10 2013 +0000

    Merge "Make the mountpoint property description clearer"

commit 0ae13c27907e5105a6f3b841b4897fe2ca9cb1fb
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Thu Dec 12 15:07:31 2013 -0600

    Convert numeric values in instance metadata to strings
    
    Prior to this patch, if the following was in a template as a
    "OS::Nova::Server" resource property, the user would see a "BadRequest"
    error from the remote API:
    
    metadata:
      a: 1
    
    Fix this issue by converting the value of each metadata entry to a
    string before passing the metadata to the novaclient create call.
    
    Closes-Bug: #1260476
    Change-Id: I89d60620a3b852a7fcdd2f41135b1f12fbd428d8

commit 3eda05a9b0b69803a0269f2aa344d14e5823bf6d
Author: Swann Croiset <swann.croiset@bull.net>
Date:   Tue Dec 10 21:50:59 2013 +0100

    Add oslo mock fixture
    
    Change-Id: I8f75a7c112cf8232197f901c9b1b025a30c9ba71

commit 81e07c98426e61615317db3b55a9b93a2b1a7594
Merge: de7c5d5 496264e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 13 14:11:24 2013 +0000

    Merge "Convert Autoscaling resources to new Schema format"

commit de7c5d5de27cea9ee9c11be6bb169e858714e32d
Merge: def11d1 a6fe57d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 13 12:40:37 2013 +0000

    Merge "heat-manage man page not generated in doc build"

commit def11d1d4d68f8779b95849d33a1897b65315fda
Merge: ceee443 6c7173e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 13 12:37:59 2013 +0000

    Merge "Change assertTrue(A in B) to assertIn(A, B)"

commit ceee443ad233e960ad7b8a0285af5d537f8ae008
Merge: fbdec8a a3a4d31
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 13 11:45:53 2013 +0000

    Merge "pep8 fix: assertEquals -> assertEqual"

commit aa51f82c9d05ff581cd35cb476c7900a74a839b8
Author: Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com>
Date:   Fri Dec 13 13:07:41 2013 +0200

    Fix misused assertTrue in unit tests
    
    one additional case of misuse of assertTrue was found
    
    Change-Id: If62f5800566921433fc098dbba0188f69fbb6eb1
    Closes-Bug: #1226374

commit fbdec8a7eb68acc3c6a73a1bf85bbe882716ba50
Merge: caa765d acdb8b4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 13 08:58:13 2013 +0000

    Merge "Add validation for an existence of a resource type"

commit 444bc4363a6d056b6e81935d7f58ddd743c37668
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Wed Dec 11 15:01:16 2013 +0800

    Fix stack_get_by_name does not list nested stack issue
    
    The nested stack's owner_id is not None. When querying a result
    filtered with owner_id=None, then nested stacks will not be
    listed. The fix is to filter stack_get_by_name by stack name only and
    add a new API stack_get_by_name_and_owner_id to filter via stack name
    and owner id.
    
    Change-Id: I659104f4936b567222108c211f77473ef35638c6
    Closes-Bug: #1240892

commit a3a4d31d2e7dd758577b22a8c61e9a4c75402120
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Dec 12 14:39:22 2013 -0500

    pep8 fix: assertEquals -> assertEqual
    
    Change is necessary due to update to hacking 0.8.0, which is in
    alignment with project standards.
    
    Change-Id: I012958e63d9e0efaf36ee57fe9102e835ef8533c
    Closes-bug: #1218190

commit 6c7173ebd4e78f809f8788c0aad0cc359ae0e731
Author: Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com>
Date:   Thu Dec 12 12:07:11 2013 +0200

    Change assertTrue(A in B) to assertIn(A, B)
    
    The code in tests was using assertTrue(A in B) and similar
    instead of assertIn / assertNotIn.
    
    assertIn / assertNotIn assertions are provided by `testtools` package,
    so this change is not breaking backward compatibility with Python 2.6.
    
    Closes-Bug: #1259295
    
    Change-Id: Ibf3b0c7f27895699db8a13bf6e1640d196f1a953

commit 249387d37e19c438dcb51707fd5573bd770503ff
Author: Tim Schnell <tim.schnell@rackspace.com>
Date:   Wed Dec 11 22:56:51 2013 +0000

    Adds parameter_groups to HOT specification.
    
    The ability to group and order parameters in the template is
    currently missing. This patch allows for a new section of the
    template, parameter_groups, to be added by the template author
    to explicitly define the expected behavior.
    
    Change-Id: I6d8dc4e6490fbfe9cc45f6ca9cb1ac2826e13273
    Implements: blueprint parameter-grouping-ordering

commit caa765d033238669a3ed1e2bb3fae22298075383
Merge: 582cf8f 759ee38
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 12 19:52:40 2013 +0000

    Merge "Deny API requests where context doesn't match path"

commit db6273096e93f74b28f6d3b0db1e409dea10a2c0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:30:05 2013 -0500

    Convert OSDBInstance to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: Ieec1c81e4a4675fa49d953c948ef9a9f111177a3

commit 314f7318c399608fbe4dd94edc5576dbdd62969e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:30:01 2013 -0500

    Convert resources to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: I06df691f452c9abf6d846aa32a3e2a409aebc27d

commit b2c93a2f83aed52846e1d6373b9bc8e58929ee0c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:30:01 2013 -0500

    Convert Swift resources to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: I22346f2dd38477b3ef5dfb484c5912fe7ae3927b

commit 4099fbbba4e129836fe0ae41a63e94ac09043c47
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:30:00 2013 -0500

    Convert User resources to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: I1244d14db2aad93373bfa4a1749cda46fa14980e

commit 496264eba20f5817a955d34f1d7e9e60b93a0732
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:29:59 2013 -0500

    Convert Autoscaling resources to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: I3caadb7f47816a642bbd0841cc2ba4b2fb33b403

commit 885bb4c4ba477f444b5eb28c7cb468a62a099544
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:30:00 2013 -0500

    Convert Ceilometer Alarms to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: Ic44465a1de114ad8165c9d3474f409eb0cc129ad

commit 560720f0c8e52d8a60cd8b8a657097f59442a562
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:29:59 2013 -0500

    tests: Don't access properties_schema directly
    
    Don't rely on the properties_schema containing a dictionary in a particular
    format, convert it to Schema objects and use the API. Needed for the
    blueprint property-schema-conversion.
    
    Change-Id: I1a0cd93f62bd662752cb27a294248a14446492a9

commit 20fc94a93a4e3e6839ee8465ee2dcf0d60a6be06
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 12 10:29:59 2013 -0500

    Convert [Cinder]Volume to new Schema format
    
    blueprint property-schema-conversion
    
    Change-Id: Ia7d9e995cf78cc3425cf278d19700451a3347a26

commit cb0a2a059132721e8483e1090766611009deafad
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Thu Dec 12 15:23:46 2013 +0800

    Enables db2 server disconnects to be handled pessimistically
    
    A checkout listener can be added to sqlalchemy to be able to handle
    database disconnect pessimistically and avoid an error in the event of
    a DB restart or simply a temp connection issue due to network
    glitches. At the moment only mysql is enabled with this feature. This
    patch enables db2 as well.
    
    Sync oslo db.sqlalchemy from commit：
    bb4d7a2534f6087d828e22784dc263522d309592
    
    Partial-Bug: #1231657
    
    Change-Id: Ib89de07f004975528baffdfd19aae689b089a324

commit 54f3f1d60af880dfd6f4ad8d6ade73566405bc02
Author: Ryo Miki <miki.ryo@po.ntts.co.jp>
Date:   Tue Dec 10 17:41:57 2013 +0900

    Add OS::Neutron::RouterL3Agent for router.py
    
    This resource supports part of "agent management and scheduler
    extensions" in Neutron. It associates router with l3-agent.
    
    see related-bug: #1245366
    
    Closes-bug: #1259845
    Change-Id: I781645e62beb4fe60e064d61ad298834e551142d

commit 582cf8f047b1eb4e314689414726924ea87aa0ae
Merge: 04ee9d4 cfd967d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 12 02:06:57 2013 +0000

    Merge "Fix missing policy enforcement in CFN API"

commit 759ee38c53a5e469b8333856e60a0827175457e7
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 2 23:59:19 2013 +0000

    Deny API requests where context doesn't match path
    
    We shouldn't overwrite the context tenant_id (which comes from the
    scope of the auth_token) with that from the path, instead raise a
    HTTPForbidden exception if the path-provided tenant_id doesn't match
    the context.
    
    Change-Id: Ib6fb9881103312f7492081a20178f12309f35d81
    Closes-Bug: #1256983

commit 04ee9d4d97f34bd75e535b1c6b0a3f25980e3a46
Merge: b978b2e edff59d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 11 20:48:49 2013 +0000

    Merge "Sync oslo threadgroup.py to fix wait & stop methods"

commit b978b2e6e5144a22709ae93b57a0d0fbfe56a2ab
Merge: 8e4bf7c 5702051
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 11 20:09:35 2013 +0000

    Merge "Remove unused variable badkeys"

commit 8e4bf7c296d22f7d45f47ac48fe20f895861122c
Merge: dc21dc1 1179a8e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 11 19:55:03 2013 +0000

    Merge "oslo: update the remainder of the modules"

commit acdb8b41a3d452d79d63601af92bdabe87252c5f
Author: sslypushenko <sslypushenko@mirantis.com>
Date:   Wed Dec 4 18:42:36 2013 +0200

    Add validation for an existence of a resource type
    
    Validation of resource type existence was missing.
    The patch adds validation checks that in the template the resource
    type is set and is not an empty string.
    
    Change-Id: I171644010ec868e8acc4c29556889256e8bf51b6
    Closes-Bug: #1257243

commit cfd967db3ab9806b2c8c551c5b174bd669d44a71
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Nov 28 16:55:50 2013 +0000

    Fix missing policy enforcement in CFN API
    
    Currently the CreateStack and UpdateStack actions aren't correctly
    enforcing the policy, so add calls to _enforce which fixes that,
    and rework the test to illustrate the issue.
    
    Change-Id: Ia5c2e65512ab9d1c163171f8617c081ab96745e5
    Closes-Bug: #1256049

commit 02bd04c6ad479f7e916212f358ca47c05e685b98
Author: sslypushenko <sslypushenko@mirantis.com>
Date:   Tue Dec 3 19:44:52 2013 +0200

    Add support for network name for os::nova::Server
    
    Property 'network' is added to networks schema of the resource
    os::nova::Server. It takes uuid or name. The 'uuid' property is deprecated.
    
    Change-Id: I790bd23301ecfb7b8aa22f6c42b9e6c01cd0b186
    Closes-Bug: #1247019

commit dc21dc16eda06490d615544cb1cb769f04c8ace3
Merge: 07c3c3a d7ae961
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 11 08:48:18 2013 +0000

    Merge "Implement stack-locking for multi-engine support"

commit 07c3c3a406e78745674eca8a325b3fb59de9b5c1
Merge: 7005634 23fe65d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 11 08:48:10 2013 +0000

    Merge "Database changes for multi-engine support"

commit c1fae45fe729f065928b138b29c9caaa0be54ffa
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Dec 11 17:28:40 2013 +1100

    Make the mountpoint property description clearer
    
    There is an issue where the mountpoint may not be honored
    so add this note to the property documentation so users can be
    aware of the issue.
    
    Change-Id: Iddab9b1f6e5fadddd00e651e92b8b9c922a59347
    Closes-bug: #1231705

commit e889b86dae680c1d30c04013173fe390e33e58d3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Dec 11 17:04:17 2013 +1100

    Don't replace (and log) the same resource entry
    
    Resources may be registered multiple times. This
    ensures that logs are only emitted the first time
    a resource is registered.
    
    Change-Id: Iedd12d55007ee24ea6ecbe4fe7152ff65ea665b0

commit 700563477ca11febb9aecc7b617dcc3e7a6e1706
Merge: cc5084d 28da5c3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 11 04:32:37 2013 +0000

    Merge "oslo: add the test module needed by test_migrations"

commit cc5084dcfddbd30c697c3d2efe031f756df76957
Merge: c94c063 c7e94de
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 11 03:43:15 2013 +0000

    Merge "Add load balancer PoolMember resource"

commit c94c0636fe4e0b53758696359b9f70c88908b42f
Merge: 72bcca2 5b61c4c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 11 02:50:41 2013 +0000

    Merge "Add OS::Neutron::NetDHCPAgent for neutron/net.py"

commit 57020512959933221985787a0c621ddb5b4495a3
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Mon Dec 9 15:38:11 2013 +0800

    Remove unused variable badkeys
    
    Since it's never used and consumed a set subtraction.
    
    Change-Id: Ic2231ad5e491527c7f746172d9a3e07a6623b823

commit 72bcca2de89b6ff4acae34f5efa38cd1c68c9439
Author: Morgan Fainberg <m@metacloud.com>
Date:   Tue Dec 10 14:05:38 2013 -0800

    Sync global requirements to pin sphinx to sphinx>=1.1.2,<1.2
    
    Sync the global requirements to pin sphinx.  This addresses an issue
    where Sphinx 1.2 is not building documents correctly and causing
    check/gate to fail.
    
    Change-Id: Id4a54ec708102e35602e87ee9773ca119ce5b4f6

commit 1179a8eda400f069ae69831ac920b5b30f14d079
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Dec 9 08:29:35 2013 +1100

    oslo: update the remainder of the modules
    
    Change-Id: I83796c1e1f2f69d2ce27e7180c4004a5f345f063

commit 28da5c3f06181ed6b2d47bb5d1813516d937bc14
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Dec 9 08:30:08 2013 +1100

    oslo: add the test module needed by test_migrations
    
    Change-Id: I99fbae289c29f03b1a8ef391e3c9bf1bf0f4556d

commit 6fd92223a9ebc693041616253b0b6b7d93516209
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Tue Nov 12 12:35:30 2013 -0600

    Utilize stack-lock for multi-engine support
    
    Utilize a distributed stack lock to avoid race conditions when multiple
    engines are deployed.
    
    Blueprint multiple-engines
    
    Change-Id: I2278c7922557b6234cd7ff162cea92af83e9fb8b

commit ba57220bb50d993882d540fdad777e6d505570cb
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Tue Dec 3 12:13:22 2013 -0600

    Implement engine listener service for multi-engine support
    
    The engine listener service provides a way for engines to confirm that
    other engines are still alive.  For example, during acquisition of a
    stack lock, if an existing stack lock is found the engine will attempt
    to communicate with the engine who owns that lock.  If the engine
    responds affirmatively, the lock will be considered active.
    
    Blueprint multiple-engines
    
    Change-Id: I6d8f1305953212408f19688a1e0af81c44e5e5b4

commit d7ae961fcae5e0e75bf232606a6878d2414dfeef
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Wed Oct 2 15:22:12 2013 -0500

    Implement stack-locking for multi-engine support
    
    Implements a distributed stack lock using the database to avoid race
    conditions when multiple engines are deployed.
    
    Blueprint multiple-engines
    
    Change-Id: If3c47dafcc5bc1b2188b7737205291bbab8bc231

commit a6fe57d71ae3976d9642e4a7a79fa1df3524698a
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Dec 10 14:56:35 2013 -0500

    heat-manage man page not generated in doc build
    
    Was missing entry in the build configuration file.
    
    Change-Id: I38a28a39936381303f87c676baa7075d5aa87440
    Closes-bug: #1259674

commit 0583740cd430ab2274456fe64c84d8190c12bacf
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Tue Dec 10 11:12:47 2013 -0600

    Allow docker plugin to run w/o deps
    
    The docker plugin tests would not run without the docker lib being
    installed even though the client was mocked in the tests. This
    patch adds conditional import of the client and registration of
    the plugin so that the contrib tests can be run in the gates
    without having to hack requirements or add more third party
    libs.
    
    Change-Id: Ia114f8ebc0cf0b72af8e6e5d2c3264fb7952d7f9
    Partial-Bug: #1251380

commit c8217a39a9904ae34c89d8809b5eadd240c924f8
Merge: df64619 6dcdb2e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 10 17:38:14 2013 +0000

    Merge "Sync oslo rpc"

commit df646197c2a2d290a507c2a848829730a85c8228
Merge: 4a7cc67 9c7cbfa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 10 17:38:06 2013 +0000

    Merge "Document Port properties"

commit edff59db51a9eb213932a4c2b622ae1e4d18805d
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Mon Dec 9 11:17:46 2013 -0600

    Sync oslo threadgroup.py to fix wait & stop methods
    
    Sync oslo threadgroup.py to 25ff65e955b7ef1091722224f7c71f14fc971354 so
    we include the fix for bug #1196525, which resolves a problem where the
    wait and stop methods would not actually wait for/stop all threads in
    the thread group.
    
    Change-Id: Ia49d7096180b2942cf49b1f0dacde3c5e933337c

commit 23fe65d71494b89059a54611b0c0fef05d181b94
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Thu Nov 14 11:21:43 2013 -0600

    Database changes for multi-engine support
    
    Add a stack_lock database table to use as a distributed stack lock to
    avoid race conditions when multiple engines are deployed.
    
    Blueprint multiple-engines
    
    Change-Id: I0b8e244a73295dca307cb09ea5da2ebe709134b1

commit 4a7cc671e0303311533715f2b78b9e55c7cefe03
Merge: 8e05ba0 e86d5f3
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Dec 10 11:10:49 2013 +0000

    Merge "Imported Translations from Transifex"

commit 8e05ba07f54ab20f506608b75d7f33a84057dde4
Merge: 66e1047 0034edf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 10 09:35:31 2013 +0000

    Merge "Replace try...except block with assertRaises"

commit 66e1047071ffcc2a23b1247f83be238b8d328716
Merge: 600c2ed 4c03395
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 10 09:35:23 2013 +0000

    Merge "Remove oslo uuidutils.generate_uuid from heat code"

commit 9c7cbfa92144ef9163a4a86e5e2467961989c0e8
Author: Thomas Herve <thomas.herve@enovance.com>
Date:   Fri Dec 6 12:09:58 2013 +0100

    Document Port properties
    
    Add description to the various properties of the OS::Neutron::Port
    resource.
    
    Closes-Bug: #1224176
    Change-Id: I910730996409073a1ceaa483d3ef2ce25aac3dc6

commit 600c2ed6a13b3dd7acdcfdf69fe4105d92d3d281
Merge: a2da560 1137035
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 10 06:58:35 2013 +0000

    Merge "Add attributes schema to OS::Neutron::FloatingIP"

commit e86d5f365e50bcde2ea8c9a3227c05be94078745
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Dec 10 06:06:36 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ic850cf5bc9e4a59ec6fa1c8d1c7a2e57152b174e

commit 5b61c4ca2d9adabb482442e737b0e7872226bce3
Author: Ryo Miki <miki.ryo@po.ntts.co.jp>
Date:   Wed Nov 27 02:12:12 2013 +0900

    Add OS::Neutron::NetDHCPAgent for neutron/net.py
    
    This resource supports part of "agent management and scheduler
    extensions" in Neutron.  It associates network with dhcp-agent.
    
    I think, it may be needed by administrators who want to decide agents to
    work. (e.g. to use HA functionality)
    
    Closes-bug: #1245366
    Change-Id: I3dc663c4c51824bd3e69c74ff1d9b50a8ce598c9

commit 65d2e8ae318ef5a5685267154b342ba83d38cea8
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Mon Dec 9 16:32:18 2013 +0800

    Remove unused dumps validation in JsonParam value
    
    If the passed parameter is not a valid Json object, a ValueError
    exception will be raised in JsonParam parse(). So no need this dumps
    validation in value().
    
    Change-Id: Ie450d3923a905b7de3dcbece351aec937ebe7a61

commit 4c03395feb1bcd5557dc7f2aada02ec948e5a9c7
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Sat Dec 7 21:30:16 2013 +0800

    Remove oslo uuidutils.generate_uuid from heat code
    
    `uuidutils.generate_uuid' is going to be removed from oslo, so we need
    to remove the call from heat code.
    
    Change-Id: Iba9f86d8b8ec5ebaf4e80e6b729e372816bd5723
    Partial-Bug: #1253497

commit a2da560ad5b622902848a2c5726703ce639ba355
Merge: 9891638 8efa264
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 9 23:11:24 2013 +0000

    Merge "Allow intrinsic functions to be called in any order"

commit 6dcdb2e41e780680398c23434d32e54c5f23c2f7
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 9 15:20:00 2013 +0000

    Sync oslo rpc
    
    Sync openstack/common/rpc to fbbb12ea5ff51df744d3de1f312bbcf75aea1670
    so we get the fixes required for bug 1257293
    
    Change-Id: Ib2f13d1af91e005c5ee74d462c3fb307f699e7ca
    Closes-Bug: #1257293

commit 0bccbf33790ac3c5ecfba61706be16f20776908e
Author: JordanP <jordan.pittier-ext@cloudwatt.com>
Date:   Mon Dec 9 13:53:45 2013 +0100

    Update tox.ini to use new features
    
    tox 1.6 allows us to skip the sdist step, which is slow. This does that.
    It also allows us to override the install line. In this case, it's
    important as it allows us to stop getting pre-release software we
    weren't asking for.
    
    Original patch by Monty Taylor, talked about here:
    http://lists.openstack.org/pipermail/openstack-dev/2013-September/015495.html
    
    Change-Id: I9fe8a6cff149b3b79d434dc955c77a358c43031d

commit 0034edfc56e18833dd6b4404a92f1eda7635dafa
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Mon Dec 9 18:30:52 2013 +0800

    Replace try...except block with assertRaises
    
    So the test logic looks tidy and clean.
    
    Change-Id: I8415fbe1d4c0ce59c5c9f173240fcd6eb15b0c63

commit c7e94deadd94c571d576d74b9305daea9ea40374
Author: Thomas Herve <thomas.herve@enovance.com>
Date:   Fri Dec 6 14:40:47 2013 +0100

    Add load balancer PoolMember resource
    
    This adds a new resource to manage the relationship between a load
    balancing pool and an address, allowing more options like setting the
    weight of the member.
    
    Change-Id: Ic8a55ff8b8b00c7a4e3184b3028d5bf0cdd5c916
    Implements: blueprint loadbalancer-pool-members

commit 98916388013d081503830bfbad039209d99c7980
Merge: 8be2594 d0da08c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 9 07:58:17 2013 +0000

    Merge "Change ID column of Event table to UUID"

commit 8be25940dae54620c05146ed9a563f933050c69c
Merge: 9db8db6 e0e71a4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 9 05:41:40 2013 +0000

    Merge "Instance call build_userdata directly"

commit 9db8db6a379eb6a74346a54c29abbb413071f03c
Merge: 0366c7e 0c5b970
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 9 05:41:33 2013 +0000

    Merge "Make build_userdata user_data_format aware"

commit 0366c7e4ee31e60a600f3330fa5bc22389e7eb1b
Merge: 0ede444 84f1afe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 9 03:50:49 2013 +0000

    Merge "Account for truncated resource names in test PhysName"

commit 0ede44400a390a71db1b3383f50ba5cd969781d4
Merge: 3110364 cf6048f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 9 03:50:41 2013 +0000

    Merge "Fix regression in cloud server tests"

commit 8efa2649bce040de1f10ecfe4ba01899039a7837
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 2 14:47:23 2013 +1300

    Allow intrinsic functions to be called in any order
    
    An optional transform function can be passed into the resolve
    functions, which allows transforms to occur on the child snippets.
    
    Change-Id: I5d9e061c6a55f3939c5e03c780eaad72a001fccc
    Closes-Bug: #1256742

commit e0e71a41a2a6143b3d7e9d264b06c42ab371889e
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 29 12:20:31 2013 +1300

    Instance call build_userdata directly
    
    get_mime_string is only ever called once so caching the results
    in self.mime_string is not necessary.
    
    Change-Id: I36a1eb358b1228a946c5f8fa6e76869f10c398fd

commit 0c5b970ea460a65c243dd1d432f4d81e4f1826ce
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 29 12:02:09 2013 +1300

    Make build_userdata user_data_format aware
    
    Over time different user_data_format values could assemble
    different combinations of cloud-init parts.
    
    As the default will remain user_data_format='HEAT_CFNTOOLS',
    identical content will be generated for the Instance resource.
    
    The Server resource now passes user_data_format, and no longer
    has a get_mime_string method since build_userdata is only ever
    called once so cached get_mime_string results is not needed.
    Change-Id: I7cfbcffeea24c9b1f013463f9a5fa53b8c699cfe

commit 3110364647bb5c77818dcc00ba50902d31f2cb15
Merge: 29cddb9 0711fe9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 7 10:22:37 2013 +0000

    Merge "Fix stack-show on a TemplateResource with outputs"

commit 29cddb90362edd1504ede73e446343db79318bd1
Merge: 0ce6c38 ef818e2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 7 10:11:57 2013 +0000

    Merge "Clean up useless ex variable"

commit 0ce6c38e00d2114d34f94db4efc18640e7168579
Merge: b3d0569 7636d8f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 21:32:10 2013 +0000

    Merge "Set the rpc control_exchange "again""

commit b3d0569a56b5bdea07b5d8f9faaf22284c721698
Merge: 2c1786e e2e711f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 21:32:01 2013 +0000

    Merge "oslo: update the rpc module"

commit 84f1afebcbb630d5b42c794fd4d8e795affc3fb5
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Wed Dec 4 17:28:10 2013 -0600

    Account for truncated resource names in test PhysName
    
    The utility class PhysName was blindly comparing resource
    name without considering that the resource name may
    have also been truncated.
    
    Closes-Bug: #1251379
    
    Change-Id: I189f79ee5238b7c82eff1595ef612efb1f8633d4

commit cf6048fd2db5862eda6fdaf74e4d5363f8f80f19
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Wed Dec 4 16:37:39 2013 -0600

    Fix regression in cloud server tests
    
    Commit 116bd3cb13d76f61fe779b55d5591da671ae471b broke the cloud server contrib
    tests because they mocked the default Clients calls instead of the resource's
    nova function. This patch adds the correct mocks to the cloud servers tests.
    
    Closes-Bug: #1257947
    
    Change-Id: I904eb9f7e6424603d42b0d59c44e4da16726368c

commit 2c1786e2c8baa2c2d9a5a87b5b59ec8732a67dab
Merge: 8644d61 e28fcd1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 14:24:25 2013 +0000

    Merge "Add REST endpoint for abandon-stack"

commit 8644d6192a95c6c743a3dc9e6f26ad49a5f8a3dd
Merge: 356dff8 d5135f6
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Dec 6 14:24:21 2013 +0000

    Merge "Imported Translations from Transifex"

commit 356dff87abedf5814a78239e420782bf3e12fcc7
Merge: 06a6bff 4ac0c8f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 13:24:33 2013 +0000

    Merge "oslo: update config generator"

commit 06a6bff200fe5043a60db28ef785bb289a18474b
Merge: 420faf2 782755e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 13:24:30 2013 +0000

    Merge "Use the new oslo py3kcompat.urlutils"

commit 420faf2de824dd6a2c5b4b8a0dd4174782c0fa2b
Merge: fa8a6a7 70e321e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 13:24:27 2013 +0000

    Merge "oslo: add py3compat"

commit fa8a6a772c219f8ebcb437d7accb3dbf44cb0c81
Merge: f41780f 84cca0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 13:24:19 2013 +0000

    Merge "oslo: delete rpc/securemessage.py"

commit f41780fe57624685fb3365ccf5c1a7a7ac7af0a6
Merge: 46144e1 92d3aa5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 12:49:25 2013 +0000

    Merge "Property methods for resource metadata"

commit 46144e1c86bfef9481778d5c98aff2264b0fd071
Merge: 75eab02 44d6cbe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 12:49:12 2013 +0000

    Merge "Bump to sqlalchemy-migrate 0.8.2"

commit 75eab02ee204df79b85f075d968e3affe475fcc2
Merge: 48cd936 857e483
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 12:49:09 2013 +0000

    Merge "tests: use server.test not example.com"

commit ef818e265d362d43368dac3f164a377ad4baaed3
Author: Jay Lau <liugya@cn.ibm.com>
Date:   Fri Dec 6 18:00:29 2013 +0800

    Clean up useless ex variable
    
    When handle exception, if the exception was not used, then there is
    no need to use "except Exception as ex", just using "except ValueError"
    is good enough.
    
    Change-Id: I495e239cbca20246cb88da166a80bbd4eda1a094

commit 48cd9361f9702d95dec6fbece638fc3eaa02766e
Merge: b3c7d31 87f22bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 09:45:55 2013 +0000

    Merge "Properly reconnect subscribing clients when QPID broker restarts"

commit d5135f60afdfd6ff3ad1f8850f6656f1d7ee2f87
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Dec 6 06:05:03 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9e1b34d90a123013f9335c5b5dde3922d4e42456

commit b3c7d31f1019e708227ca81514ecd801840bf64d
Merge: fd23550 797ae98
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 02:36:20 2013 +0000

    Merge "contrib: Add Docker Container plugin"

commit 7636d8f1e1cb4bb368f75e6c411241c60a358190
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Dec 4 17:03:31 2013 +1100

    Set the rpc control_exchange "again"
    
    rpc_set_default() is never called, since all the config
    opts always registed just do this globally.
    
    Change-Id: I277318ec5e903074976ee39460d8583505a723a4
    Closes-bug: #1257595

commit e2e711fc1c6595a76a372eb16d6115a0789b4223
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Dec 4 10:10:22 2013 +1100

    oslo: update the rpc module
    
    - It now requires the versionutils module.
    - We need to deal with the "allow_rpc_exception_modules" not
      including heat.common.exception
    
    Change-Id: I1ea1479d7bc023649b2af0f68683e9a81f868df9

commit 4ac0c8f02f7269e1449fa8d558fc3abc85d8aeef
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Dec 3 15:24:38 2013 +1100

    oslo: update config generator
    
    Change-Id: I5a456fe8a898bc042e7580386b6602b75fa7e1c0

commit 782755e8a88faf0a4fef623c09830fefdc6dc5c4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Dec 4 13:46:51 2013 +1100

    Use the new oslo py3kcompat.urlutils
    
    Change-Id: I9e5d00a04460ef54d402b69f781d2a69a3bd0082

commit 70e321e60a86fb574cafe2b45c7d7b6f3fa98cca
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Dec 3 15:16:12 2013 +1100

    oslo: add py3compat
    
    This is automatically pulled in by the new oslo modules
    
    Change-Id: Idba617fbd6ca889a0322461bff4954cd90c9f32a

commit 84cca0efe2437b59f19f7815a711db9162301236
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Dec 4 09:47:20 2013 +1100

    oslo: delete rpc/securemessage.py
    
    It doesn't exist in oslo anymore.
    
    Change-Id: Iebadc7841e394232e2ecc26908b06dd1a099bb9d

commit fd23550b3b5adc059f731d7aa6e258dd747d8f78
Merge: 12fa115 7893cc7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 6 00:46:18 2013 +0000

    Merge "heat engine changes for abandon-stack"

commit 797ae98024aa24131f67f5e8150a501abb2bbb5e
Author: Sam Alba <sam.alba@gmail.com>
Date:   Thu Nov 14 18:02:14 2013 -0800

    contrib: Add Docker Container plugin
    
    This plugin enable using Docker containers as
    resources in a Heat template.
    
    Change-Id: Id9fd6c3491b246c88308713a7661be1ad0056eb5
    Implements: blueprint docker-plugin

commit 87f22bd887b73b9d6cb08b98db9d93d067afd137
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Dec 5 11:34:38 2013 -0700

    Properly reconnect subscribing clients when QPID broker restarts
    
    This is a cherrypick of oslo-incubator:
    e227c0ed7e0ed1f9b8d029336f8aeb60e38c23df
    
    From the oslo-incubator bug:
    When the QPID broker is restarted (or fails over), subscribed clients
    will attempt to re-establish their connections.  In the case of fanout
    subscriptions, this reconnection functionality is broken. For version
    1 topologies, the clients attempt to reconnect twice to the same
    exclusive address - which is illegal.  In the case of version 2
    topologies, the address parsing is broken and an illegal address is
    created on reconnect.  This fix avoids the problem by removing the
    special-case reconnect code that manages UUID addresses; it is
    unnecessary as the QPID broker will generate unique queue names
    automatically when the clients reconnect.
    
    Change-Id: I563db129e63817ad55165e318f164f06b141ee33
    Closes-Bug: 1251757

commit 12fa11591a86012592bbd3a2210134b1e1273a06
Merge: eb19892 edb7a6d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 5 14:09:43 2013 +0000

    Merge "Call cfn-create-aws-symlinks in boothook.sh"

commit eb19892329b47637500fb761c90c805f87beddad
Merge: 942ae95 8143c80
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 5 12:12:48 2013 +0000

    Merge "Add collection count to stack list"

commit 942ae95ed5d47dbad4a348065b0cb7c223e0b4bc
Merge: 07e4df8 d3e5ad4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 5 12:06:21 2013 +0000

    Merge "Add SupportStatus class for resources"

commit 07e4df817c61b41de75a8f96774078bd8df54cd6
Merge: 9cf8c32 ba2396b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 5 09:52:49 2013 +0000

    Merge "Fix error in Trove Instance schema definition"

commit 9cf8c320517f1ee7fe3dbb4c774a619c5eda365a
Merge: f0247c6 30835f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 5 00:28:50 2013 +0000

    Merge "Return map parsed value at JsonParam.value"

commit f0247c69e1b37de2989ce8dddedfcb3bb5264930
Merge: 969a7c3 cfc5483
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 4 23:20:20 2013 +0000

    Merge "Handle TemplateResouces with the wrong template extension"

commit 969a7c3366a1892968d1dba0cef9dfe2258ddb19
Merge: 04cfa05 c077589
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 4 23:13:15 2013 +0000

    Merge "Pass the files correctly though the update mechanism"

commit edb7a6dbe9b2845dea0c1699ed382d623e45e0db
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Dec 5 10:41:25 2013 +1300

    Call cfn-create-aws-symlinks in boothook.sh
    
    Images which have heat-cfntools installed from rpm or deb
    will not have cfn tool links in /opt/aws/bin.
    
    This change runs cfn-create-aws-symlinks during cloud-init
    boothook.sh. It should do the following:
    * if no cfn tools exist in /opt/aws/bin, symlinks from /usr/bin
      will be created
    * if cfn tools exist in /opt/aws/bin, no symlinks are created
    * if cfn-create-aws-symlinks doesn't exist, there will be no effect
    
    This is required to use a vanilla Fedora 20 cloud image with heat,
    which has heat-cfntools pre-installed.
    
    Change-Id: I5426fdad3031f91b4b9c1f9c9c19ac9cc42cf2dd

commit e28fcd1f25d4a8ad8ac04efe0c8ec11c5c8874ea
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Mon Nov 18 14:58:47 2013 -0600

    Add REST endpoint for abandon-stack
    
    Implements: blueprint abandon-stack
    Change-Id: Ie6151208a540d44a3235cb13b49ef02caa090090

commit 7893cc7b8d02dbaf9afcc2eecfa5c561e901323a
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Fri Nov 15 14:17:36 2013 -0600

    heat engine changes for abandon-stack
    
    abandon-stack operation is similar to delete-stack, but actual
    resources would not be deleted. Only stack and resource data
    would be deleted from heat database. And also abandon-stack
    operation would return the stack/resources data in json format.
    
    Implements: blueprint abandon-stack
    Change-Id: Ibb386255887d4de54e9a3dc95254a7151475cf3a

commit d0da08ce09ba704d3be42f9196f1d7517acb6177
Author: Pablo Andres Fuente <pablo.a.fuente@intel.com>
Date:   Tue Dec 3 10:39:27 2013 -0300

    Change ID column of Event table to UUID
    
    If you are using a public Heat you can use the event ID in
    'heat event-list' to measure how much activity the service provider
    has in their heat installation.
    
    To avoid this, the Id column of the Event table was changed from
    autoincremental integer to a uuid.
    
    Added some unit tests in order to ensure that events with integer or
    uuid id pass through the API, since we have a migration which will
    leave behind integer ids.
    
    Change-Id: Ib3eddb700738cb3667c72977a9a5011209acd6d7
    Closes-Bug: #1249159

commit 04cfa05f92b7417dde1421d39cd2012d6b85e0fa
Merge: fd7b32b 0228695
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 4 12:36:21 2013 +0000

    Merge "run_test.sh -V --unit doesn't run using virtualenv"

commit ba2396b46ecaff92665e88ca8e1d2b0f51c9452f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 4 12:39:16 2013 +0100

    Fix error in Trove Instance schema definition
    
    Change-Id: I79d0f0318a161b4666ea149ba0691bd6dfe877f2

commit 0711fe9237b374c4382c02e34d6be0999a67ecce
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Dec 3 22:17:00 2013 +1100

    Fix stack-show on a TemplateResource with outputs
    
    TemplateResource currently tries to re-download the template.
    this is not good, esp. if you have a relative path to a local file.
    First see if we have a new template, if not look in the db.
    
    Closes-bug: #1252980
    Change-Id: If819aab9ed1360744f8e73f0b6409641e2d8114f

commit cfc548396f3d0d999a112dafee011e89ac05d283
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Dec 4 08:39:00 2013 +1100

    Handle TemplateResouces with the wrong template extension
    
    Change-Id: Ifcd7a5728fcdb61146ad6461697756ea46e9ab96

commit c077589be0af4b33930ce6e0793575806daedeb1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Dec 4 22:19:19 2013 +1100

    Pass the files correctly though the update mechanism
    
    By "files", we mean the TemplateResource templates that get
    passed into stack create and update.
    
    The files are critical to the definition of TemplateResources
    so we need to have the correct version of them in each stage
    of the update.
    
    Within the update there are 3 stacks:
    - existing (stack been updated)
    - newstack (the goal state)
    - previous (a snapshot of the initial stack)
    
    To update TemplateResources we need the existing stack to have access
    to the new "files" but the previous stack must contain the old set (or empty).
    This way the TemplateResource can get access to the new template and find the
    difference to the previous template.
    
    Note: although there are no tests in this patch, a following fully uses
    and tests this functionality.
    
    Partial-bug: #1254966
    Change-Id: I803a385940759a4eb04df1eccce166be24ee333c

commit d3e5ad4aa9b36fdefbddcf41d9e9e2059a914e64
Author: Julia Varlamova <jvarlamova@mirantis.com>
Date:   Wed Nov 13 16:44:08 2013 +0400

    Add SupportStatus class for resources
    
    SupportStatus class has following attributes:
    - status (SUPPORTED, DEPRECATED, etc. All allowed support
    statuses are defined)
    - message (property for providing some information about status)
    - version (when resource came into specific support status)
    
    By default support status of each resource is SUPPORTED.
    
    Support status added to Resource class as a static attribute.
    
    Implements bp resource-support-status
    
    Change-Id: Ib3aacdb0f28b09ebeecfc3f13cf22587f8d57f03

commit fd7b32bcc7e1072b7c651ca826ec3f6a8a88a53b
Merge: 62c84e7 b295ad2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 4 09:38:56 2013 +0000

    Merge "Make db API respect context show_deleted"

commit 62c84e7580a2ef705f4b6191a33457bc67766fc1
Merge: fde8c4d 55a8f50
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 4 06:14:36 2013 +0000

    Merge "Openstack Trove (DBaaS) resource"

commit 857e4835cb71d0ac8465614e5d9bcb4c414d83b1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Dec 3 17:35:51 2013 +1100

    tests: use server.test not example.com
    
    Change-Id: I1eb2daaf26ea248ebeb2bb147a42902a8cf84755

commit fde8c4dc55d39faf06ae7e6bcb09cb18e23e6087
Merge: e1c2b62 116bd3c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 4 06:00:39 2013 +0000

    Merge "Migrate away from rackspace_resource"

commit 8143c80213ae53b87644b68b16303d582dacb227
Author: Anderson Mesquita <andersonvom@gmail.com>
Date:   Mon Nov 25 19:16:16 2013 -0500

    Add collection count to stack list
    
    Add an optional parameter ``with_count`` to the stack_list API to
    allow the inclusion of the collection count in the body of the response
    
    When passing the parameter, the response looks like:
    {
      'stacks': [...],
      'count': 42
    }
    
    blueprint: count-stacks
    Change-Id: I560cfff9d327db9b325e7cf4786bd2fcd71d47b2

commit e1c2b622fa50c33b033c1cdb7f5ab530c9ee4e88
Merge: beb1ed1 7f638af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 23:36:21 2013 +0000

    Merge "Restrict sort_keys for stack lists"

commit beb1ed1bc122091134b58122afb237718341e510
Merge: 070258b e8c0a7e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 23:32:41 2013 +0000

    Merge "Fix bad resource schema for Volume"

commit 92d3aa531ac71a60c7f061317d8adf2ce3116515
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 26 10:35:09 2013 +1300

    Property methods for resource metadata
    
    For OS::Nova::Server which will build its metadata dynamically
    based on currently available SoftwareDeployment resources.
    This change makes it possible to:
    * read and assign resource.metadata as before
    * subclassses to override resource.metadata for building dynamically
    * allowing access to the simple attribute based resource._metadata
      when necessary
    
    partial blueprint: hot-software-config
    Change-Id: Ifd7aa15dd58c96e6b9efafe6b4201a964e140d8d

commit 070258bb1001a9c7883c11120386109899040dd2
Merge: d0c7a5e f3d0899
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 21:58:04 2013 +0000

    Merge "Add API endpoint to query build information"

commit 55a8f50eb947205b5bc5d006798a4e5df638e4c5
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Fri Nov 29 13:44:28 2013 -0600

    Openstack Trove (DBaaS) resource
    
    Implementing Database as a Service (Trove) resource.
    
    Implements: blueprint dbaas-trove-resource
    
    Change-Id: I8a925ba586f4e29a5208797d97d0b5d9d05aa1e3

commit e8c0a7ed6b44b59e503fb209e1ff7432102da9e9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 29 21:50:30 2013 +0100

    Fix bad resource schema for Volume
    
    Change-Id: Id8faa530fc7cdd1f3fc287c033ed61aa87fd9807

commit 1137035136ff7c123a0e822581e376e8135ed8d6
Author: Thomas Herve <thomas.herve@enovance.com>
Date:   Tue Dec 3 14:26:31 2013 +0100

    Add attributes schema to OS::Neutron::FloatingIP
    
    FloatingIP now validates attributes against a schema instead of
    accepting all possible inputs and filtering on the result returned by
    neutron.
    
    Change-Id: I3bf1c3728a9d6faab71c2312f331d73b1460c013
    Closes-Bug: #1240893

commit 7f638afb06d2b85db26cdfd13c20436574dbbb3a
Author: Richard Lee <rblee88@gmail.com>
Date:   Tue Nov 19 16:30:22 2013 -0600

    Restrict sort_keys for stack lists
    
    We are only allowing users to sort stacks on a subset of columns that
    are known to be indexed.  Currently allowed sort columns are:
    
    created_at
    updated_at
    name
    status
    
    Change-Id: Ib4f955336edd7d86a1b6bf98e38378b0d495d0dd
    Closes-Bug: 1252116

commit d0c7a5e98e2e8aafd155e150ae1aefa43d014f41
Merge: 456347b 0d061ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 12:01:47 2013 +0000

    Merge "Add a .coveragerc to exclude tests and oslo"

commit 30835f56d6e51cab13399f92748062f6f383e584
Author: Mitsuru Kanabuchi <kanabuchi.mitsuru@po.ntts.co.jp>
Date:   Tue Dec 3 19:42:26 2013 +0900

    Return map parsed value at JsonParam.value
    
    Currently, JsonParam returns String value as JsonParam.value.
    However, SCHEMA_TYPES:MAP property doesn't support getting String value.
    JsonParam have to return map value for to work properly.
    
    Fixes bug #1256891
    
    Change-Id: I5acc1aa95c0c0e7bebc760d8bf088971630696ec

commit b295ad2f2397710e2b6d687e14e9fdd541319303
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 29 16:06:04 2013 +0000

    Make db API respect context show_deleted
    
    Currently the soft-delete aware stuff in the DB api only respects
    flags passed in directly, not the context.show_deleted, so align
    the code with what is implied by existing comments and respect
    the flag in the context too.
    
    Change-Id: I88cd1a8862a2a53c314849e11d026182180bce9b
    blueprint: request-scoping-policy

commit 456347b9b7070df6a4e39dbe2787d8dda44c8181
Merge: 7d4ba05 eae9a2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 08:00:01 2013 +0000

    Merge "Factor Schema out of properties.py for re-use"

commit 7d4ba056000eb05b24fc59c8cb3d071db723afd8
Merge: d5674b6 cb0603a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 07:30:27 2013 +0000

    Merge "Sync DB2 error code handling from oslo"

commit d5674b6007d022c72c2ea66cc3434aa5e0ac95c6
Merge: 5c6fd71 8aa2b48
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 05:20:41 2013 +0000

    Merge "Fix show_deleted errors in RequestContext"

commit 5c6fd716299457157a92e0eb9ad57eca85a580aa
Merge: be17f2f 16d6ace
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 05:20:33 2013 +0000

    Merge "Remove owner_is_tenant from RequestContext"

commit be17f2f74c6d0f4d0b8b9021401292c5a508f380
Merge: 52d84c4 9a17f8c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 05:20:25 2013 +0000

    Merge "Remove misleading docstrings in ContextMiddleware"

commit 52d84c46a20300215e226627912df842d42a7bc9
Merge: 5a5d1b4 3a1e783
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 05:20:17 2013 +0000

    Merge "Derive context is_admin from policy"

commit 5a5d1b4c5d5bfd8bb8385e563f73f20341aeb79a
Merge: d37a80f 26dfc1e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 03:47:45 2013 +0000

    Merge "Add heatclient to available clients"

commit 44d6cbe57a16a8a165923854937cbec4b062279a
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Dec 2 19:29:32 2013 -0500

    Bump to sqlalchemy-migrate 0.8.2
    
    This allows us to drop some unsightly sqlalchemy-migrate 0.7.3
    patching.
    
    The related requirements change is here:
    
      Icde6248ca102884323d7912bab0f4a716aa294ec
    
    Change-Id: I5f80dfc07f8256716d025002fc1a1f47e58b2142

commit d37a80f774f7ef3d2c4f0240e0824db9f31f132f
Merge: 0e6a20a 8937666
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 01:39:57 2013 +0000

    Merge "Provide access to Trove client"

commit 0e6a20a60ff63c07792d48e9a8afa447ad93cc4c
Merge: 0a56957 4769b74
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 3 01:39:49 2013 +0000

    Merge "Remove unused fake test code"

commit 26dfc1eddb88f0a6abccdf2a510bd4a5ba2c9c90
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Nov 20 14:30:15 2013 +1300

    Add heatclient to available clients
    
    The first resource to use this will need to ensure
    that this method has test coverage. There appears to be
    no convention for writing separate unit tests for these
    client methods.
    
    This will currently not work with standalone heat as
    the heat endpoint will not be in the keystone catalog, see
    related-bug: #1255713
    
    partial blueprint: hot-software-config
    Change-Id: I325664dcb0ca4d01be41614496c92e65bea52310

commit 0a5695700ca7cac729a493d9ad390e8571b7793c
Merge: f2292ba b5ee30a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 2 19:07:34 2013 +0000

    Merge "Fn::Replace support for type Number"

commit 89376661cb6ea84d3f6dadb8c75a566f00d9045e
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Mon Oct 14 16:45:15 2013 -0500

    Provide access to Trove client
    
    python-troveclient is required for implementing Database As A
    Service (DBaaS) resource. This patch makes Heat depend on
    python-troveclient and also changing clients.py and resource.py
    to provide access to troveclient.
    
    Implements: blueprint dbaas-trove-resource
    
    Change-Id: I010d4a11793cc634aa0af5f01b637fff4effbf61

commit f2292bad3feec17b6f78da0944296a8295acc571
Merge: 3f91ec7 e53349e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 2 15:48:59 2013 +0000

    Merge "Avoid eventlet-unsafe exception handling"

commit 3f91ec79097d50682e222617cd745739e212cf05
Merge: e726c53 a927e99
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 2 14:32:17 2013 +0000

    Merge "Remove external AWS links and add doc if needed."

commit 02286951bceee3adcd09e763e212d72c368a9a49
Author: Pablo Andres Fuente <pablo.a.fuente@intel.com>
Date:   Mon Dec 2 10:50:36 2013 -0300

    run_test.sh -V --unit doesn't run using virtualenv
    
    Before this change, when you called the script using the -V option, the tests
    were run outside the virtualenv that the script creates.
    To fix it, I modified the lines of the script that run the tests to run
    inside the virtualenv using the $wrapper variable.
    
    Change-Id: I5c202727e0b5214670d54e14c80a68cc8ebec400
    Closes-Bug: #1251730

commit eae9a2ad3f5d3dcbcbb10c88a55fd81f1fe2dd56
Author: Thomas Spatzier <thomas.spatzier@de.ibm.com>
Date:   Fri Nov 22 20:24:41 2013 +0100

    Factor Schema out of properties.py for re-use
    
    There is currently some function duplication in Heat for schema
    validation. There is properties.Schema and a ParamSchema class which
    do mostly the same, but each with their own code.
    It would be good to have a common implementation for property and
    parameter validation with only property or parameter specific code
    implemented in sub-classes.
    The current Schema class in properties.py cannot be used in
    parameters.py due to cyclic import dependencies that would arise.
    
    This patch factors the Schema class and Constraint classes into their
    own file which can then be imported by both properties.py and
    parameters.py. For property schema specific code, a class
    PropertySchema is introduced as derived from the common Schema class.
    
    The code of the Schema and Constraint classes is unchanged except for
    absolutely  refactoring work.
    
    In a subsequent patch, I plan to provide the code to base ParamSchema
    on the common Schema class.
    
    Change-Id: I833edd8fad316220f56d6727fe1e3409f8fda6ee
    Partial-Bug: #1230229

commit e726c533d741aa28145da1536f640ead028111c2
Merge: 378e3e0 a72e95d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 2 12:38:08 2013 +0000

    Merge "Remove property decorator in TemplateResource"

commit 378e3e0fa8d1483695dc8c83b9bc984532606d52
Merge: daddc05 a354c59
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 2 11:58:14 2013 +0000

    Merge "Make engine service docstrings conform to Sphinx"

commit cb0603a8aa07750375677fd5a8afcb197107a62f
Author: cbjchen@cn.ibm.com <cbjchen@cn.ibm.com>
Date:   Mon Nov 25 14:49:49 2013 +0800

    Sync DB2 error code handling from oslo
    
    Including DB2 error code -30081 in conn_err_codes, so that the
    connection retry code will not be skipped when DB2 connection
    error happens.
    
    SHA1 of Oslo commit - bdabd512943ebb84a1333b2b3ee31a33124af76e to
    which the db module code is syncd.
    
    Change-Id: Idec7a6d712f5ed08fc0daad0a64df203c624f194
    Closes-Bug: #1244092

commit 0d061edfec6d936c38a2c4e46c55b52ed66fa6ae
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Dec 2 21:35:39 2013 +1100

    Add a .coveragerc to exclude tests and oslo
    
    This is to try produce more relevant output.
    
    Change-Id: I08ebfacf19e4975e00ab79229cc18a3b57a1002a

commit 4769b7438333196aa907dcd414ea9cb025be89ec
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Dec 2 16:17:03 2013 +1100

    Remove unused fake test code
    
    This just confuses everyone.
    
    bug: #1195452
    Change-Id: I9d8524a7619663e5f0e5cce619a0587290ff1db7

commit daddc05c75db316ebe6275f5b33e73562a4d3292
Merge: fb1c205 b27a460
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 2 03:48:05 2013 +0000

    Merge "VersionNegotiation - 404 if no version is provided"

commit fb1c2050c9b6d3a924672bf7c236734211716e21
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Dec 2 09:22:39 2013 +1100

    Remove duplicate test scenario
    
    This is causing the gate to fail, maybe because of a new version
    of testr.
    
    Change-Id: Ice03d848118638f56f7df36ce08b3a68c371dd2c

commit a72e95d72d0cbac1c5ef83aa0b2a70273afe9335
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Nov 28 22:45:58 2013 +1100

    Remove property decorator in TemplateResource
    
    These methods can do quite a bit of work and treating
    them as properties seems a bit odd.
    
    Change-Id: I99cc3c9f74f59f9984daa3e128651926830e9d29

commit 116bd3cb13d76f61fe779b55d5591da671ae471b
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Tue Nov 5 14:42:00 2013 -0600

    Migrate away from rackspace_resource
    
    Having Rackspace specific resources subclass a the rackspace_resource
    does not replace the clients system wide. Use the cloud_backend to
    acomplish this. That way any special configuration done with pyrax
    will be used in any client call.
    Change-Id: Ia6d548e606a42c608135cb66876419d1b339a06c

commit 8aa2b48cdf40b377bf5bff92cec1f021eccb6eee
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 29 15:26:41 2013 +0000

    Fix show_deleted errors in RequestContext
    
    get_admin_context takes a read_deleted argument which is ignored,
    and we don't include the read_deleted value in to_dict output.
    Fixing this means we can respect this flag in the DB API, which
    currently we do not.
    
    Change-Id: Id0906983b93cd2526580942390f7992fb2cb5504
    blueprint: request-scoping-policy

commit 16d6aceb441d68ca5134cd9802d73f15f0ad14fc
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 29 15:13:22 2013 +0000

    Remove owner_is_tenant from RequestContext
    
    This appears to be a leftover from glance, and we don't support
    anything other than tenant-scoped requests.
    
    Change-Id: Ibce0e38ee24f18de24733a35d25c90c03b46dc6e
    blueprint: request-scoping-policy

commit 9a17f8cf0b2a148e91aa4c2083bcb35bdb7734c5
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 27 13:53:00 2013 +0000

    Remove misleading docstrings in ContextMiddleware
    
    Most of this information is completely wrong, so remove it
    
    Change-Id: I00cc4eae20447c402f1451fe9aa7d72877f2c36c

commit 3a1e7838ff6da9b3c59408068d7ec6721b1dc957
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 29 14:50:07 2013 +0000

    Derive context is_admin from policy
    
    Use a rule in the policy.json to correctly derive a user's admin-ness
    based on their roles, when it is not explicitly specified in the
    RequestContext constructor.
    
    Keystone auth_token tests X-Roles based on the user role membership
    for the tenant the token is scoped to, so this will allow us to define
    per-tenant admins (the admin everywhere issue described in keystone
    bug #968696 won't apply here, that is specific to keystone).
    
    Remove the admin_role config option, which doensn't do anything, and
    now this should be specified via policy.json.
    
    Change-Id: I1921a2b515ecc8ca5d37205e3cdb6b7b8695b1ac
    bluprint: request-scoping-policy

commit b5ee30a8323e1349d4cac0d15626356b16cd7048
Author: Sergey Kraynev <skraynev@mirantis.com>
Date:   Fri Nov 29 11:53:58 2013 -0500

    Fn::Replace support for type Number
    
    Currently Fn:Replace works just with type String:
    {Fn:Replace [{'str': 'new_str'}, 'change str']}
    
    After this fix it will work for type Number:
    {Fn:Replace [{'str': 42}, 'change str']}
    
    Change-Id: I709a3350b5676bd9db8bac92e07ad105466bd187
    Closes-Bug: #1256326

commit b27a460a2889213d082572795f2e5eb282ad3e1f
Author: Pablo Andres Fuente <pablo.a.fuente@intel.com>
Date:   Fri Nov 22 16:07:27 2013 -0300

    VersionNegotiation - 404 if no version is provided
    
    The version negotiation middleware tries to identify the API version for
    a specific url, and then perform routing. It also provides version info
    if you attempt to reach "/versions". However, it also returns version
    info if you attempt to reach any other endpoint that does not match a
    version url.
    The version negotiation middleware was modified in order to return all
    the available versions of the api only when:
     1- No version is present in the URI and the Accept HTTP Header
     2- The request path is / or /versions
    If the version is not provided and the request path is other than the
    two mentioned earlier a 404 HTTP Code is returned.
    If a version is provided the middleware strips the version from the URI and
    pass the request to the next middleware/app.
    Added a test suite to ensure that the Version Negotiation Middleware
    work as expected.
    
    Change-Id: I1dde1304de60533491790c33db7d2f74d3373722
    Closes-Bug: #1251078

commit a354c594105adc951ec2e4a34936176042ba6f82
Author: Christopher Armstrong <chris.armstrong@rackspace.com>
Date:   Wed Nov 27 22:02:33 2013 +0000

    Make engine service docstrings conform to Sphinx
    
    This allows our Sphinx-generated documentation to render the
    parameters correctly.
    
    There were some errors in some of the "argN"-documented
    functions, so I've updated them to include all the parameters.
    
    Change-Id: Ic3b2c7702331bc85744b24434edbb2656c90916a

commit 1aa3ce7460fd8db9bff39def14d7ae36c69b6d7d
Merge: 56fd270 d414b46
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 28 11:56:52 2013 +0000

    Merge "Add check_is_admin to common.policy.Enforcer"

commit 56fd2707318e48a8523b7a1317fb6baf2d5a9a31
Merge: 0a73397 214ba50
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 28 10:34:57 2013 +0000

    Merge "Catch error deleting trust on stack delete"

commit 0a73397b2dd35418b1385faf0c1cfe223b31a146
Merge: 672c525 01de14e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Nov 28 10:21:15 2013 +0000

    Merge "Imported Translations from Transifex"

commit 672c525d4f78f13f3197515a68cb010bfa157bb2
Merge: 4950b0b a028cbe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 28 10:21:07 2013 +0000

    Merge "Ensure that members is a list"

commit 01de14ed7bd17798ad6ed5b0c5c090273142c219
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Nov 28 06:07:17 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iae4d296728f802cc217d36f12f296cbaa75055c7

commit 4950b0b03f7e757856ccd8426bc4b494733b659f
Merge: fe71dff b46a4ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 28 05:29:58 2013 +0000

    Merge "Let resources decide when to update"

commit fe71dff97a198b07ca1534c356c67aa8c1a594e5
Merge: 636a9f6 48f377b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 28 01:01:44 2013 +0000

    Merge "Sync openstack.common.local from oslo"

commit 636a9f679436e44af9555ca03fcd4255c176f9ab
Merge: 01fb048 c4f0be3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 28 00:20:26 2013 +0000

    Merge "Fix not correct AWS::StackId value"

commit d414b46c59d89bda9a9d09dffb190cf08df6e9b7
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 22 18:17:01 2013 +0000

    Add check_is_admin to common.policy.Enforcer
    
    Currently we have no concept of admin-ness inside Heat, so it's
    not possible for deployers to specify a hierarchy within a project
    such that some users have more privileged access than others.
    
    The first step is to provide a means to specify in the policy a
    rule which describes who is admin, then we can correctly set
    is_admin in the context based on that rule.
    
    blueprint: request-scoping-policy
    
    Change-Id: Idd1fb5f4e52bda87c70830d66e0c931bfe879347

commit a028cbe46cb22b050af3f3131dde8655f6ebc852
Author: Stephen Gran <stephen.gran@guardian.co.uk>
Date:   Wed Nov 27 15:40:47 2013 +0000

    Ensure that members is a list
    
    self.properties.get('members') should not be None.  Ensure that
    an empty list is returned instead.
    
    Change-Id: I01d191eafebac30ad25505b312ff6e936181bdbf
    Closes-Bug: #1255697

commit 214ba503757e5bd9bf5a5fab6692c4e94d0536fa
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 27 19:08:27 2013 +0000

    Catch error deleting trust on stack delete
    
    When deleting a stack, it's possible for deleting the trust to fail,
    for example if the user deleting the stack is not the user who created
    it, or an admin (which raises a Forbidden error), or due to some
    other transient error e.g connection to keystone interrupted.
    
    Currently in this case, we fail to mark the stack deleted in the DB
    and leave the status "DELETE, COMPLETE", which is misleading.
    
    Change-Id: Ie8e9ea48bc4f44e56ff4764123fcca733f5bd458
    Partial-Bug: #1247200

commit c4f0be36648d94bec439761399fbaeedab4e131e
Author: Alexander Chudnovets <achudnovets@mirantis.com>
Date:   Mon Nov 25 16:42:51 2013 +0200

    Fix not correct AWS::StackId value
    
    Add call of method _set_param_stackid() to method update_task() in class
    parser.Stack. This ensures that an updated stack still has the right
    AWS::StackId param.
    Add a unit test for this case.
    
    Change-Id: I0d28346631546577a85735292a24c2512476d4b4
    Closes-Bug: #1240888

commit e53349ee7c6c06d8bb468ed2869429a144eaaf53
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Nov 27 12:55:45 2013 +0100

    Avoid eventlet-unsafe exception handling
    
    Eventlet can context-switch during a log call (at least in principle).
    Therefore it is unsafe to use "raise" after this call, because the exception
    raised may not be the same one caught by the "except" block, but rather
    could be any random exception from some other greenlet.
    
    This is a canonical example of why eventlet is pure evil.
    
    Fixes bug: #1255506
    
    Change-Id: Ieb0eb763c0fd696b82212653ac4909d2bddf6b88

commit 01fb048330f17a41dd8977df0bd612c853dc3df0
Merge: 5ea79d6 15de8c8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 27 11:58:34 2013 +0000

    Merge "Implement PrivateIpAddress attribute"

commit b46a4ad44222a284d372b491c7f63f0c39126d76
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Nov 27 12:27:06 2013 +0100

    Let resources decide when to update
    
    Previously, the StackUpdate code decided when an update was necessary for a
    resource. However, all of the information required to make this decision is
    available to the resource, so push this decision into the resource so that
    it can implement custom behaviour if necessary.
    
    Change-Id: If098424cf2502c02bad4194d509393d198d8745f

commit 5ea79d62b37c1123af0492317cebbe138d8da994
Merge: 893d023 b441771
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 27 09:10:26 2013 +0000

    Merge "test_common_policy cleanups"

commit 893d023d6c6f8299d3b4dac6515d92c01e6e1184
Merge: 155d94e 2aa0734
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 27 07:35:42 2013 +0000

    Merge "Clean up "target" interface to policy"

commit a927e99d1aa683a9c49e7638cbc21d3e70df8ac6
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Tue Nov 19 16:02:07 2013 +0800

    Remove external AWS links and add doc if needed.
    
    Closes bug #1252640
    
    Change-Id: Ifae43c7ba457e8962360dd5b70cbb8b202365eee

commit f3d089994906a89338ab806251171c9e97cd4670
Author: Richard Lee <rblee88@gmail.com>
Date:   Tue Nov 12 16:20:33 2013 -0600

    Add API endpoint to query build information
    
    This creates the '/<tenant_id>/build_info' endpoint and returns the build revision
    as defined in the 'heat_revision' configuration option. This provides
    both the revision of the engine and the api:
    
    {
      "api": {
        "revision": <api revision>
      },
      "engine": {
        "revision": <engine revision>
      }
    }
    
    Implements: blueprint heat-build-info
    Change-Id: Ibb2f5afda7c5d7c314e5e062d618405d9f4eb318

commit 155d94ef7829561477432ce0a2e2183b35e55c3a
Merge: ed139c1 ab8ab99
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 26 14:51:51 2013 +0000

    Merge "Add filter support to stack API"

commit ed139c1eb8d066ccb5fc86d0f4e50485da4057b7
Merge: 3f1f69b 2c25616
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 26 13:57:08 2013 +0000

    Merge "Use all available headroom for autoscaling"

commit 15de8c8c91437c525b5922c8f11c850df546b42c
Author: Simon Pasquier <simon.pasquier@bull.net>
Date:   Tue Nov 26 10:04:53 2013 +0100

    Implement PrivateIpAddress attribute
    
    The PrivateIpAddress attribute maps to the private IP address of the
    AWS::EC2::NetworkInterface resource.
    
    Change-Id: I471e9ab9ea6fed8bc09a6339d11bcf1f1e4528f8
    Closes-Bug: #1254675

commit 48f377b9e27643dc3fda50529b07dd608f04480e
Author: Sergey Kraynev <skraynev@mirantis.com>
Date:   Tue Nov 26 04:50:42 2013 -0500

    Sync openstack.common.local from oslo
    
    `local` has a broken TLS symbol - strong_store, fixed in oslo some time
    ago in
    Ib544be1485823f6c619312fdee5a04031f48bbb4. All direct and indirect
    (lockutils and rpc) usages of strong_store might be potentially
    affected.
    Original change to Nova: If4dd973acc23921dbc2bc69bb76225deb2802dad
    
    Change-Id: I6839c80c6153b2f4fd28579c33a1a029b8276702
    Closes-Bug: #1254046

commit 3f1f69bbd812ff7927da7b9542116c696723576f
Merge: ac14ece 0ff5ac2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 26 00:13:51 2013 +0000

    Merge "Remove param explode_nested from doc"

commit 2c25616e6197cae52dd20eb5d1d95b6ea6e3d38f
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Mon Nov 25 17:09:40 2013 +0000

    Use all available headroom for autoscaling
    
    Fixes bug 1254796
    
    Previously, potential headroom for autoscaling group growth
    or shrinkage would remain unused unless the adjustment exactly
    hit the max or min size respectively.
    
    Now, we truncate the adjustment to the upper or lower bound
    in the case of an over-shoot.
    
    Change-Id: I760be999039f7038dab77cb8b77a0f683ef56db3

commit 2543c63b53ef2e0ab3a178fe766bbb5a847b020b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 25 17:32:54 2013 +0100

    Use ScaledResource as type for InstanceGroup members
    
    Use the placeholder type OS::Heat::ScaledResource as the nominal resource
    type for resources in an instance group. Use the environment to select the
    actual underlying resource type (current AWS::EC2::Instance).
    
    Change-Id: I52252c596fa48e57d927eb78e9d5b7c8261adb3e

commit b4417714a90ddc8bef88eaf4e718624efdf158b6
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 22 18:03:13 2013 +0000

    test_common_policy cleanups
    
    Make test_common_policy.py a bit less repetitive, and ensure
    VerifyAll is used consistently via cleanup
    
    Change-Id: Ic7f017661d034c1968a6888c03c7492db9c47b3f

commit 2aa0734d73d1f9a692aebb0bcae6d171f8035b91
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 22 17:40:42 2013 +0000

    Clean up "target" interface to policy
    
    The docstring is wrong for this argument, and we pass an empty
    dict since we're not using this data for policy decisions at
    the moment, so default it inside common.policy.Enforcer.
    
    Change-Id: I298e691e12ed10825327492f02bd2f4edec24323

commit ac14ece6fe00c0f4c8764454ced1dc15b84e731a
Merge: eb31cbb 18da028
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 25 10:36:20 2013 +0000

    Merge "Added support for Allow-Address-Pairs feature"

commit eb31cbb9676ec1f6b0ce57e8f9c931d92045de88
Merge: ffa8af6 2dc5920
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 25 05:30:38 2013 +0000

    Merge "Add test for OS::Heat::HARestarter"

commit 0ff5ac297e8ede6e4b58c2094c2880f7e1c37d3a
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Mon Nov 25 10:49:26 2013 +0800

    Remove param explode_nested from doc
    
    Remove param explode_nested from method resource_to_template document
    since it does not exist in parameters.
    
    Change-Id: I0ef14319bf6e39bb59a3d1753fc57bdb7698fe38

commit ffa8af6e34cb6b1a89ae78d5222741ce540bf1b9
Merge: 70b0839 838bdfc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Nov 24 22:14:49 2013 +0000

    Merge "Adds ability to configure various clients used by the Heat"

commit 70b0839f66243b29542cf475ebf8eb9bbf3139b6
Merge: 13e0192 9c08598
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Nov 23 07:57:07 2013 +0000

    Merge "Define deletion policy constants"

commit 13e0192e2c40786106c2c249fcc0ad4529cc2fdb
Merge: d50d969 9904be6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Nov 23 06:17:23 2013 +0000

    Merge "Add coverage for trusts parser.Stack delete path"

commit d50d96933acffd2e62d7723fc31fbfe63e6b121a
Merge: fd1f4db 5397e94
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Nov 23 06:17:15 2013 +0000

    Merge "Improve coverage of storing credentials in parser.Stack"

commit fd1f4db8ee11579065c88cf4d4624695fa4bfbdc
Merge: 5aa6b72 71d2fbe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Nov 23 02:34:30 2013 +0000

    Merge "Fix BaseException.message DeprecationWarning"

commit 5aa6b729ce9257b458aca414e7e86cb389a9958b
Merge: b38145e a833873
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 22 21:24:28 2013 +0000

    Merge "Implement a Heat-native resource group"

commit b38145e13c0d794acdc449fec6e298c17219b850
Merge: 57d962d 27e518c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 22 19:13:35 2013 +0000

    Merge "FaultWrapper error mapping supports parent classes"

commit 9904be6febc4acd39fb86afe119aa6427e890b9a
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 22 15:46:36 2013 +0000

    Add coverage for trusts parser.Stack delete path
    
    Change-Id: Ic55030be389ac71ec999e08533fa9d5fc05b5bd1

commit 2dc5920a4b7cd3517cf9e3e24eebb0b6391a0028
Author: Alexander Chudnovets <achudnovets@mirantis.com>
Date:   Thu Nov 21 15:10:07 2013 +0200

    Add test for OS::Heat::HARestarter
    
    Used mock library for this test.
    
    Change-Id: Ifb4870c45a3f53f5fcec8f3ae5fb4c09beb247a7
    Closes-Bug: #1237109

commit 5397e94292dcbf61778bdaf8abdd3c14be728458
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 22 15:24:55 2013 +0000

    Improve coverage of storing credentials in parser.Stack
    
    Currently the trusts path is not directly tested, so add coverage
    and ensure the correct credentials are stored in each case.
    
    Change-Id: I0aa999e01015046946f242a9b52b484522dc6d72

commit 71d2fbeefff8f24b9b7669956847d354275bd392
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 20 15:39:09 2013 +0000

    Fix BaseException.message DeprecationWarning
    
    Fix a ex.message reference, which won't work in python3 and
    causes a DeprecationWarning to be output on >= python 2.6
    
    Change-Id: Ie115f37997b6bd877e2a5c1d58adf5e3137ac6ae

commit 57d962d729da6daf8fc67ca7ac78bf26e8dc736c
Merge: 8e75661 a9fc527
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 22 12:36:29 2013 +0000

    Merge "Fix some docs errors/warnings"

commit 8e7566153de7d6c14c165b7b89a19f83f86cc268
Merge: dc50993 7b4059b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 22 12:36:26 2013 +0000

    Merge "Add a guide to setup standalone mode"

commit dc50993a5a780cc9c7a07e7103ac1610bbaae41f
Merge: 1d85bcc 36c4a30
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 22 12:32:54 2013 +0000

    Merge "Add exact filter support to SQL API list stacks"

commit 1d85bcceed1f29c7d79bdae62f4058c9bdf83008
Merge: d7d8dd7 512042a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 22 12:32:51 2013 +0000

    Merge "Fixes bullet list without blank line issue"

commit d7d8dd76252ec7036b164e0ea09f09603b38f796
Merge: 7aa618f 6ca227b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 22 10:48:57 2013 +0000

    Merge "Fix the middleware MIME type"

commit 838bdfc1589433e33d4862869765a010c7a857fd
Author: Stan Lagun <slagun@mirantis.com>
Date:   Thu Oct 31 12:46:12 2013 +0400

    Adds ability to configure various clients used by the Heat
    
    This commit adds config sections [clients_nova], [clients_swift],
    [clients_neutron], [clients_cinder], [clients_ceilometer] and
    [clients_keystone]. These sections contain additional configuration
    options for corresponding OpenStack clients.
    Currently those are only SSL-related setting ca_file, cert_file,
    key_file and insecure. Note, than not every client library is
    currently capable of utilizing all of the SSL settings.
    
    There is also a plain [clients] section that holds shared client
    options. Each option searched first at specific group (clients_xxx)
    and if it not found there then the value from [clients] group
    are taken (or default values if there is no such setting in this
    group). This allows defining shared configuration that would be
    used by most (or all) clients without repeating the same settings
    for each and every client separately
    
    Closes-Bug: #1213122
    Implements: blueprint clients-ssl-options
    
    Change-Id: Id9ccbffce0d5c266202fdb1cf24a9ffb63e507e6

commit 7aa618f44059a50b9a7520e65d4c40852523deb0
Merge: 958ddb8 48fd870
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 22 02:21:16 2013 +0000

    Merge "Add a missing mock to rackspace cloud server test"

commit 958ddb82b8376c275b36a1b9175e6a5c30b74d60
Merge: 2e485b4 cd77745
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 21 21:20:39 2013 +0000

    Merge "Doc usage enhancement"

commit 2e485b4865f0cbfb861861d11e101966675f6854
Merge: 8330b77 5310d04
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 21 21:20:35 2013 +0000

    Merge "Make heat depend on python-heatclient"

commit 8330b77fd1adc130ba3b274cb2ea9f78a7fe5dbc
Merge: 1e4eb74 34c4782
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 21 21:20:32 2013 +0000

    Merge "Remove Component class"

commit 9c08598f779c790e44d9913d8f83645b4d167597
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Wed Nov 20 09:14:49 2013 -0600

    Define deletion policy constants
    
    Defining resource deletion policies 'Delete', 'Retain',
    'Snapshot' as constants because these values are used more
    than once and also in multiple modules.
    
    Change-Id: I53596f17d49ce7512b70ba9652d8dea290dbed83

commit ab8ab995fae3475b1d2b6ff023542dec6a04bc55
Author: Anderson Mesquita <andersonvom@gmail.com>
Date:   Tue Nov 19 13:13:01 2013 -0600

    Add filter support to stack API
    
    Accepts multiple request params ATTR=VALUE to filter the listed
    stacks.  Stacks will be matched against all whitelisted filters
    passed in the request.  Whitelisted filters for stacks are NAME
    and STATUS.
    
    If the same ATTR is passed multiple times, stacks matching ANY of the
    values will be returned.
    
    blueprint: filter-stacks
    Change-Id: Ic9421a827e99793448c23a841006fb8c03819030

commit 27e518c5c8ffaf47c4599eff76eeaa1e32b33ff8
Author: Pablo Andres Fuente <pablo.a.fuente@intel.com>
Date:   Mon Nov 18 14:43:25 2013 -0300

    FaultWrapper error mapping supports parent classes
    
    Now the FaultWrapper middleware maps exceptions to webob ones using
    a recursive method: if the exception itself is not in the error_map
    dictionary, the method searches the first parent exception that has a
    match in the same dictionary.
    Without this change "any exception that subclasses an exception mapped
    in FaultWrapper.error_map will raise an http 500 error instead of the
    mapped http error. FaultWrapper should also map against all parent
    types of an exception."
    Two unit test were added: one to reproduce the bug and another to test
    the fix when remote exceptions are handled.
    
    Change-Id: I387e0acf35a4d6361494117218d5129f00d77eb7
    Closes-Bug: #1232885

commit 36c4a30df7a0d2b8059003f3a373617653765e5b
Author: Richard Lee <rblee88@gmail.com>
Date:   Tue Nov 19 13:09:10 2013 -0600

    Add exact filter support to SQL API list stacks
    
    Uses a dict of KEY:VALUE to compare values of VALUE against database
    attribute KEY and return matching stacks.  If VALUE is a list, tuple,
    set, or frozenset, this will evaluate to an IN clause instead.
    
    blueprint: filter-stacks
    Change-Id: If68edd9eaad3fe2ec4d11831d9eda9798a490e89

commit 48fd8709a867083a4da287f992efee2562379cb1
Author: Richard Lee <rblee88@gmail.com>
Date:   Mon Nov 18 10:20:42 2013 -0600

    Add a missing mock to rackspace cloud server test
    
    A few tests were missing a mock call, which led the tests into an
    infinite loop
    
    Change-Id: I66ba612ec2d7eec561f6a0de97e7d3811fbd1f60
    Closes-Bug: #1252333

commit 18da028a1fdc9c893673fded3c4382d01dd5f582
Author: Stan Lagun <slagun@mirantis.com>
Date:   Wed Nov 20 12:41:57 2013 +0400

    Added support for Allow-Address-Pairs feature
    
    Added support for feature called Allow-Address-Pairs introduced in
    Ie73b3886c5be8e1fc4ade86a0cfb854267f345ac
    
    Change-Id: I29f3555e55df6ad6ba41e7ec503cd05ad2a162df
    Implements: blueprint allowed-address-pairs

commit 1e4eb74a22c8939c688611a9dbd47fbf6ea9f21c
Author: chenxiao <chenxiao@cn.ibm.com>
Date:   Tue Nov 19 18:04:41 2013 +0800

    Fix i18N compliance with non-existant keypair
    
    when test stack-create in Japanese language environment,
    execute "heat stack-create" with non-existant keypair
    "heat_key", UnicodeDecodeError will occur because
    exception message has not been decoded correctly for
    the following process:
    (_("%(message)s") % ('message': ...)).
    
    This patch uses safe_decode function in strutils module
    to resolve the error.
    
    Change-Id: I57cddae1b73a95cb9298daf51e49d5d7729467d9
    Closes-Bug: #1249224

commit 6ca227bef3a9f40908feaf485da3ac49b3428798
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Nov 20 10:14:16 2013 +1100

    Fix the middleware MIME type
    
    This is still a hangover from some code coping from glance.
    
    Closes-bug: #1252887
    Change-Id: I7e2ebe0a51fc88dff5fb17a5251bb711216f8139

commit 512042a4c2e9ac84a2be443106790c0e17794159
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Tue Nov 19 17:42:43 2013 +0800

    Fixes bullet list without blank line issue
    
    Change-Id: I56a7b8c33f0a3f03004251897fe6a7177afd7e2d

commit cd777450032d751db755443a9efdb6ee2b131657
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Tue Nov 19 10:34:16 2013 +0800

    Doc usage enhancement
    
    Enable doctest, correct depenencies section, adjust help and build
    section.
    
    Change-Id: I6c2f89d64926ee8e32b86299356700446903888b

commit 5310d042aed5a032817c9df37747eba8b493259f
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 18 10:34:55 2013 +1300

    Make heat depend on python-heatclient
    
    This will be required soon for one or more of the
    following reasons:
    * Multi-region invoking stacks on other heat endpoints
    * A variant of nested stack which goes through API instead of
      internally
    * Orchestrating new heat-based resources (autoscaling, software config)
    * Possibly sharing some template parsing and validation between
      client and server by moving this code to client
    
    Change-Id: Ia3e55d1b3bb19e713e4c1ecc341805f3a208844e

commit 34c4782f4d7061d258333f235263c41332b11a6b
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 18 10:07:04 2013 +1300

    Remove Component class
    
    Discussion has moved on from implementing components as
    top-level template elements, so this can be deleted now.
    
    Change-Id: I8f1b78b8def73da7fb31b7725795f314f962e8b2

commit a9fc527662e8815de5988047b527121af43559a3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 18 21:58:57 2013 +1100

    Fix some docs errors/warnings
    
    Change-Id: I1629f4e335d270aee87d4afc223539c6453dbf88

commit 7b4059bf4fec9a0f75b3b17dd7488e37815f76c6
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 18 21:55:30 2013 +1100

    Add a guide to setup standalone mode
    
    Change-Id: If3555ac3b0a95758f3e2ba9c6c716784b61897c8

commit 186b5a471bc42c2108ed2f88ed80fc178cc9f1a9
Merge: 62252bd bd72bf3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 18 07:03:03 2013 +0000

    Merge "Add _() to fix i18N compliance (part 2)"

commit 62252bd5864ce78b24858b0dacf97d14214eec09
Merge: e822347 89f2a20
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 18 05:19:11 2013 +0000

    Merge "Fixes Error when contain Non-ascii in template"

commit 89f2a206343abff142fb10d1640ce3eac654f996
Author: chenxiao <chenxiao@cn.ibm.com>
Date:   Wed Nov 13 16:21:21 2013 +0800

    Fixes Error when contain Non-ascii in template
    
    when set template use non-english resource_name and execute
    "heat -v resource-list $stack_id". KeyError will occur because
    heat can not encode it correctly. This patch will implement
    a process to encode the resource_name.
    
    The patch use a new module (strutils.py) taken from
    oslo-incubator in order to use safe_encode() and
    safe_decode(), and this module is useful for future
    patchs.
    
    Change-Id: Idddda20d96bca32cb4df94ede31b40f7141e3afe
    Closes-Bug: #1249238

commit bd72bf369c9fad84c538f37373a745702e683899
Author: chenxiao <chenxiao@cn.ibm.com>
Date:   Fri Nov 15 17:45:21 2013 +0800

    Add _() to fix i18N compliance (part 2)
    
    In heat, almost 200 log message and at least 30 exception
    message are not processed by _(), and will not been translated.
    We should use '_("STRING ...")' to enable i18n support.
    
    I split to two parts for review easier because the files
    lost of _() are too much.
    
    Change-Id: I36ccd119fc1dcb58e98b77b2c9d139af6a380a7a
    Closes-Bug: #1249217

commit e822347a7d5c4619e1ad48a1ce3d66fbf6055f55
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Sun Nov 17 13:23:19 2013 +1100

    Make instance Tags updatable
    
    Note: I don't think that there is an issue with autoscaling tags
    as autoscaling drives the instance via the properties and it doesn't
    update intances anyways, it only creates/destroys instances.
    
    Change-Id: I3cea4180f22690ea226273cc96132db6ae3dde12
    Closes-bug: #1240885

commit 3a7c0e14424b69606265671ea61e8379fd6e2419
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Nov 13 12:54:20 2013 +1100

    Allow nova metadata to be updated
    
    Note this is metadata not Metadata (confusing, I know).
    
    This does not need to be run in a task as the server does not
    change state for metadata changes.
    
    Change-Id: If5f9ee89984fab388c0c9d839fbe23a59c68046b
    Closes-bug: #1250638

commit 5a33ed6d8b7044a4a48da293a515536de1526654
Author: Stephen Gran <stephen.gran@guardian.co.uk>
Date:   Tue Nov 5 20:56:35 2013 +0000

    Get pool members from DB API
    
    When the Load Balancer members are created as a result of autoscaling
    groups calling _lb_update, the reference to the current members is
    stored in the database and not in the template.  Treat ResourceData
    mappings as canonical.
    
    Closes-Bug: #1248218
    Change-Id: Iaf8097eff6ad5ae0809d56604699dca2b08db3f4

commit c4e3044c80c3a73ff02be37332a63d7518c5b82b
Merge: 599713d 8995589
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 15 12:45:39 2013 +0000

    Merge "Add links section to the stacks index response"

commit 599713d5a105b17a03fe0d841d2678b336cffe27
Merge: 8a974a1 0ab4a74
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 15 12:45:23 2013 +0000

    Merge "Add support for limiting and sorting stacks"

commit 8a974a1a616fba5769dd43671c798506910d40fe
Merge: ee7b5a7 3d53c15
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 15 12:34:37 2013 +0000

    Merge "Fix some direct imports from sqlalchemy"

commit ee7b5a740171762ef7ac360159f92258e484326d
Merge: 80111f4 b044fa8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 15 09:16:13 2013 +0000

    Merge "Implement Tags for S3 bucket"

commit 80111f4005087c650c5960955887b6c018b4b195
Merge: c7c4901 14439e8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 15 07:07:13 2013 +0000

    Merge "Use get_secgroup_uuids in Instance"

commit c7c4901c80e8ff62245340e0479cb33fa4eccc9f
Author: chenxiao <chenxiao@cn.ibm.com>
Date:   Thu Nov 14 16:57:01 2013 +0800

    Add _() to fix i18N compliance (part 1)
    
    In heat, almost 200 log message and at least 30 exception
    message are not processed by _(), and will not been translated.
    We should use '_("STRING ...")' to enable i18n support.
    
    I will split to two parts for review easier because the files
    lost of _() are too much.
    
    Closes-Bug: #1249217
    
    Change-Id: I2c86dc7770a7f6f107ba16711b9cba363ef9b906

commit 161ae8154f8ac5387b6301a5325a67df3b26559f
Merge: 4dcb117 9d9bf33
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 15 04:50:59 2013 +0000

    Merge "Managed Cloud compatibility for Cloud Servers"

commit 4dcb11702db01da83a835d33c7378fd81fd7b520
Merge: 3d1d6ed 902154c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 15 00:14:06 2013 +0000

    Merge "Rewrite get_secgroup_uuids to avoid resource_by_refid"

commit 3d1d6eda9f0889e33598a851d7bb599d39ae1826
Merge: 4e84739 6e581c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 15 00:13:53 2013 +0000

    Merge "Move resource doc generation to doc/source/ext"

commit a833873e91d48f251c0036034ffe055855fa2fd0
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Mon Sep 30 12:14:03 2013 -0500

    Implement a Heat-native resource group
    
    This resource allows for creating groups of identically
    configured resources via nested stacks. It provides
    aggregated as well as indexed access to the nested
    resource attributes.
    
    Implements: blueprint native-resource-group
    Change-Id: I089e6d2f795d30ebe410df151ebc68639ea7102b

commit 89955891c06f5ee64ad49f78e0bfe23c7b0b2f72
Author: Richard Lee <rblee88@gmail.com>
Date:   Tue Nov 12 14:25:34 2013 -0600

    Add links section to the stacks index response
    
    Add a `links` section to the stacks index response that will contain
    pagination links for the collection - this commit includes adding a
    `next` link to the section.
    
    blueprint pagination
    Change-Id: I76451a101e7c417a485da78dd7fb19229d91861d

commit 0ab4a74e9736e7eb2a483eaa83a4cafe9709c420
Author: Anderson Mesquita <andersonvom@gmail.com>
Date:   Mon Nov 11 12:27:28 2013 -0500

    Add support for limiting and sorting stacks
    
    This adds support to the stacks index call for limit, sort_keys,
    sort_dir, and marker query parameters, allowing users of the API to
    retrieve a subset of stacks.
    
    With this commit, stacks are also sorted by created_at DESC by default.
    
    blueprint pagination
    
    Change-Id: Ib20cfae183475ff42deda82168b8b9c8d043ecd0

commit 4e847391ea0551eeb0aef0fe546a064f952a0abb
Merge: 812f7ca 01b3be0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 14 04:41:02 2013 +0000

    Merge "Refresh Cloud Server data for RackConnect check"

commit 812f7ca9119fa2448254088c72c16a39b2f9fd65
Merge: a428913 5720e6d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 14 04:22:26 2013 +0000

    Merge "Ensure autoscaling actions occur for percentage adjustment"

commit a42891337f3a0f7be2e9916417c5f5d726c6aade
Merge: eb6ea45 4bd2d15
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 14 04:22:18 2013 +0000

    Merge "Update install.sh to reflect recent oslo.db format"

commit eb6ea45f34b6a87067fc23a45245598650d5285a
Merge: 7f5ab14 91fb510
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 14 03:06:00 2013 +0000

    Merge "Don't use the last server fake, but the one we want"

commit 7f5ab1433fbfe0426bf77317418ec6a9ad4c2088
Merge: 2fbfae4 d43864c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 14 03:00:14 2013 +0000

    Merge "Remove unused db/sqlalchemy/manage.py"

commit 91fb510d320df91ea9f2af86bfb18621ee563c5b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Nov 14 12:33:49 2013 +1100

    Don't use the last server fake, but the one we want
    
    This makes it *really* frustrating adding a new server fake.
    
    Change-Id: I968d32ce27b34ee8dc7a6ff821de21fcee832741

commit 2fbfae41aba703c89efcd5bfd42a458d1f2a311d
Merge: 4f936e4 14b4648
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 14 00:51:09 2013 +0000

    Merge "Fix server update attribute test"

commit 5720e6d647ce3a273d638fd7dacc9c2d6eb2bc22
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Wed Nov 13 17:47:09 2013 +0000

    Ensure autoscaling actions occur for percentage adjustment
    
    Fixes bug 1251007
    
    Previously if the AdjustmentType was set to PercentChangeInCapacity,
    then depending on the choice of the instance group MinSize and the
    scale-up policy ScalingAdjustment, no autoscaling actions may occur
    even when the under-scaled alarm fires.
    
    This situation occurred if:
    
       (MinSize * ScalingAdjustment / 100.0) < 1.0
    
    in which case the group never get gets scaled up even if the under-
    scaled alarm stays in the alarm state forever.
    
    Now we follow the rounding rules used by AWS Autoscaling:
    
      http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/as-scale-based-on-demand.html
    
    Change-Id: I79e5e743de1944ace5ef2c4dbcb76c9cab7262bb

commit 4f936e40290044fd11de608ce2136d19b74dcec1
Merge: 6436aaf 574f3ea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 13 18:01:01 2013 +0000

    Merge "Shorten physical resource name to custom limit"

commit 4bd2d15b2146cf903361defc3d8541905c992ae4
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 13 16:50:34 2013 +0000

    Update install.sh to reflect recent oslo.db format
    
    The previous sql_connection option has been deprecated and replaced
    with the database.connection option in oslo:
    
    [database]
    connection = mysql://heat:heat@localhost/heat
    
    The old option still works, but the default is only respected from
    the new option, which is confusing if you're relying on the previous
    behavior where specifying nothing got you the sql_connection default.
    So update the installed config to remove the deprecated options.
    
    Change-Id: I0f5b4587358ec99b47c8ab3ee924191bbf2760a2
    Closes-Bug: #1241826

commit d43864c726e1a25012c9708ff488ca3f1790d39a
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 13 15:55:27 2013 +0000

    Remove unused db/sqlalchemy/manage.py
    
    This has been superseded by the cmd/manage.py implementation
    
    Partial-Bug: #1241826
    
    Change-Id: I89ff643048ef28c098483c1b7cf55c564e5d6062

commit 6436aafac5bd3d43e847672840e841c779d322ba
Merge: 5fb5bf7 4ed487b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 13 13:33:13 2013 +0000

    Merge "Revert "Implement stack-locking for multi-engine support""

commit 4ed487bef474c2ae9e8d38192b8f712f155456e4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Nov 13 22:59:34 2013 +1100

    Revert "Implement stack-locking for multi-engine support"
    
    This is a short term backout until it gets fixed.
    
    This reverts commit c30530f12663302869a8f2edf979e8a8bd33ed2d.
    Closes-bug: #1250797
    
    Change-Id: Ide1dc4a9d1469dee033e8bc08d8ab4da96f79fc0

commit b044fa8096fae7e0d3594bf7c116d7620cd85bd1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 11 11:32:56 2013 +1100

    Implement Tags for S3 bucket
    
    Use the metadata to hold the tags.
    
    Change-Id: I52d8bb9429a90529431622c72ff2484e6c38c58e

commit 5fb5bf7289297c20ac430e7fc51d2d4928eb7781
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 11 10:56:22 2013 +1100

    Add property doc strings for S3 bucket
    
    Change-Id: I508a6ea45748e366c4cc4f6f47f200ac4145cee1
    Closes-bug: #1224148

commit 3d53c152d591fd815259f1b0edc46d19916c13db
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Nov 13 16:12:10 2013 +0800

    Fix some direct imports from sqlalchemy
    
    Directly import sqlalchemy might result in some inconsistent
    behaviors. It would bypass the db_backend configuration.
    
    Change-Id: Ic07c5d9f4898add6629a296ee1dff22be0e75262

commit 6e581c495d47c40397a7d2f849186ca2e9faf280
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Nov 13 15:21:04 2013 +1300

    Move resource doc generation to doc/source/ext
    
    This is similar to other projects, and removes this
    code from the withering gaze of coverage reports.
    
    Change-Id: Ie0acb2a203f2e69a7d84aba3915a8499ab51ecb6

commit 14b464898e809b66f4004e8caf01a0a7facfcf13
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Nov 13 12:29:30 2013 +1100

    Fix server update attribute test
    
    This is testing if an attribute not in the update_allowed_keys
    results in UpdateReplace. Whilst this is true here, it's using
    an attribute that is not a valid resource attribute. The only
    valid resource attributes that I know of are:
    (Properties, Metadata, UpdatePolicy, DeletionPolicy)
    
    Just want to make sure we are testing the right thing.
    
    Change-Id: Ic84239b0ff3960968293c2c367971f30d091e833

commit 574f3ea54b1299f7f827bf0f6a88a83bccf9c3af
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Nov 13 10:49:29 2013 +1300

    Shorten physical resource name to custom limit
    
    The default limit for resources is 255, which is
    determined by the column size of the name columns in
    other openstack project databases.
    
    The limit for nova servers is 53 characters due to typical default
    linux HOST_NAME_MAX of 64, minus the '.novalocal' appended to the name.
    
    The reduced name will consist of the following:
    * the first 2 characters of the name
    * a hyphen
    * the end of the name, truncated on the left to bring
      the name length within the limit
    
    The validation fix from bug: #1238272 has been removed.
    Closes-Bug: #1250291
    
    Change-Id: Iccaf905b2e73433a671559c49223c2b635402853

commit 9d9bf33a122268d7a7d9b696c794b7e3b33689c9
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Mon Nov 11 16:46:29 2013 -0600

    Managed Cloud compatibility for Cloud Servers
    
    Make the Cloud Servers resource aware of the Managed Cloud automation.
    The Cloud Servers resource should wait for the Managed Cloud automation
    to complete before proceeding with the server configuration.
    
    Blueprint managed-cloud
    Change-Id: Iea331f1b275026d6189012528d376e01c986b0cb

commit 01b3be06453cd00cdc98ddc3e56dbc0d6e10fea4
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Tue Nov 12 09:38:41 2013 -0600

    Refresh Cloud Server data for RackConnect check
    
    Refresh Cloud Server data on each iteration of check_create_complete to
    ensure the server metadata is up-to-date for the RackConnect check and
    any subsequent checks.
    
    Change-Id: Ia4ad04cfd5e76b639a0b98c21e381db70551090a
    Closes-bug: #1250647

commit 14439e8deb8141abd2448e592917a00574bf430e
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 12 11:28:53 2013 +1300

    Use get_secgroup_uuids in Instance
    
    Instance._get_security_groups_id serves the same
    purpose as neutron.get_secgroup_uuids. This change switches
    Instance to using get_secgroup_uuids instead.
    
    Updating the test has the side-effect on getting full test
    coverage on get_secgroup_uuids, albeit indirectly.
    
    Change-Id: I8cdc51692fd8d96e68c6c947891c9708f77d54c3
    Related-Bug: #1250286

commit 902154c5b1bd4222e5c0ef484a417885ae1e8991
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 12 11:28:14 2013 +1300

    Rewrite get_secgroup_uuids to avoid resource_by_refid
    
    get_secgroup_uuids has changed in the following ways:
    * No longer attempts to find a security group name via
      a resource_by_refid lookup. resource_by_refid only exists
      as a workaround for AWS compatibility resource which are
      not backed by an API. Usage of resource_by_refid should be
      avoided in native resources if at all possible.
    * If the security group looks like a UUID, assume it is
      a UUID for a security group that exists
    * Call client.list_security_groups only once, and only if
      there is a non-uuid security group specified
    * Do not attempt to reduce duplicate security groups to a unique
      list. If that is important for resources it can be done in
      validation.
    * Raise PhysicalResourceNotFound if name maps to no group
    * Raise PhysicalResourceNameAmbiguity if name maps to more than one
      group
    
    Change-Id: I106adc15a7882192884d37c0806947470d139434
    Closes-Bug: #1250286

commit c30530f12663302869a8f2edf979e8a8bd33ed2d
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Wed Oct 2 15:22:12 2013 -0500

    Implement stack-locking for multi-engine support
    
    Implements a distributed stack lock using the database to avoid race
    conditions when multiple engines are deployed.
    
    Blueprint multiple-engines
    
    Change-Id: I7fba8808d8a4efbe7fd8fdff94fd9a53f3841c8b

commit 2ddcf04480c9717805e3c1fffbf8f040e9574382
Merge: 59dced7 cc8acd8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 12 13:33:52 2013 +0000

    Merge "Using a number in str_replace causes an exception"

commit 59dced7876e80a83e844f8c2f87c11fe555a6ab2
Merge: d23e374 280f7d8
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Nov 12 11:16:48 2013 +0000

    Merge "Imported Translations from Transifex"

commit d23e37460051bb056693e9fae511aa768b786382
Merge: 0e22bd7 2ae442f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 12 06:52:29 2013 +0000

    Merge "Rename exception NoUniqueImageFound"

commit 280f7d8fe7a7cfa00f77cfd9750f864e580a5d18
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Nov 12 06:06:14 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia72767656f7872c3d673ed4d0c10deb1f6db22c0

commit 0e22bd76cd064b7404ba34dbd15bdfb8a52b40d2
Merge: 5834dbe 8e23e68
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 12 03:24:12 2013 +0000

    Merge "Implement update for neutron port resources"

commit 5834dbea71b6f777a3bd2b2bff101d3c0429c729
Merge: f0a1d14 721e588
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 12 03:24:05 2013 +0000

    Merge "Implement update for neutron router resources"

commit f0a1d148a573166790a1bf70ca22f5d8ce0f932f
Merge: ad1d61e 700d766
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 12 03:23:57 2013 +0000

    Merge "Fix "members" property check"

commit ad1d61ec67f44e6c70653fe11b5f7ff11bee7310
Merge: a128035 7e19123
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 12 03:23:50 2013 +0000

    Merge "Refactor tests to use mock"

commit 2ae442f60b4b9c93120c4ded7fca8ef2b4be744e
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 12 10:16:04 2013 +1300

    Rename exception NoUniqueImageFound
    
    It is now called PhysicalResourceNameAmbiguity and can
    be used where looking up a physical resource by name results
    in more than one resource being returned.
    
    Change-Id: Ib6d03a4eac6dc674378b2f2619383d8d0f3dd25e

commit 8e23e6819d513c5d4e4a965c66497f4b0834df43
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 12 09:47:35 2013 +1300

    Implement update for neutron port resources
    
    This change allows any updatable properties to be updated
    on an existing port without replacement. Documentation
    is limited on what properties are updatable, so discovery
    was manual. Unlike other neutron resources, port name is not
    updateable without replacement.
    
    Change-Id: I7845702e14baab595363d57bcf6128e45ffdd789
    Closes-Bug: #1241553

commit 721e588aebd765e4ff4326cc3a135b8cbfc8738d
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 1 16:26:01 2013 +1300

    Implement update for neutron router resources
    
    This change allows any updatable properties to be updated
    on an existing router without replacement. Documentation
    is limited on what properties are updatable, so discovery
    was manual.
    
    Partial-Bug: #1241553
    Change-Id: Ia3b1885cee2f3440bb73724291d46d5af19962eb

commit cc8acd8f1216ac734fde00a4d098881cdf8261dd
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Mon Nov 11 17:19:10 2013 -0600

    Using a number in str_replace causes an exception
    
    When passing in a number as a parameter value to the string replace
    function, an exception is raised. Cast the value as a string before
    using it in the string replace function.
    
    Change-Id: I38bdc8d97c7d1f9b62f52b0a783bf4d3fde3611a
    Closes-Bug: #1250251

commit a1280357dbcdb4d7b80fb0736eb98b4d5da3e093
Merge: 945d824 62124c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 11 19:59:22 2013 +0000

    Merge "Implement update for neutron subnet resources"

commit 945d824e629962a0f07a99442dfce6274b8c2227
Merge: 9184369 c905259
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 11 19:49:11 2013 +0000

    Merge "Resources for Rackspace Auto Scale"

commit 9184369f92c44cb04c3137d42530987b4506c229
Merge: 84f01ee 57aeac5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 11 19:47:11 2013 +0000

    Merge "Add property documentation for the waitcondition"

commit 84f01ee3cda02867d6de2a2bc1443eb1e090d978
Merge: abf796d 0bcae60
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 11 19:45:58 2013 +0000

    Merge "Set the waitcondition maxvalue to 12 hours as AWS specifies."

commit abf796d93c66b142458846987e3320f4704f5b79
Merge: ae872fb f3ee60e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 11 19:45:08 2013 +0000

    Merge "Implement OS::Neutron::SecurityGroup"

commit ae872fb9841b62fcaeafa41aa2718b913dbc6bcf
Merge: 767dbae 3460a75
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 11 19:45:06 2013 +0000

    Merge "Implement update for neutron network resources"

commit 7e19123f93418617e2c446ee4bb2b39d393fb6b2
Author: Anderson Mesquita <andersonvom@gmail.com>
Date:   Mon Nov 11 12:26:21 2013 -0500

    Refactor tests to use mock
    
    Refactor some of the tests to slowly move towards using mock
    instead of mox
    
    Change-Id: I0f8039b0ccd07c9a1737b229b520f9225484d4b9

commit 700d766a6f5a06a720f33c4b69da4d49dd04264d
Author: Alexander Chudnovets <achudnovets@mirantis.com>
Date:   Mon Nov 11 12:13:45 2013 +0200

    Fix "members" property check
    
    According to https://bugs.launchpad.net/heat/+bug/1247638/comments/3
    
    Closes-Bug: #1248571
    Closes-Bug: #1247638
    Change-Id: I4a61963d730250d8c3714b20c9cc7bb3717d85af

commit 767dbaeff24d668520d7f20e0ad86a70c7826405
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Nov 11 06:05:39 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ica683a71b00d1adf8a73f8bef56e2078ef1d50ce

commit 984741723d1a7f3d3ec04e5fc7ca72632c854b6a
Merge: 63dea84 6193d3b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 11 03:29:36 2013 +0000

    Merge "RackConnect compatibility for Cloud Servers"

commit 63dea84713006eca75f829f50e2d42eb16869818
Merge: 620fd01 82ba0dd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 11 02:40:42 2013 +0000

    Merge "Create a guide for scaling out Heat API's"

commit 57aeac50637922355275ecbad3c5cc342d7b5981
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Nov 1 09:53:09 2013 +1100

    Add property documentation for the waitcondition
    
    Change-Id: I9d194b8f0f92e1958e8b6388937dfe0c78c933ff
    Closes-bug: #1224161

commit 0bcae605dc37470b048d48b66370cbb5fd770a81
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Nov 1 09:51:24 2013 +1100

    Set the waitcondition maxvalue to 12 hours as AWS specifies.
    
    This is just setting an upper bound on the waitcondition of 12 hours.
    
    Change-Id: I6fe25d1465007e5bb164c1a004dcc6b12aa48184

commit 62124c4530d19766c6b427448b3a59d7c157c2e7
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 1 16:25:32 2013 +1300

    Implement update for neutron subnet resources
    
    This change allows any updatable properties to be updated
    on an existing subnet without replacement. Documentation
    is limited on what properties are updatable, so discovery
    was manual.
    
    Change-Id: Ia585d1b7d24900f2789f2127a76dd272aa7fb850

commit f3ee60e7b5bcd168a4df72d280f4e98344a19668
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 1 12:40:35 2013 +1300

    Implement OS::Neutron::SecurityGroup
    
    Some notes on the implementation:
    * There is a single list of rules, with the 'direction'
      attribute denoting whether ingress or egress (ingress is the default)
    * All attributes are updatable without resource replacement using
      prepare_update_properties.
    * Rules update is implemented by:
      * deleting all rules
      * restoring default egress rules which allow all egress
      * adding new rules
    * The remote_mode attribute allows switching from remote_ip_prefix
      to remote_group_id based associations
    * As documented in the remote_group_id property, a rule can establish
      a self-reference to its own security group by specifying
      remote_mode: remote_group_id and not specifying any value for
      remote_group_id
    
    Implements blueprint native-neutron-securitygroup
    Partial-Bug: #1206313
    Partial-Bug: #1243686
    
    Change-Id: Id240fe02b5b85d7b11f48411a58e98d2d575c9a0

commit 3460a759d8a0fdd757196372feaff0110546142e
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 1 16:25:11 2013 +1300

    Implement update for neutron network resources
    
    This change allows any updatable properties to be updated
    on an existing network without replacement. Documentation
    is limited on what properties are updatable, so discovery
    was manual.
    
    The method prepare_update_properties can be used by other
    neutron resources to implement their updates.
    
    Change-Id: Ib128123544c4a62b4ba672203c1a81cf082a8847

commit 620fd0165b2316f4b66a08b3f6361c37c5144e85
Merge: 4888996 4a42070
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 8 21:26:21 2013 +0000

    Merge "Send usage notifications on major stack events"

commit 48889967ee0e5b929afdf2813094f4c1ba476b40
Merge: d7982db 3d70e30
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 8 21:10:34 2013 +0000

    Merge "Check that the epel repo exists before adding it"

commit d7982dba36220e77cbc1aca86764c83bcfe7b542
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Nov 8 06:05:47 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I136e18c33fa05a83fc8098d944eba4a4aa6c72b9

commit 82ba0dd68fdfd05a8142859b8967cdfdf77b0ade
Author: Samuel de Medeiros Queiroz <samuel@lsd.ufcg.edu.br>
Date:   Tue Oct 29 10:49:21 2013 -0300

    Create a guide for scaling out Heat API's
    
    This documentation describes a guide for scaling out the ReST and
    CFN API's based on a devstack installation. HAProxy is used as a load
    balancer, redirecting calls from CLI to the several API's instances.
    
    Change-Id: I6efe988ce970f2a3aa08f39050f85dc1621e6774
    Closes-bug: #1072958

commit 6193d3b5c4362b5f54eb730d10801363f807eb6c
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Fri Nov 1 16:02:51 2013 -0500

    RackConnect compatibility for Cloud Servers
    
    Make the Cloud Servers resource aware of the RackConnect automation.
    The Cloud Servers resource should wait for the RackConnect automation to
    complete before proceeding with the server configuration.  Additionally,
    the server's public IP will have changed, so any previously-fetched
    public IP needs to be forgotten.
    
    Blueprint rackconnect
    
    Change-Id: I61676ac821695431cdba0d9a7d3b2e009f6ca3e4

commit 3d70e301ed41fc5f9424047e908befeeb486f324
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Wed Oct 9 15:51:52 2013 -0500

    Check that the epel repo exists before adding it
    
    The epel repo that contains cloud-init and other packages needed for the
    rackspace resource does not always exists. The setup script will fail if
    you try to import the repo when it exists because of running the script
    with set -e.
    
    Change-Id: If1f912c2e7cbe3ccd58e10d0ea2e1e07b2114b48

commit 95c5739533150cdfca7edc62d415f5d79ad1d2fa
Merge: 13ec482 d08101e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 1 18:03:47 2013 +0000

    Merge "Add a man page for heat-manage"

commit 13ec482b625653ab89f81dc946f6ab1c104ee9a5
Merge: a7b7022 3dead2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 1 18:03:40 2013 +0000

    Merge "Rename admin flag on SqlAlchemy#stack_get"

commit d08101eef65a2cab8151fe4c3d33050694740a49
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Nov 1 21:55:53 2013 +1100

    Add a man page for heat-manage
    
    Change-Id: I9b3d6b3b227ca2a2a2786837b941fdc420d3b2b6
    Closes-bug: #1189651

commit a7b70221850c6f1032153b42f9f2f3028fa2e0a8
Merge: 05a9c0c 089c25a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 1 10:39:15 2013 +0000

    Merge "Make check_uptodate compatible with BSD shells"

commit 05a9c0c6bdd40cf26b06c013f25a750fdffe4366
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Nov 1 06:05:28 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I6d229c1ff736222862051230b8c2072d92a9dbd2

commit 4a42070fee6fcd2b6dbb9cc9f162ed52407283a7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Oct 30 09:22:52 2013 +1100

    Send usage notifications on major stack events
    
    These notifications can then be used for usage/billing/alarming purposes.
    
    Some of the base fields are based on the existing nova fields:
    https://wiki.openstack.org/wiki/SystemUsageData
    
    This patch just has the minimum fields needed we can add more as users
    ask.
    
    We can also add more notifications as we need:
    - automated actions (autoscaling, restart)
    - time based .exists notifications
    
    implements blueprint send-notification
    Change-Id: I63ad5402037799842643eb642af15b54ef8d7483

commit 3dead2a0811d83b701ad2d9aac9713b2f426d256
Author: Anderson Mesquita <andersonvom@gmail.com>
Date:   Wed Oct 30 14:11:33 2013 -0500

    Rename admin flag on SqlAlchemy#stack_get
    
    The `admin` flag was only used to avoid doing a tenant_id check between
    the stack and the context.tenant_id, so it was renamed to `tenant_safe`
    for better clarity.
    
    Change-Id: I32c1156c8782bad39a265c77aad088c96400f69f
    Closes-Bug: 1245952

commit 089c25a4a32fef54d555443a5671682f29acf001
Author: Richard Lee <rblee88@gmail.com>
Date:   Thu Oct 31 14:34:44 2013 -0500

    Make check_uptodate compatible with BSD shells
    
    BSD mktemp requires a template for the file/directory name.
    GNU mktemp supports the option, but is not mandatory.
    
    This change passes in the template, so that the check_uptodate.sh is
    more compatible across different environments.
    
    Change-Id: Id4abb92054363416272f583600e3d8ff2a9f9d42
    Closes-Bug: 1246858

commit a1301baaa41473e123a8240f8d7aa51c1d90f0dc
Author: Vinod Mangalpally <vinod.mang@rackspace.com>
Date:   Thu Oct 31 11:36:34 2013 -0500

    Add Rackspace Cloud DNS Resource
    
    This will be a temporary solution to have a resource for DNS until
    Designate is incubated. Also currently work is in progress for a
    new API for Designate.
    Until then this will serve as a resource for Rackspace Cloud DNS.
    
    Implements: blueprint rax-dns-resource
    Change-Id: Ief0c478b9e40f6f9446b386243400f062a941a36

commit c905259b6a55060153422e98e6c795289e1867f6
Author: Christopher Armstrong <chris.armstrong@rackspace.com>
Date:   Thu Aug 1 17:42:20 2013 -0500

    Resources for Rackspace Auto Scale
    
    This introduces Rackspace::AutoScale::Group, ScalingPolicy,
    and WebHook resources, to support the Rackspace Auto Scale
    product.
    
    Change-Id: I38b8f368d833b7475f260b8eb7afcc3a2a3770e7

commit bca4b68aef7d9865af137cf855c5928bfba99e4d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Oct 30 11:00:14 2013 +1100

    Implement volume tags as metadata
    
    I have created the wordpress with ebs and confirmed that
    cinder show <id> displays the metadata correctly.
    
    Change-Id: I84f394bbd3748884deca64630cdfee7ac1bb9786
    Closes-bug: #1224339

commit d9ca0c9ea2113f90a92fe66153a29343f2dd3ec7
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Oct 30 06:05:56 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia4f60b434557cae0f48190978b7b2f7130feed6b

commit 4c8c0df57251a81fbef9f5b8d4758c101573c2c5
Merge: 9bd4f95 7aa7710
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 30 04:46:10 2013 +0000

    Merge "Ensure apt-get installs do not prompt user input"

commit 9bd4f95822914b700553e2439e89e975e2929fe5
Merge: 2fe1410 dc936ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 30 04:46:02 2013 +0000

    Merge "Add a link method to Thread"

commit 2fe1410ab79500e9d76fbd07f7e3b7fc280a39be
Merge: 297e118 995b5ca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 30 03:53:21 2013 +0000

    Merge "Stop irratating pep8 error in test_clouddatabase.py"

commit 7aa77105846c7d524de498bd3598918872036002
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Mon Oct 28 12:58:21 2013 -0500

    Ensure apt-get installs do not prompt user input
    
    Set DEBIAN_FRONTEND to noninteractive and add dpkg options to ensure
    apt-get installs do not prompt for input and cause the stack-create to
    fail.
    
    Closes-Bug: #1245899
    
    Change-Id: I294783fb565b854143bc8a5d15834d8d88ad1a70

commit dc936ad6d8ae242da67163c4352dd5a332ef8740
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Tue Oct 29 09:59:29 2013 -0500

    Add a link method to Thread
    
    This will allow users to link their own callback functions to a
    greenthread.
    
    SHA1 of oslo patch: 9d3c34b59ac2e0246798c6db24b32c99f4196bd1
    
    Change-Id: I5284ec0ccdbe093e6afff6511b19cf66f9356523

commit 297e118bca5de391b39b74d144c592aa125c0c5a
Merge: 12a23a8 6fcac80
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 29 16:42:40 2013 +0000

    Merge "Fix sqlalchemy migrations"

commit 12a23a804e87f019758a32594629dc65755efe26
Merge: 11ac4dd f412a1a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 29 16:41:53 2013 +0000

    Merge "Fix sqlalchemy models"

commit 11ac4dd3f899dc0f28d356bad89ec559e9d1e81f
Author: Roman Podoliaka <rpodolyaka@mirantis.com>
Date:   Tue Oct 29 14:18:04 2013 +0200

    Make Fn::Select accept an integer selector again
    
    Closes-Bug: #1245863
    
    Change-Id: I364da88f1c581b406d51e1b584778c7dd4e2564f

commit 995b5ca9558b552dfb68cc26dddee3a84b19cce6
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Oct 29 20:27:22 2013 +1100

    Stop irratating pep8 error in test_clouddatabase.py
    
    If you don't have pyrax installed you keep getting this.
    
    Change-Id: I87990d7ce84e0752228d6214696a8c9b03df7ff2

commit 614e196f01d1e675d7e512bdc66de10a3a8c8e40
Merge: 6d9f45c 9df15c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 28 23:46:53 2013 +0000

    Merge "Assert that all function exceptions have the function name"

commit 6d9f45c9276a2d877ba74e4e15728f5ca12c52cf
Merge: 741d5b1 4b974bc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 28 23:46:46 2013 +0000

    Merge "Move all possible function tests into scenarios"

commit 741d5b1c42f65cb9cfcc82411c8af693068bb101
Merge: 4b96232 5f0faff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 28 23:46:39 2013 +0000

    Merge "Only log to console in heat-db-setup"

commit 4b962327711faeb4e767baa7fb6bb389d05a936b
Merge: 3087c5d 803c42c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 28 23:00:46 2013 +0000

    Merge "Add doc support for update_allowed"

commit 9df15c134261f6b0675d5039562b3a893e879e44
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Oct 29 08:32:25 2013 +1100

    Assert that all function exceptions have the function name
    
    Change-Id: Iaeaca86a42dd146926087aeb74192ac5da881cb8
    Closes-bug: #1226681

commit 5f0faff4099c6673cc8eb61f64ab906848a2580f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Oct 29 08:26:40 2013 +1100

    Only log to console in heat-db-setup
    
    Make sure heat-manage does not use heat.conf logging
    in the heat-db-setup script as the logging directory
    might not be setup yet.
    
    Change-Id: I16db3fde1c7bfe5f027c77f2a25ffa2104d15491
    Closes-bug: #1191925

commit 4b974bcc10a05ebb92780619f47a749d072b106e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Oct 28 17:34:26 2013 +1100

    Move all possible function tests into scenarios
    
    Change-Id: If0f05ee2308e0591e1a70fce847099a9bf36fdba
    Partial-bug: #1226681

commit 3087c5d6e73f6ee0243155553e2ab55b9e11a484
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Oct 28 10:42:46 2013 +1100

    Change heat-api.org to openstack.org
    
    Remove the last reference to heat-api.org
    
    Change-Id: Idbeeff7b65ba5fce0b7c80d22618dca3e92996f3
    Closes-bug: #1220381

commit b7c50f753a14c0b9659ca4f2d1237417add77f40
Merge: 3e6933c 14f1d21
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Oct 25 23:12:50 2013 +0000

    Merge "Imported Translations from Transifex"

commit 803c42ce298cf69d5f3a5ed0d6a28a522feff5f7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Oct 25 11:40:42 2013 -1000

    Add doc support for update_allowed
    
    Add a section that says if the property can be updated
    non destructively.
    
    Change-Id: I204c42075a4454c45066e2c68c4793dc3c77f9e9
    Closes-bug: #1240583

commit 3e6933ce3f0066933e3d568bb019bb1b997063d2
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Wed Oct 23 09:24:34 2013 -0500

    Instance delete should check for 'DELETED' status
    
    Currently in Instance.py check_delete_complete method is waiting
    for 'NotFound' exception. This change is to wait for 'DELETED'
    state to speed up the resource/stack delete.
    
    Closes-Bug: #1243389
    
    Change-Id: I09712f548f40bb13c2b322550007f5bd30dfb3e2

commit 0c4d305fef89a0d20833f0255c37199dc3de5098
Merge: 8a32e81 8ccbaa6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 25 12:07:51 2013 +0000

    Merge "change neutron to use UpdateAllowed property schema"

commit 8a32e818c3de5e9f0cd8b49d3b11234482658e2e
Merge: 9e92fa8 dbc890e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 25 12:07:48 2013 +0000

    Merge "change alarms to use UpdateAllowed property schema"

commit 9e92fa8b36bd6b02a3f2b6e1ba093ecd0a9d9ccf
Merge: acfc113 09bcc8a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 25 12:07:46 2013 +0000

    Merge "change contrib/ to use UpdateAllowed property schema"

commit acfc113df411713a1f7e63c4625927d5b34bc7e6
Merge: 2ff8d04 2f71ac6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 25 12:05:21 2013 +0000

    Merge "change base resources to use UpdateAllowed property schema"

commit 2ff8d04fa725b2f7be0ef8807cb115a3c07e195f
Merge: 34d3b38 9fd25fc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 25 12:04:33 2013 +0000

    Merge "Support defining update_allowed in the property_schema"

commit 34d3b388c5dbd8a502cc5bc48b2badf0fe3f7baf
Merge: 393760b 93f44a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 25 12:02:14 2013 +0000

    Merge "Stub out unmocked keystone in test_engine_service"

commit 393760bdef73ed49b7c28b51e5984a4cbcbdce03
Merge: c1cca4d fde4160
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 25 10:29:29 2013 +0000

    Merge "Delete deprecated docs/ directory"

commit c1cca4d54ae7f96887b397ce24a9ebb714077418
Merge: a7ac74b fade80f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 25 10:20:59 2013 +0000

    Merge "Tolerate lookup failures in Fn::Select"

commit 14f1d213b898d7717d15923eeff66a8d73c1c9ad
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Oct 25 06:05:39 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I92d6619eaf197e94984f0e7666964dca3457f608

commit a7ac74bb0d2cdd7e99e2f3f2fcd14f1ea71d12e2
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 24 18:08:37 2013 -1000

    use exception str() not .message
    
    This mostly fixes the accesses to .message, there is still the
    translation that is using the .message.
    
    Partial-bug: #1243883
    Change-Id: I709f65e39c017d70eaca5d8f6d06e0227b67e816

commit cda730b4d4b2db229e2dc3d9686d84f8fb412c91
Merge: 4f94b00 5d1942f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 25 04:16:38 2013 +0000

    Merge "Stub out unmocked keystone auth in signal tests"

commit 4f94b00bb082a2525e8b14c367c40d890a38e52c
Merge: 2dcc6ec 66b384b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 25 04:07:28 2013 +0000

    Merge "Fix nested stack test setUp ordering"

commit 2dcc6ec278f91fe342abcc50fcda1696be27371a
Merge: c5e93e6 6a8f787
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Oct 25 03:46:07 2013 +0000

    Merge "Updated from global requirements"

commit 8ccbaa66741e3449d838a7584b903c04dc20d5ac
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 24 16:17:39 2013 -1000

    change neutron to use UpdateAllowed property schema
    
    Partial-bug: #1240583
    Change-Id: If73c678fc0449aca10c273b4521d006d53e0094a

commit dbc890e7b640c614c63dcd2b7d653bf6b6977cb4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 24 16:17:24 2013 -1000

    change alarms to use UpdateAllowed property schema
    
    Partial-bug: #1240583
    Change-Id: Icfa37f99b7e016e805526299b7717283cdb9d82d

commit 09bcc8a448c81661e29eb6b5a19b8689f4dff3ed
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 24 13:19:44 2013 -1000

    change contrib/ to use UpdateAllowed property schema
    
    Partial-bug: #1240583
    Change-Id: I1bf09f10efe7ed47bfa4f0178d29689c9fc71d43

commit 2f71ac6b9391cbdff891baf320d36440ce8fa48e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 24 12:58:19 2013 -1000

    change base resources to use UpdateAllowed property schema
    
    Partial-bug: #124058
    Change-Id: I668de29e1eec34d7499dcc8d435ebe6882c74a4a

commit 9fd25fcc5596091c90ef66493dc05dfeb38f32b3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 24 12:53:28 2013 -1000

    Support defining update_allowed in the property_schema
    
    This has a couple of advantages:
    - docs will be easier to generate
    - everything property related is in one place
    - it's a bit easier dealing with TemplateResources
    - it will allow us to set update_allowed on nested schema
    
    Change-Id: I5e59bc07e51fe4c5d58871cb2adcef7e16f9b2af
    Partial-bug: #1240583

commit 66b384b3907eba70d6e288cf4263f996caa2cb9c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 24 12:49:52 2013 -1000

    Fix nested stack test setUp ordering
    
    This fixes an irrating message during test runs:
    No handlers could be found for logger "heat.engine.environment"
    
    This was because the environment was loading before the fake logger
    was enabled.
    
    Change-Id: I1a40998fe37bf29529ef2eae348c6918bf56966b

commit fde416038a408ea628c9d01581781c6f7391e75e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 24 11:03:11 2013 -1000

    Delete deprecated docs/ directory
    
    I think we have deprecated this directory long enough.
    We have proper getting started guides and api docs on openstack.org
    
    Change-Id: Iaee690046866b98eea9a206dc6f2dca9b9af18b6

commit fade80f76f40c5e838db5b8b54f759364e1e9b4f
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Oct 24 11:22:38 2013 +1300

    Tolerate lookup failures in Fn::Select
    
    A wait condition will return an empty dict for its Data attribute
    until it has been created, however Fn::Select on Data will be evaluated
    before the wait condition is created (for example, during stack-list
    or stack-show). The current error raising of Fn::Select leads these
    operations to fail.
    
    This change results in Fn::Select evaluation behaving in the
    following way:
    - KeyError on dict lookup failure results in empty string
    - IndexError on list index results in empty string
    - Passing an empty string as the value results in an empty string
    
    Closes-Bug: #1243958
    Change-Id: I3b01c8ce5dc56e804016274282d2ee69f539bf40

commit c5e93e6c6b4ede23d4ed73accad262949fe8073d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Oct 23 23:47:59 2013 -1000

    use msg_fmt not message in Exceptions
    
    This doesn't solve the problem yet, but clarifies
    the format string from the final string.
    
    Partial-bug: #1243883
    Change-Id: Ia0f19423248304984cc53926dfb87c6a49c90e11

commit 8c7872e1489baeed40849db6786f924a74cd6149
Merge: 7f0c49e a8af2fd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 24 20:28:16 2013 +0000

    Merge "Use resource_id_set to clear resource ID's"

commit 93f44a2b535f2a22a8e476ec7eaa8f042e2c627f
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Oct 24 01:03:49 2013 -0700

    Stub out unmocked keystone in test_engine_service
    
    Keystone needs to be mocked out whenever stacks may do something that
    triggers authentication. In this case failures to auth would not result
    in a failure of the test because we are not asserting the end state of
    the stack or the list of events we expect.
    
    Change-Id: I401971cfc984bd71c611eae70aeb33b2f5a3c8c6
    Closes-Bug: #1227962

commit 5d1942f85adb75cdf8fcfeb564a195b6e83ae516
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Oct 24 00:59:17 2013 -0700

    Stub out unmocked keystone auth in signal tests
    
    While these tests do setup a mock for keystoneclient, one of the tests
    clears out these stubs before exitting to avoid needing to stub out
    things stack_delete_after will do. However, stack_delete_after will
    trigger a call to keystoneclient which leads to unmocked calls trying to
    reach server.test from inside the tests. These failures go undetected
    because they are after the test, and nothing is checking for error
    events in this phase.
    
    Change-Id: I608e0b5a263587d5151b4cb4ce3f03e289c4bdca
    Partial-Bug: #1227962

commit 7f0c49e742c12cd4730926ec6d67133f94fb94e7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Oct 23 18:47:04 2013 -1000

    Reverse assert arguments so the errors make sense
    
    Change-Id: I2919db71019ee56246eb0398ddc0a3170f17e6b2

commit 6a8f7876f18e3bd6711752ab2432c30cad891e8b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Oct 24 13:15:49 2013 +0000

    Updated from global requirements
    
    Change-Id: I285fd19a324620ef45551d3844719d7c39767f9e

commit d0a82ffd42ada9244a9ebc8b4dc992fda827a9e3
Merge: 2700988 a5f67a6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 24 12:43:21 2013 +0000

    Merge "Prove that a user can't remove global resources"

commit 2700988e03235904345470211c918367a078b24b
Merge: fe8a6a0 a03e3cb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Oct 24 10:08:46 2013 +0000

    Merge "Imported Translations from Transifex"

commit fe8a6a0e577cc3441df0bc1260a8f107c6f435e2
Merge: f384a58 3bf5177
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 24 10:08:09 2013 +0000

    Merge "change assertEquals to assertEqual"

commit a5f67a63d046104486e7feed6fae8f2f4f90e0a9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 24 00:06:59 2013 -1000

    Prove that a user can't remove global resources
    
    This is obvious looking at the code, but if someone ever
    reworks it, then we will need this test case.
    
    part of blueprint exclude-resources-option
    Change-Id: Ic04b09597ca5d401fcd40ce9241f12c2f7fca04c

commit a8af2fd844fd70676c2cf11a8c56a4569d84d863
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 24 10:47:58 2013 +0100

    Use resource_id_set to clear resource ID's
    
    self.resource_id = None is used in several resources, which is wrong,
    we should be explicitly updating the resource_id in the DB via the
    resource_id_set function.
    
    Change-Id: I41e1326fe7e1da364c8e6dd68f572df484beffb3

commit 6fcac80ef67e879eecc0d67f1b4d064caaf37097
Author: Svetlana Shturm <sshturm@mirantis.com>
Date:   Thu Oct 24 13:44:02 2013 +0400

    Fix sqlalchemy migrations
    
    This patch only fixes sqlalchemy migrations:
    - add InnoDB engine and utf-8 for all tables,
    - using of more appropriate exceptions,
    - fix logic and syntax errors.
    
    Partially implements bp: db-sync-models-with-migrations
    
    Change-Id: Ifdc4abe06f8cd0e01e13b003ea30d1e402c9e8ba

commit f412a1aa2664cece5625f806322876efb00951d7
Author: Alexander Gordeev <agordeev@mirantis.com>
Date:   Thu Sep 19 15:52:12 2013 +0400

    Fix sqlalchemy models
    
    This patch only makes sqlalchemy models to reflect the actual state of database
    
    Partially implements bp: db-sync-models-with-migrations
    
    Change-Id: I2fa2bc2f0c2b08f69bf7217dc35683d2edbedd26

commit 3bf51777827c85c073f7fe5446124f9e2db4c3d7
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Oct 24 07:41:22 2013 +0200

    change assertEquals to assertEqual
    
    According to http://docs.python.org/2/library/unittest.html
    assertEquals is a deprecated alias of assertEqual.
    
    Change-Id: Ic65fb8fad923adc04d90ea9622b23a2ae8290a3a

commit f384a58ae2b615f20e3507f6046f4304ca3e26cc
Merge: 80c742c ec0bb8d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Oct 24 06:36:34 2013 +0000

    Merge "Updated from global requirements"

commit a03e3cbd5745e4de7569d7b2a29579e11bc6aa6f
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Oct 24 06:05:39 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I7b20f835a178827847b5cf338d67bf2348e3c876

commit 80c742c7adbf058d35fa080ace20bc7f7efc6240
Merge: b60e4a7 4dc987e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 24 04:22:04 2013 +0000

    Merge "Repeat Ceilometer alarm actions by default"

commit b60e4a7cc17e803de340b6cb5f143e70b2ef1ce3
Merge: 5ba7d6e 8ce5e0f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 24 04:21:27 2013 +0000

    Merge "Allow plugins to be specified as a cloud_backend"

commit 5ba7d6e311b87af57ce4b741279128c5b2b5d173
Merge: 722af85 152b770
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 24 03:51:24 2013 +0000

    Merge "Add rebuild to OS::Nova::Server"

commit 722af85aa14e385c3543c394845d6e6dabdb91f3
Merge: f3e40dd 037df70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 24 03:46:47 2013 +0000

    Merge "Refactor Nova server resizing to be self contained"

commit f3e40dd140889482c896d9b7c3bc5287f4ccccdd
Merge: 27b96d4 8bde894
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 24 03:34:46 2013 +0000

    Merge "Allow user_data to be passed without modification"

commit 27b96d4f8ab25171c2d8255093f1b58cfc72f21d
Merge: 3e53c8e f5b7b16
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 24 02:39:57 2013 +0000

    Merge "Document security group properties"

commit 8bde8948cc60258c13c8487b7ee5599539ed102f
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Oct 21 10:20:23 2013 +1300

    Allow user_data to be passed without modification
    
    Although heat's agent tooling is heavily dependent on cloud-init, some
    users will want to orchestrate servers that are not cloud-init enabled.
    They may use their own agent, or a user_data which is executed as a
    script on boot. Possibly the user will also want to specify #cloud-config
    user_data explicitly.
    
    This change adds the property 'user_data_format' to OS::Nova::Server
    with the available options 'HEAT_CFNTOOLS' or 'RAW'.
    
    The following OS::Nova::Server resource snippet was successfully
    executed on a cirros image (which does not support cloud-init)
          user_data_format: RAW
          user_data: |
            #!/bin/sh -v
            echo foo > /tmp/bar
    
    This change is completely unrelated to any software configuration
    related blueprints, however the property user_data_format has the
    potential of supporting more values in the future.
    
    Implements blueprint raw-user-data
    
    Change-Id: I27571620b4fc74a9f82d12a2f754037c00ad81ff

commit 152b770bb378cb62a2c9d503e8cb5e957cc8978b
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Oct 22 11:43:43 2013 -0700

    Add rebuild to OS::Nova::Server
    
    Nova has support to rebuild an instance so that it keeps the same
    instance id and address. This is particularly useful for doing image
    based updates to servers without incurring additional cost to create new
    servers and then delete the old ones.
    
    We still default to replacing, and add a new policy called 'REBUILD' for
    the times where we want a resource to be rebuilt on image updates rather
    than replaced.
    
    blueprint nova-server-rebuild
    
    Change-Id: If0033f52912e939048b5ebc1ee2e30f67d225f34

commit 037df7043cb080e94d4c3b4fda007896c332a856
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Oct 22 11:35:16 2013 -0700

    Refactor Nova server resizing to be self contained
    
    The split between calling server.resize() and check_resize() makes
    it more complicated to add other tasks that can be done in parallel
    with other servers' tasks. By making a resize method which is self
    contained we simplify the addition of rebuild in a subsequent patch.
    
    Change-Id: I0490476dbef30571e90b88163fc8ca0670458682

commit 4dc987eff3a6963706253a7007c794ca75326d2e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Oct 23 07:33:45 2013 -1000

    Repeat Ceilometer alarm actions by default
    
    The policy actions assume repeat_actions=true.
    
    For the situation when cpu is high even when a new server is added.
    Here we would expect yet-another server to be added but what currently
    happens is the alarm will be stuck in the alarm state, but with no
    further actions.
    
    We need a default that it sane.
    
    Closes-bug: #1242168
    Related-bug: #1223347
    Change-Id: I4c6a084076a0cc01ebd0d7431d3fac559161e947

commit 8ce5e0f88edecd3ab1d58136ebfac7543938d80f
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Mon Oct 21 16:12:54 2013 -0700

    Allow plugins to be specified as a cloud_backend
    
    Currently, the cloud_backend configuration option can only use modules
    imported in-tree before clients.py is imported. This does not work for
    plugins because they are dynamically imported in
    heat/engine/resources/__init__.py after clients.py is imported. Change
    the cloud_backend module to be specified when the client class needs
    to be initialized rather than when clients.py is imported. This change
    requires a class to be specified for the cloud_backend rather than a
    module name.
    
    Change-Id: I8f2b93bfb6a9585d1e7dc52d70092105b6e1bfaa
    Closes-Bug: 1242870

commit 3e53c8ee13d4c65db3f6bedef4df5403204381c8
Merge: 4c7e780 87ff94e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 23 16:08:16 2013 +0000

    Merge "Document network interface properties"

commit ec0bb8d3c696da20bb116bc859590b3df5be999e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Oct 23 14:35:43 2013 +0000

    Updated from global requirements
    
    Change-Id: Iee8b257726188973e9b7df6c7ae7c402bfdb2877

commit 4c7e780bff8b9c4c6642351ea3dde38751e03eaa
Merge: 78a8a7e 6931a96
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 23 11:40:30 2013 +0000

    Merge "Correct misleading template guide Ref example"

commit 78a8a7eff11469916fbc5891e32ff5695525cfa5
Merge: 39494e9 407d1f8
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Oct 23 11:02:00 2013 +0000

    Merge "Imported Translations from Transifex"

commit 39494e92aec158e91543a8e84aa712e0e0273519
Merge: 4d5065e a59f58a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 23 10:08:35 2013 +0000

    Merge "Document vpc properties"

commit 4d5065e49fbc92a34f0614ead4b24b75d920cf67
Merge: 09481c6 0801c23
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 23 07:11:37 2013 +0000

    Merge "Document subnet properties"

commit 407d1f829af0e2fc74a8da99e9b0700f861757ef
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Oct 23 06:05:50 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ie945de0849cbcadd0b1f9675056c845a080caee8

commit 09481c6e3369f3e17fa16175790578acf57e04e7
Merge: 959b8bb 2fdda21
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 22 14:56:04 2013 +0000

    Merge "Document route table properties"

commit 2fdda2144cdce6bbccaf21c61489817f820a8a65
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Oct 21 15:12:04 2013 -0400

    Document route table properties
    
    AWS::EC2::RouteTable
    AWS::EC2::SubnetRouteTableAssocation
    
    Change-Id: I8e9651495e9f03a50fd5a4636fffd8f7c2307669
    Closes-bug: #1224147

commit 959b8bbd3a020dbf9e84bc4c8704c2ccf9cfcd82
Merge: cb57037 90e29ea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 22 08:09:56 2013 +0000

    Merge "RS LoadBalancer should return its ID as Ref"

commit cb5703719f2825e93a5aee6c8308f4cf185dd2d2
Merge: 4382fbe bf465d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 22 06:47:24 2013 +0000

    Merge "End doc sentences in a consistent way"

commit 90e29eaf46dd90895a4f35da6e0d9e772290a0e3
Author: Christopher Armstrong <chris.armstrong@rackspace.com>
Date:   Thu Oct 17 21:56:22 2013 +0000

    RS LoadBalancer should return its ID as Ref
    
    Previously the Rackspace::Cloud::LoadBalancer resource returned the name as
    its reference ID. This patch reverts this to the default resource behavior
    of returning the resource ID if available, and then falling back to the
    name. Otherwise there is no way to access the ID of the load balancer,
    which is necessary for other Rackspace APIs, such as Rackspace Auto Scale.
    
    Closes-Bug: #1241194
    Change-Id: Ib5ca296b338e912daa8c3dc1c71fc3e994a0156e

commit 4382fbe868bd60b9fa710ac4e29512858af947e8
Merge: 0071dfc f915b1b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 21 20:58:38 2013 +0000

    Merge "Add support to disable resources"

commit 0801c231e9acc81b6f8070cf1210014ab9322980
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Oct 21 15:39:41 2013 -0400

    Document subnet properties
    
    AWS::EC2::Subnet
    
    Change-Id: I5270cc5203dbb13538413db27640609e8b113f19
    Closes-bug: #1224151

commit 0071dfc3a2f4b5ff0a35cbf467ac47f725b33de2
Merge: daa8d6c fc44c3c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Oct 21 20:13:36 2013 +0000

    Merge "Updated from global requirements"

commit a59f58ad53a07de50cf561c0c1a61aeb072ef5be
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Oct 21 16:06:11 2013 -0400

    Document vpc properties
    
    AWS::EC2::VPC
    
    Change-Id: I2ee6adfa9639f2e99636f0097dff904facd1593d
    Closes-bug: #1224159

commit bf465d2d0df44b4f163ba9c73c6b0222804b54bc
Author: Sahdev Zala <spzala@us.ibm.com>
Date:   Mon Oct 21 14:53:46 2013 -0500

    End doc sentences in a consistent way
    
    During the doc review for resources we decided to go with the convention
    of ending sentences with full-stop. This patch takes care of few missing
    places.
    
    Close-bug: #1226841
    
    Change-Id: I18ccc6b20273d44b3378e9ffa35515976eda1b32

commit f5b7b160cdd17cad8fbc3c3fc02aa4c792bb63fb
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Oct 21 15:22:48 2013 -0400

    Document security group properties
    
    AWS::EC2::SecurityGroup
    
    Change-Id: I92e602159efc3e877d084827ab5cbf9cdd4cabdf
    Closes-bug: #1224149

commit 87ff94ea244a1e504e6ce723a32fd04d6525a57c
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Oct 21 14:35:58 2013 -0400

    Document network interface properties
    
    AWS::EC2::NetworkInterface
    
    Change-Id: I7c74096c68df319cc3d2e3d918c8e9d0e458e2c1
    Closes-bug: #1224146

commit daa8d6c216c86d75687030b4d30863ae5c8d3506
Merge: afd761d b61cd62
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 21 18:14:22 2013 +0000

    Merge "Add granularity option to purge_deleted"

commit f915b1b33fedc225b7758e291b421d47c8cd555e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Oct 21 07:24:02 2013 -1000

    Add support to disable resources
    
    To remove a resource, you add the following to the global environment:
    
    resource_registry:
      'AWS::*':
    
    implements blueprint exclude-resources-option
    
    Change-Id: Ia7c6c78ad3c1850ea20dd942d8d52957b5ad2b11

commit afd761d4e75ddbe382d63e50eca10563cf458b08
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Oct 21 10:40:39 2013 -0400

    Move db_sync into the sqlalchemy DB api.
    
    heat-manage db_sync is currently broken because
    heat is trying to use two backends with the Oslo DB
    api which is configurable via heat.conf where only
    a single DB api can be specified.
    
    Currently this defaults to:
    
     #The backend to use for db (string value)
     #db_backend=heat.db.sqlalchemy.api
    
    To fix things we:
    
    1) merge heat/db/migration.py into heat/db/api.py.
    
    2) Add db_sync and db_version calls to heat/db/sqlalchemy/api.py
      which call into the functions in heat/db/sqlalchemy/migration.py.
    
    3) Remove the old heat/db/migration.py module (no longer needed).
    
    In the process we also move the INIT_VERSION constant into
    heat/db/sqlalchemy/api.py where it is actually used
    anyway. (it probably shouldn't have been in the higher level
    migration module to begin with)
    
    This should fix SmokeStack which stopped working last Wednesday
    with a05dc4b9cdf348ca1ec414fd505256a6760ad17c
    
    Also,
    Closes-bug #1241865
    
    Change-Id: I50d489531056016c762bd3be047e3a129cbee4f8

commit 6931a96a14ddfce9d7bc3cccd0142c2ea44fc48b
Author: Sahdev Zala <spzala@us.ibm.com>
Date:   Mon Oct 21 10:12:02 2013 -0500

    Correct misleading template guide Ref example
    
    Currently the template guide example of return value for reference shows an
    arbitrary string, this patch repalces it with an appropriate return.
    
    Change-Id: Iacea741456640e3cd6ce72c6a616c87ae79334bb
    Closes-bug: #1226798

commit b61cd62db672bda60dc194ad6c3326ae4737f973
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Sat Oct 12 16:08:05 2013 +0800

    Add granularity option to purge_deleted
    
    Allow users to choose how many days, hours, minutes, or seconds to preserve
    deleted data.
    
    Closes-bug: #1237195
    
    Change-Id: I9227f5bf53c5b099a7a691a49c4ff2f5f0662098

commit 999066cb8e4a75315ec6177bd9301e54366bc28a
Merge: 7e785c0 424ca9b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 21 11:43:20 2013 +0000

    Merge "Catch all yaml exceptions"

commit 7e785c04ebb55c70761b76257159d2e4de2a8124
Merge: 434017d 9bf6aec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 21 11:25:37 2013 +0000

    Merge "Make the template and env yaml parsing more consistent"

commit 434017dd6882090897abf32a8823302273400202
Merge: e962ebf a5e156f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 21 11:25:30 2013 +0000

    Merge "Add a test for TimeoutInMinutes accepting a str int"

commit e962ebff68364d3e56fb8792ef4e433bed647f59
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Oct 21 06:05:32 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Id2d5ec30a4ab3dd9b438f0c3c3f98ba5a94d886c

commit fc44c3c1f1e47ec41f585a59ece02a8dfe8ec399
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Oct 19 23:58:54 2013 +0000

    Updated from global requirements
    
    Change-Id: I0ab34155b2e0cc1eb765b67d148ab5514d72db10

commit a5e156f44b9e8d1be65b0bd6cdb9a8990f531e86
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Sat Oct 19 12:04:04 2013 -1000

    Add a test for TimeoutInMinutes accepting a str int
    
    The nested stack resource should accept a number as a string
    for TimeoutInMinutes.
    The actual fix has been fixed by: https://review.openstack.org/#/c/52564/
    but this just proves it.
    
    Change-Id: I769a34eb536177b405a585158df383bbd3021cf9
    Partial-bug: #1240903

commit 424ca9b6327f087f4b819159d3ba3ceae50556d1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Sat Oct 19 10:43:40 2013 -1000

    Catch all yaml exceptions
    
    Instead of catching 2 specific exceptions, rather catch the generic
    YAMLError as the documentation suggests:
    http://pyyaml.org/wiki/PyYAMLDocumentation#YAMLError
    
    Closes-bug: #1242155
    Change-Id: I840d5eccafcc576d7a0022d81e5bc50af2d77803

commit 9bf6aec99ac490fce1af2ea92bea57b7d1e9acd9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Sat Oct 19 10:45:22 2013 -1000

    Make the template and env yaml parsing more consistent
    
    in the environment_format.py use the same yaml_loader
    
    Partial-bug: #1242155
    Change-Id: I66b08415d450bd4758af648eaff0f20dd934a9cc

commit 4d4be749eba51cd5b6dcddd08f88d2c554559e33
Merge: 1205d68 7c14ecb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 19 18:50:43 2013 +0000

    Merge "Fix incorrect indentations found by Pep 1.4.6+"

commit 1205d68177a4e9214069de5f825ebc1dc3514459
Merge: 63d6451 d72a813
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Oct 19 18:50:25 2013 +0000

    Merge "Updated from global requirements"

commit 63d6451c5d7eeba198da2768658db89a0c9c034a
Merge: ec1b971 f6e38b4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 19 18:50:18 2013 +0000

    Merge "Use "python -m coverage" instead of coverage cli"

commit ec1b9719fdf2f5633f3dc55d0079eadf86a63e46
Merge: b2f7a98 f876b6b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 19 16:32:59 2013 +0000

    Merge "Wrap engine exceptions in _()"

commit b2f7a9871d531c11546e9ce3124ac5cf2001c980
Merge: 519def3 ee53eea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 19 16:25:33 2013 +0000

    Merge "Allow RS LoadBalancer resource to have no nodes"

commit 519def38a04a38a02bb4c3a990c7791803072864
Merge: edda3e2 6ad4f5c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 19 16:08:20 2013 +0000

    Merge "Prevent urlfetch from returning encoded chars"

commit d72a813d4bd63c16a9099c895ccffe08175583fc
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Oct 19 15:37:54 2013 +0000

    Updated from global requirements
    
    Change-Id: I7ad1f50d902e50bd9a836a57c261134eb405c730

commit 7c14ecb554fc4af69c681ebcb78eb3ca83758241
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Sat Oct 19 12:23:58 2013 +0200

    Fix incorrect indentations found by Pep 1.4.6+
    
    Pep 1.4.5 had several bugs with checking indentation of
    hanging and nested sets. Fix fallout.
    
    Change-Id: I68878b597e138ecec2d7008380e3a9d2140d0bee

commit 6ad4f5c9ad46c049dcf98909bb13429f152b971f
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Thu Oct 17 10:14:43 2013 -0500

    Prevent urlfetch from returning encoded chars
    
    raw.read() is returning unprintable characters.  Iterate over the
    decoded characters instead.
    
    Closes-bug: #1240289
    
    Change-Id: Ifa61dcc34286f2203407c657b5eb5ee2a099744d

commit edda3e24d4d0833eef5976ca3b6863882bd3bd42
Merge: daf2a4f f773d9f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 18 16:55:58 2013 +0000

    Merge "Revert "Don't install EPEL rpm on CentOS 6.4""

commit f6e38b40402225f689221489fdd5b8f739778166
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 18 17:29:31 2013 +0100

    Use "python -m coverage" instead of coverage cli
    
    As requested by the Debian package maintainer, this makes the
    coverage report work more easily on Debian/Ubuntu
    
    Change-Id: Ibed9e164c89543b679393ee18ccdb4a15bdea6d7
    Closes-Bug: #1241330

commit daf2a4f986afcf7980f2e7dcda54b538fd0c8aff
Merge: 03ca0ad 5e9ed5e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 18 15:02:42 2013 +0000

    Merge "Wrap common exceptions in _()"

commit 03ca0adbd74f81d6bbbe9fde96f4e0f5057475d8
Merge: f29974b 6895615
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 18 15:02:40 2013 +0000

    Merge "Wrap api exceptions in _()"

commit f29974bba41d0337ad161d90d22ece082cb34516
Merge: 35c4e42 a3bb8dc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 18 14:50:42 2013 +0000

    Merge "Convert str passed as Numbers/Integer to numbers"

commit 35c4e42cd09479c0b77deff77be1bd5f2c713b26
Merge: 244a197 33e5737
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 18 14:08:01 2013 +0000

    Merge "Stop using openstack.common.exception"

commit 244a197f38083f3dcd3ab0680189c844e5ad67d7
Merge: 1e2bef2 a05dc4b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 18 14:06:20 2013 +0000

    Merge "Update openstack.common.db"

commit 1e2bef21a4094676ba95322d2714ae36bcd01c01
Merge: 8903410 2be22a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 18 11:16:53 2013 +0000

    Merge "Add requests library to requirements.txt"

commit 890341080fc9e672dcdfdfac895f5c038d03d555
Merge: 36cacaf cdccb7e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Oct 18 10:12:12 2013 +0000

    Merge "Imported Translations from Transifex"

commit 36cacafada0a98fe38b8fcdb8829dfb2e212fb98
Merge: a1ad083 87f976b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Oct 18 10:09:35 2013 +0000

    Merge "Updated from global requirements"

commit 33e5737658815fa54fbff26db08ad59a7de96379
Author: Julien Danjou <julien@danjou.info>
Date:   Wed Aug 7 17:14:02 2013 +0200

    Stop using openstack.common.exception
    
    The openstack.common.exception has been deprecated and removed from
    oslo-incubator. Therefore, Heat should follow the recommendation and
    stop the usage of this file altogether.
    
    Change-Id: I0364da262d956cecea7b77ebc40ead8ece224828
    Closes-Bug: #1208734

commit a05dc4b9cdf348ca1ec414fd505256a6760ad17c
Author: Julien Danjou <julien@danjou.info>
Date:   Wed Oct 16 11:02:16 2013 +0200

    Update openstack.common.db
    
    This updates the openstack.common.db part of Oslo so it stops using
    openstack.common.exception. The openstack.common.exception is now
    deprecated and has been removed from oslo-incubator.
    
    Change-Id: Ic6ef0e698e5060614859bc3894eb71524c8fce21

commit cdccb7e96cd333ebb78e504a839b45b8cd428cfa
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Oct 18 06:05:14 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: If5a5de2d122ffac06ef6355dadeb4f02bf07f3ee

commit a3bb8dc6e9ee916c1e72b3b99e25685c8b2cad0c
Author: Christopher Armstrong <chris.armstrong@rackspace.com>
Date:   Fri Oct 18 02:24:14 2013 +0000

    Convert str passed as Numbers/Integer to numbers
    
    Previously, if a number-in-a-string was passed as a Number or Integer
    property, it would be validated as correct but not be converted to
    an integer (it's clear that the code intended to do this but had a trivial
    bug).
    
    Unfortunately, making this change causes some backwards incompatibility.
    
    - Previously, an AllowedValues field could have strings in it, e.g.
      ['1', '3', '5'], and this would work if a string was passed as the
      real value.
    - Resource code that relied on users accidentally passing strings
      instead of numbers will now break, since it will actually be
      receiving real numbers.
    
    You can see evidence of this in the tests I had to update
    elsewhere. I don't believe any existing Heat resources are affected
    by this, but it is possible that there are some templates out there
    that will break.
    
    Change-Id: I879545cae5ca52f485803a8e172c5484f3920b67
    Closes-bug: #1241276

commit f876b6b175d7893c1b7001d26c225b6100c0930e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Oct 18 11:23:49 2013 +1100

    Wrap engine exceptions in _()
    
    Change-Id: Id68baa3542ec2804169a4411a9b6962a96487ec3
    Partial-bug: #1199695

commit 5e9ed5ed5fe413787c124da146ba52a2bcfdf4ea
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Oct 18 10:43:43 2013 +1100

    Wrap common exceptions in _()
    
    Change-Id: Idb7aabc1dbabc0bbcb9b8b3892372059024c55c3
    Partial-bug: #1199695

commit 6895615582c4d868c589736993c4cdbd03f05116
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Oct 18 10:40:41 2013 +1100

    Wrap api exceptions in _()
    
    Change-Id: Ie9a60d919b3657ae23fe2f8c67d18d21f571af14
    Partial-bug: #1199695

commit a1ad08354b259af047bf1428a6344e72ae53e195
Merge: 960cfa5 690c034
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 17 23:19:31 2013 +0000

    Merge "Updates OpenStack Style Commandments link"

commit 960cfa542ce2404a5dc95a93956fac5e2e9ce44a
Merge: 6718bb2 9819faa
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Oct 17 23:17:41 2013 +0000

    Merge "Imported Translations from Transifex"

commit 6718bb20aa32b66abd60223987b5cd5f1e8c36de
Merge: 367829e 2a43f0b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 17 23:17:39 2013 +0000

    Merge "Provide more tests for DB APIs"

commit ee53eeac073c4eb7651e7e1642ff8175f99ef219
Author: Christopher Armstrong <chris.armstrong@rackspace.com>
Date:   Thu Oct 17 22:29:29 2013 +0000

    Allow RS LoadBalancer resource to have no nodes
    
    It should be possible to create Rackspace load balancer with no nodes
    now. There was an incidental bug in the way that the resource constructed
    the node list that would prevent this.
    
    Note that it won't be possible to actually use this to create a nodeless LB
    until a new release of pyrax is made, but this change should be harmless enough
    to be merged before that.
    
    Change-Id: Icb9b50899cc13094e295280f89090def30cb4155
    Closes-Bug: #1241221

commit 87f976b528cf3c59cd1ea26c26f8e32ba808f205
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Oct 17 22:21:57 2013 +0000

    Updated from global requirements
    
    Change-Id: I17fd37a294f83775d8b39464d6e6f073230a756c

commit 367829ed4e6b643c2bd6828ce8291ff9ec4eb09c
Merge: 8ef3f55 39f2018
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 17 21:39:17 2013 +0000

    Merge "Remove spurious traceback in test"

commit 8ef3f556373351781bac7bd8c57c26f8b2e14e9c
Merge: e646640 926993d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 17 21:23:48 2013 +0000

    Merge "Allow flavor and image names in CS resource"

commit e6466403e22e283a7ff7691fbf209d5f867d3ee7
Merge: 844ce60 6c52d48
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 17 21:21:43 2013 +0000

    Merge "Make Autoscaling update policy tests faster"

commit 2be22a78c9293fad1fc48b0257db66ae3309ac65
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Thu Oct 17 16:04:25 2013 -0500

    Add requests library to requirements.txt
    
    Heat uses requests in a few places and is currently relying on the
    python-*client dependencies to pull it in.  If the python-*client deps
    stopped using requests, Heat would break.
    
    Change-Id: Id1a0717836d2441dda33adfda3092d3004265f4a

commit 844ce60cf262a715bad4bcbf0b8ce09f49101cbf
Merge: 6183ee9 2b6acde
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 17 20:59:26 2013 +0000

    Merge "Remove a buggy method in sqlalchemy.api"

commit 6183ee94e0bfc784c84a4045a6377f1c31ffaa49
Merge: 4603a7a ed0fea6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 17 20:57:05 2013 +0000

    Merge "Implement native Nova keypair resource"

commit 2a43f0b87c861c1821a93495c488cd6d5a7b9544
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Oct 16 17:05:59 2013 +0800

    Provide more tests for DB APIs
    
    Closes-bug: #1217941
    
    Change-Id: I40e55a108fc09e89092ad0edecd9947240be902e

commit 6c52d48559f00e65e325d525f701cf7eb1090d80
Author: Thomas Herve <th@rackspace.com>
Date:   Thu Oct 17 08:47:59 2013 +0200

    Make Autoscaling update policy tests faster
    
    The tests for the update policy implementation in autoscaling and
    instance group were relying on wallclock time, making them unusually
    slow. This patch improves the situation a bit by stubing time calls.
    
    Change-Id: I23ba12a4191595a398b06a3dd8d6de15721c9696

commit 39f201806a70a3ab1b5f9d622e5bad077908ca1a
Author: Thomas Herve <th@rackspace.com>
Date:   Thu Oct 17 12:01:45 2013 +0200

    Remove spurious traceback in test
    
    One of the engine_service test displays a traceback for no good reason
    in the tests. Cleaning up the stack created in the tests removes it.
    
    Change-Id: I683e3318f5970c836118e99301079faff894e25d

commit 2b6acde661c24a38816fd0b7bdb2c695c454c4ee
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Thu Oct 17 16:19:54 2013 +0800

    Remove a buggy method in sqlalchemy.api
    
    watch_data_delete tries to retrieve session object from a result set instead of
    managed objects. Further, from the name of the method, the intention seems to
    remove watch data associated with a given watch rule, but it would actually
    remove all watch_rules having the given watch_name. Though it would not succeed,
    if there is any associated watch data.
    
    Since this method is not referenced anywhere in the entire project, it might be
    better to just remove it for now.
    
    Change-Id: I7a66f336a2a33b4a941df85910f29c3cfb2c816f

commit 9819faa5a7def29082a5f06edbf02243d9310a20
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Oct 17 06:05:33 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9bcbe481fe8342ee37bbce44990d8fa37787e278

commit 690c0341b40b4f76039b4a8fa4227ead078bd34f
Author: Keshava Bharadwaj <kb.sankethi@gmail.com>
Date:   Wed Oct 16 16:06:03 2013 +0530

    Updates OpenStack Style Commandments link
    
    The current link in the HACKING file is broken. This references the
    correct location for contributors to view.
    
    Change-Id: I9edc768bca825534771d79082e7824befa51e1b8

commit 4603a7ab5dec90add7deb1d0dfb3e41eaeab307a
Merge: 6d67fd8 bb4105d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 16 10:16:26 2013 +0000

    Merge "Fix regression in DBaaS tests"

commit 6d67fd83c70f3db4b739a235fc70a61dcc7e4276
Merge: 94b3b4b 782c5d9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 16 10:16:08 2013 +0000

    Merge "Validate template parameter attributes"

commit 94b3b4b88acb68c1598abfef8843279162d288c7
Merge: ec4d284 5670ee7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 16 10:12:38 2013 +0000

    Merge "Ignore H803 from Hacking."

commit ec4d2840e01bdc92800fd102bc0c2ba6564f1b8f
Merge: e37a9b0 3342df0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 16 10:12:35 2013 +0000

    Merge "Don't allow updates when another action is in-progress"

commit e37a9b0d3a1b47182de52a60fe33482a093ced65
Merge: 8bdc663 8e5229c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 16 10:12:28 2013 +0000

    Merge "Do not attempt a stack update when it is suspended"

commit 8bdc66343a7709eaff996a3862f4f4584362d393
Merge: da6b78c 9bd0841
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Oct 16 10:07:42 2013 +0000

    Merge "Imported Translations from Transifex"

commit da6b78c36d3023be24bcdd3a9b919bd7b1f43eef
Merge: 3da6d4d 553d067
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 16 09:59:39 2013 +0000

    Merge "Enable exception format checking when testing"

commit 9bd08411112143368f6507fe22b7e99383ce7dd8
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Oct 16 06:05:23 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I3448b120dba335d523bd3845373cf50da8405838

commit 3da6d4d8a97ebdeb6e24535e8560ea9dcecc5869
Merge: 3dc2ce0 4582a1a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 16 02:59:48 2013 +0000

    Merge "Migrate to Oslo DB 96d1f887dda Part 3"

commit 3342df0534ba541085eb475ea66b483850767d80
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Oct 16 11:21:46 2013 +1100

    Don't allow updates when another action is in-progress
    
    It doesn't make sense to do this, and will lead to a really
    confused state.
    
    Change-Id: I8681a3f0023a91bed4fac246fe37a131b07aefe2

commit 8e5229ca453178f395804933b530ffce1e5dc31e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Oct 16 11:21:08 2013 +1100

    Do not attempt a stack update when it is suspended
    
    And in any state (inprogress, complete, failed).
    
    Closes-bug: #1234242
    Change-Id: Ic0bccfa3d3d98cb41d0f5228d8cdc164c5c1fd32

commit ed0fea629440c694c2a6e953c0f157eed7bbc4b7
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Thu Sep 26 11:50:37 2013 -0500

    Implement native Nova keypair resource
    
    Implements: blueprint native-keypair-resource
    Change-Id: I51b7a5cc5091c9f0c81552533e0f424cc3705b6f

commit 3dc2ce01de2e57cafea48c993e1338cae60ee00f
Merge: 46e4bc0 081e504
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 15 16:36:19 2013 +0000

    Merge "Pass errors from *_format.parse() to the caller"

commit 46e4bc0828135134fd90ed50f86c8d732f5358a1
Merge: 6e4d8fb 54e5260
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 15 10:21:16 2013 +0000

    Merge "Add log_handler to implement the publish_errors config option"

commit 6e4d8fbcee7b2851e90f79ab797d5e63cfa84dc6
Merge: 6f26ac6 fc1d5d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 15 09:51:36 2013 +0000

    Merge "Allow DependsOn to accept a list"

commit 926993d920bf217572393ce7dfca9604e1c55073
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Mon Sep 30 20:39:09 2013 -0500

    Allow flavor and image names in CS resource
    
    Closes-Bug: #1236962
    Change-Id: I2af3fb1d50badcc6bf89719cfa377356821191f7

commit 5670ee7afb8f35312410b797eca1770bf85108c2
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Oct 14 21:11:56 2013 -0400

    Ignore H803 from Hacking.
    
    H803 checks for a period in commit messages, something the community
    clearly rejected as a sensible check: periods in commit messages
    should neither be rejected or required.
    
    Change-Id: I754e10ca01b3e6f8c6482e1bcd4c2e2ca8c1cfc9

commit 553d06703577e971bd52e1ade4ecb483e4a8eb54
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Oct 14 16:20:39 2013 -0400

    Enable exception format checking when testing
    
    Enable FATAL_EXCEPTION_FORMAT_ERRORS so that we are checking
    exception formats while testing. This should help guard against
    exception format errors when testing.
    
    Change-Id: Ia21ad019d185a520e3425846fc3d0a1e70efea10

commit 782c5d939abe980585c5f549b956f1565408d004
Author: Sahdev Zala <spzala@us.ibm.com>
Date:   Sat Oct 12 22:32:45 2013 -0500

    Validate template parameter attributes
    
    Validate that template parameter is provided with at least one attribute.
    
    Closes-Bug: #1227061
    
    Change-Id: I5e245556c21a1ea800eb9e0346f3b2414ad56183

commit bb4105da37268fe03fc097db0cc5b558f61f3bea
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Mon Oct 14 17:51:17 2013 -0500

    Fix regression in DBaaS tests
    
    Change-Id: I4855c3254b7267ce34f3450be0290a0ce362f6f5

commit 6f26ac6e7075a25ff2fc9b9bf03e4fcd3fb255a5
Merge: 749f536 a7cc2a9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 14 19:09:33 2013 +0000

    Merge "Add keystone_authtoken section into the heat.conf.sample"

commit f773d9f560f88cfb1b55fffbd0dbc900a3628892
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Mon Oct 14 12:48:31 2013 -0500

    Revert "Don't install EPEL rpm on CentOS 6.4"
    
    This reverts commit 09f4ff95f40290978b0b0ae17ebc110e9a0fb804.
    
    The EPEL rpm issue was a temporary problem with Rackspace's images.
    
    Change-Id: Ic891c9be13ca99351214133fcbb41f0b42b5a333

commit 749f536af72ea9ced56e90ebb67bda8c56f339f3
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Oct 14 06:05:21 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia2a7f4a7d4a79890b20adeb2d50314c3791727af

commit fc1d5d250f7498ac298667e4528b831429a9dd57
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Oct 14 13:00:13 2013 +1100

    Allow DependsOn to accept a list
    
    http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-dependson.html
    
    Change-Id: I8187d8a0395cc96d9727aa812d57f281e69c516d
    Closes-bug: #1235496

commit 54d709d7501340c3fac9d42aa94b9fdf3d54e728
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Thu Oct 10 13:05:21 2013 +0800

    Add property port_id to RouterInterface
    
    Since neutron router-interface-add api supports subnet_id and and
    port_id so we should support it in heat resource RouterInterface.
    
    Fixes bug #1223733
    
    Change-Id: Ib0d7ffa3c478747a91b70beab4a78eadf7c9dfcb

commit 54e5260fca5f1a2f7e9b7f4efd1433477e75f0a9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 10 14:55:23 2013 +1100

    Add log_handler to implement the publish_errors config option
    
    This handler sends all error logs as rpc notifications.
    Note: when using publish_errors you also need to set the
    notification_driver option too.
    
    Change-Id: I9ceb1fa92118161779b4b29e2cdc3b91f79ab733
    Closes-bug: #1229246

commit a7cc2a90d7f96eb6f33edb71bf11630a3db3a818
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Oct 11 13:36:46 2013 +1100

    Add keystone_authtoken section into the heat.conf.sample
    
    We support (and need) this section, now that oslo config generator
    supports external modules lets add the section into the sample.
    
    Change-Id: I3f7f614906204fa2e5a743c62882d2dcf196640a

commit 081e5046734162bd4576b6477dbb6f2c486ebacf
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Oct 14 09:47:46 2013 +1100

    Pass errors from *_format.parse() to the caller
    
    This gives the user a nice helpful error message, something like:
    
    ERROR: Template not in valid format: while parsing a block mapping
      in "<unicode string>", line 2, column 3:
          KeyName:
          ^
    
    
    Change-Id: I1c0aaa955981eec264e1ff3cc66ad15adc771e72
    Closes-bug: #1226106

commit f478b1ec0c64a9cb92703ca8c0857dd0ab2c77e8
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Oct 13 06:05:10 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iafc01f8b6a844f697db75a88d5c457197e62dec3

commit 5afe8ccfbe16e11d2939c18cd372b06686fa8b5c
Merge: 810131c 5c56779
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 22:08:57 2013 +0000

    Merge "A resource to generate random strings"

commit 810131c471e25df7663621b334259ba100e1a420
Merge: dfb891a 22241a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 22:05:03 2013 +0000

    Merge "Remove obsolete redhat-eventlet.patch"

commit dfb891abd88e9063fa5385591993afaa0b8ded77
Merge: 92ae763 40f749b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 21:48:57 2013 +0000

    Merge "Increase support for the AllocationId property"

commit 92ae763c1ce67e9df55f538788de04c7b82033e6
Merge: d3a79c4 47c2a1e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 21:47:11 2013 +0000

    Merge "Raise error if instances are created with names > 63 chars"

commit d3a79c4b95a221192fb2bf1760e78dfd821f576d
Merge: d0106ef bc041a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 19:24:42 2013 +0000

    Merge "Save parse errors in TemplateResource for later"

commit d0106ef1bb324278d0fa62dad9b0033e91722991
Merge: 01ec515 0a7ebeb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 19:23:47 2013 +0000

    Merge "Create a better exception in Fn::Replace"

commit 01ec515d245fecb9d7ce7042e21a5790c52cbf4b
Merge: 561c62a 74b5d7b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 19:23:44 2013 +0000

    Merge "Catch the appropriate exception for missing instance"

commit 561c62a8137f01ac223d5149fc5362145b005cdf
Merge: f406b0b 7085b55
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Oct 11 19:23:41 2013 +0000

    Merge "Imported Translations from Transifex"

commit f406b0b422b141d216671cce89b01c0e6cf44e58
Merge: 353b6a3 ce62192
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 19:23:38 2013 +0000

    Merge "Return Integer or Float casted value in NumberParam"

commit 353b6a32ee62aeec99dd5f9da5bd76f7e354d401
Merge: 0e7563e cb2801c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 19:23:35 2013 +0000

    Merge "Allow overriding the instance_user per server"

commit 0e7563e75d01b6611d14c2b361ac7225e615e1cc
Merge: 4fcb1ae 8ce7b0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 19:23:27 2013 +0000

    Merge "Fix some docs warnings and errors"

commit 4fcb1ae1a406caf108ec6ee082772d692ca5b731
Merge: b67ea49 51d1214
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 18:09:08 2013 +0000

    Merge "Move check_uptodate.sh into config/ and delete tools/conf"

commit b67ea498b973aad9a5c46b743e02840d0f91a75d
Merge: 7c68d74 859efe8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 18:09:00 2013 +0000

    Merge "Start using tools/config instead of tools/conf"

commit 7c68d749ec0ce5e64ab1f45383ce66bfb6a0d528
Merge: 3e97b4e 8b277c9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 18:08:53 2013 +0000

    Merge "update the config generator from oslo"

commit 3e97b4eb5bcc6b40f28afea30998eebd7d7ef406
Merge: 57dac72 e1c4ab3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 16:39:16 2013 +0000

    Merge "Fix heat deletion failed if floating ip is not found"

commit 47c2a1e0b454dc950575a2abd846f479fcc501d8
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 11 12:01:05 2013 +0100

    Raise error if instances are created with names > 63 chars
    
    The maximum hostname on Linux is 64 characters.  DHCP is limited to
    this host maximum.  Unfortunately Nova allows the creation of servers
    with names > 63 characters in length.  This patch is a short-term
    solution to improve the failure condition, so we draw attention to
    the problem, enabling the user to work around with shorter names.
    A subsequent patch will be required which mangles names such that we
    truncate or compact names automatically.
    
    Closes-Bug: 1238272
    Change-Id: I2114135b7f4b649a906c3adaea1869d1a1290a3b

commit e1c4ab30dcd736e031d784308ae214837566c8cf
Author: Hui HX Xiang <xianghui@cn.ibm.com>
Date:   Wed Oct 9 03:10:36 2013 -0700

    Fix heat deletion failed if floating ip is not found
    
    Novaclient will throw out a Not Found exception if the
    floating ip not exists. Heat should catch this exception
    to continue to delete the stack.
    
    Closes-Bug: #1234593
    
    Change-Id: Ifd9d34de37cc5dd57804787d8b1455f0321fc86f

commit 7085b55187217fc442161a55c6c812519369a49c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Oct 11 06:05:54 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ie1605371add0b8fca445f993f3a2767a72fbd484

commit cb2801cc7bb6be272057a4aad51d075c601285eb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Oct 11 16:54:57 2013 +1100

    Allow overriding the instance_user per server
    
    I have called the property 'admin_user' as the bug suggests.
    
    Closes-bug: #1229825
    Change-Id: I578ba9c0419383b34ac137e714f9cc00fe696ea3

commit ce62192a76a6e01b735a502c70d66d5b6eefe423
Author: Mitsuru Kanabuchi <kanabuchi.mitsuru@po.ntts.co.jp>
Date:   Thu Oct 10 20:42:42 2013 +0900

    Return Integer or Float casted value in NumberParam
    
    Integer value used in parameter, so failed validation in properties.
    The solution here is return Integer casted value or Float casted value
    as value of NumberParam.
    
    The method of which type choose for cast is same of Property.str_to_num.
    
    Fixes bug #1226494
    
    Change-Id: I9f7d894ffae8a728dce783d5881af3d377268b93

commit 57dac72b556c00df4b92ef7af76d8fe1d1c663fb
Merge: f7964ad b1dedae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 04:06:44 2013 +0000

    Merge "Rolling update support for Instance/AutoScalingGroup"

commit f7964add3b14f3c43280d84ff30f2a1dc0597e84
Merge: fa25beb 9e73d81
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 03:11:38 2013 +0000

    Merge "Update openstack.common.policy from oslo"

commit 51d1214fece94c540cfbaec12314340997143f07
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 10 16:21:26 2013 +1100

    Move check_uptodate.sh into config/ and delete tools/conf
    
    Having two sets of these scripts is just confusing.
    
    Change-Id: Ia9e227c4c833d1c6edc040eb93d157b8557671fa

commit 859efe8e04d01e3daa0b273ad21554c90c56fd66
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 10 16:18:04 2013 +1100

    Start using tools/config instead of tools/conf
    
    oslo only supports tools/config so lets use it.
    
    Change-Id: I1d72d158bb6aa52697d04a5b3c632f7e8b661c2e

commit 8b277c92be9335b71164d4c654648eee44107251
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 10 15:56:32 2013 +1100

    update the config generator from oslo
    
    Change-Id: Ice2407645715d0f1ca144581fa75cbc5ae23fb65

commit fa25beb65f482b9c44bd048279581dd440ad0429
Merge: 7f78828 99f4f1b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 01:33:13 2013 +0000

    Merge "Begin 3 chapters for Orch API Ref Manual"

commit 7f78828087f93b54097ba2fccba716a36e0fe424
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Oct 10 20:24:48 2013 +0000

    Updated from global requirements
    
    Change-Id: I4f26d3a8790c799e5c1f7f81031406e0c57545f9

commit 94ee665ec1e00becaab7385e28700362888f63ea
Merge: 977ac53 e3912cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 10 16:21:44 2013 +0000

    Merge "Make templateResource not replace on update"

commit 977ac532194b85f51eceda32be0bae01923ebcaf
Merge: e96fbdc 7b255e4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 10 03:55:57 2013 +0000

    Merge "Fail stack-create if script exits with non-zero status"

commit e96fbdc89fe0091b1ee3ca30f1b117f4f4293ece
Merge: 3a782f9 c5483e2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 10 03:45:18 2013 +0000

    Merge "DB API : tolerate None values to _encrypt"

commit 3a782f944a8026c6fd2265b1b192013cc32734f2
Merge: e8e9b1d b215a11
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 10 01:05:41 2013 +0000

    Merge "Add help for purge_deleted command age argument"

commit e8e9b1dab36cfe0037ecc194a452f83e36fbcdf6
Merge: c01da1d 5336ff2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 10 01:05:33 2013 +0000

    Merge "Add cinder prop image, deprecate imageRef"

commit c01da1d0a279e0cda166b750f14be3281b7008f9
Merge: 7e9b317 495a8c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 10 00:03:40 2013 +0000

    Merge "Fix RequestContext.to_dict user/username inconsistency"

commit 8ce7b0ecdd975519d18990944f0ee6fa505daf05
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 10 10:03:44 2013 +1100

    Fix some docs warnings and errors
    
    These came out of "make html".
    
    Change-Id: Iff009879de16bdad806b64e9f6beb64bb9cf6240

commit 22241a21687c2217baee355aee6ae72c0ac52dc0
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Oct 9 21:43:02 2013 +0100

    Remove obsolete redhat-eventlet.patch
    
    See I62ce43a330d7ae94eda4c7498782a655e63747fa for the gorey details on
    why this exists.
    
    As of this fix:
    
      https://github.com/eventlet/eventlet/pull/34
    
    which was released in eventlet 0.13, we no longer need the patch.
    
    This has now been removed from oslo-incubator, so this is really just
    syncing that removal.
    
    Change-Id: I84267f3c6726cb2e750f615e107c48b12c6ed353

commit 7e9b317a99de68c61770c33b0117e031f608799b
Merge: df08f8d f9ee0e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 9 20:14:09 2013 +0000

    Merge "Fix possible race issue with test_engine_service"

commit df08f8d62692d6318d4a3c40043a0a431bb59e3e
Merge: 2207b06 4202a2d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 9 20:14:01 2013 +0000

    Merge "Fix the signal details string"

commit 5336ff22f195e8d1708e56e4347fc991ffce4ca6
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Oct 9 09:31:10 2013 +1300

    Add cinder prop image, deprecate imageRef
    
    This change does a lookup on the provided image so that
    an image name or UUID can be specified in the property.
    
    imageRef has been documented as being deprecated.
    
    Closes-Bug: #1234263
    Change-Id: I95190e3f53ddac8eb41306b7003aa93e75886eb7

commit c5483e2c13bb416e3cf163efdf8dabae386e9475
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 9 20:10:52 2013 +0100

    DB API : tolerate None values to _encrypt
    
    Closes-Bug: #1237596
    
    Change-Id: I39cd4a1bab39def9ad4c214da768e91f411d7697

commit 495a8c1d24dca07d71d9c532cd25f5bea8e168d7
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 9 16:51:35 2013 +0100

    Fix RequestContext.to_dict user/username inconsistency
    
    The username value should be returned, not the self.user value,
    otherwise you unexpectedly get inconsistent results if you ever
    override the username after creating the object.  Some tests
    added, one of which illustrates the problem.
    
    Change-Id: I95e416e3046607d8b0406812705949e8ff464f86
    Closes-Bug: #1237459

commit 5c56779d12ea3a5f1fb4f9abe4e19d1bdc6ae625
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Oct 9 16:19:24 2013 +1300

    A resource to generate random strings
    
    A common pattern for templates is to define parameters
    for passwords and specify the password on stack create.
    For complex templates this can impact template maintainability
    and makes stack creation more complicated.
    
    In addition, a password parameter leaves the temptation of
    using the same password (or worse, the parameter default) on
    each stack launch which raises the security risk.
    
    This resource allows secrets to be generated in the template and
    propagated to compute resources as needed. Often the user will
    never want to see the generated string, but if they do they
    can put it in a stack output.
    
    This resource has been requested by the tripleo project
    who run trunk heat, so it will be of immediate benefit to them.
    
    Implements blueprint random-string-resource
    
    Change-Id: I044fc7717133fc7a3520dca774300024925ff2aa

commit f9ee0e0746711a07badb2aae00291ca2a803969c
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 9 15:41:07 2013 +0100

    Fix possible race issue with test_engine_service
    
    There's the potential for racy behavior in test_show_watch, because
    the result of show_watch(self.ctx, watch_name=None) is all watches
    visible to the user, not only those for a specific stack.  So it's
    possible that the result length will be more than two, and since the
    watch name is also not unique, we could see spurious test failures.
    
    So make the test assertions more specific, and avoid reusing the same
    watch name in test_show_watch_metric.
    
    Change-Id: Ibb1cbae04dee4b6c4ada44336143fd122a3cb53f
    Closes-Bug: #1237324

commit 2207b06fa259d65667469a56f075c1bc0cdb51cd
Merge: 06a6609 09f4ff9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 9 16:00:50 2013 +0000

    Merge "Don't install EPEL rpm on CentOS 6.4"

commit 99f4f1bd9a4975d393aa8addf65098020bb73afc
Author: Mike Asthalter <mike.asthalter@rackspace.com>
Date:   Thu Oct 3 14:11:55 2013 -0500

    Begin 3 chapters for Orch API Ref Manual
    
    - The original heat wadl (heat-api-1.0.wadl) and the samples have now
    been deleted from this repo. The wadl has been renamed and migrated
    to the following location along with the samples:
    https://github.com/openstack/api-site/blob/master/api-ref/src/wadls/
    orchestration-api/src/v1/orchestration-api.wadl
    
    - Inserted api-ref/src/wadls/heat-api/src/README.rst file in repo
    that specifies the new wadl location.
    
    - Updated pom file to latest version of clouddocs-maven-plugin.
    
    - Currently clouddocs-maven-plugin 1.11.0 has a bug which creates
    new sections for the request and response examples for each API
    call. This will be fixed in an upcoming release of the plugin.
    
    - Several remarks are inserted in the manual text and marked with
    security="writeronly" so they do not appear in the output. You
    are welcome to provide any answers and feedback you may have for
    these remarks.
    
    - Fix title for commit to resolve H803 build exception.
    
    - Fix extra spaces in file /wadls/heat-api/src/README.rst, and
    wrap lines in commit message at less than 70 characters.
    
    Change-Id: I478b394268f64b41317ab77fff6d6366ddd7efa1

commit 4582a1a0dd2a4d515ac08957889a0d93cf750ab4
Author: Alexander Gordeev <agordeev@mirantis.com>
Date:   Wed Aug 28 15:49:17 2013 +0400

    Migrate to Oslo DB 96d1f887dda Part 3
    
    Oslo version 96d1f887dda21b43ba4376187f31953dee6f5273
    
    This commit just migrates Heat to new db related code from Oslo
    
    Partially implements blueprint oslo-db-support
    
    Change-Id: Ib0de40a70857fb3e029a2282f06746269a628c71

commit 9e73d818b452ff58a9c5e8fc7a2ce50d98d618dd
Author: Arata Notsu <notsu@virtualtech.jp>
Date:   Mon Oct 7 15:18:58 2013 +0900

    Update openstack.common.policy from oslo
    
    To fix an issue about ConfigFilesNotFoundError.
    
    Oslo commit is aae2b1c38801ac8f00f817a17b1b0916a8d7c2c3.
    
    Closes-bug: #1236177
    Change-Id: I24c1d80033fc8166e7b1de01499f6d247b166f88

commit e3912cb1cac1f40f410479e2dacf6200bddcb669
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Oct 9 17:12:45 2013 +1100

    Make templateResource not replace on update
    
    Updating a template resource is never destructive
    as it defers to the nested stack to determine if any
    sub-resources needs to be replaced.
    
    Closes-bug: #1236676
    Change-Id: Iae7e6b7e2f41d2f5bd9e75256be7533c15762d9f

commit 4202a2dbe5b949bdd7615b2f778300c0658ad8ee
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Oct 9 11:02:41 2013 +1100

    Fix the signal details string
    
    This could come from multiple places so try make it useful in the
    common case (Ceilometer and watchrule) and safe in the other cases.
    
    Change-Id: Iee88968b52ec15addf4721e004d2994b2f8c2134
    Closes-bug: #1224434

commit 06a6609035871b653823cb598ee557b8832ec5d8
Merge: 662c010 1318617
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 22:57:24 2013 +0000

    Merge "Change pyrax identity_type of Rackspace resources"

commit 662c0108af31544a68f2017faa5e37d23a1c00f0
Merge: 8cfa6cf 510299b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 22:57:22 2013 +0000

    Merge "Move the registration of the global env to after plugin resources"

commit 8cfa6cfd6286a9214be8d9f1f6ce7ef6f3902372
Merge: 5b48014 504bd0c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 22:57:20 2013 +0000

    Merge "Make the testing of resource loading easier"

commit 5b480148c260a2578c562d8aca7f050e50e44bf5
Merge: 307a23a e9d2016
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 22:57:17 2013 +0000

    Merge "Don't try validate TemplateResource properties in template_validate"

commit 307a23afea0e6c18ba33f88505ca3849f0a272e6
Merge: 10aa56d d8ed9bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 22:57:15 2013 +0000

    Merge "Cleanup nested loop variables in TemplateResource"

commit 10aa56d3080a3609db9bc43fff5ca39004e61fbf
Merge: f30ca44 7790d40
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 21:46:24 2013 +0000

    Merge "Update some cases of iterating stack resources"

commit b1dedae9e179ac8435d721c4eae2a434caa924f9
Author: Winson Chan <winson.c.chan@intel.com>
Date:   Tue Oct 8 12:05:23 2013 -0700

    Rolling update support for Instance/AutoScalingGroup
    
    This is the last part of the series to implement support
    for AutoScaling UpdatePolicy.
    
    Modified handle_update of InstanceGroup and AutoScalingGroup to
    support rolling update if there is an update policy and when
    there is a property difference in LaunchConfigurationName. A new
    replace method is created to handle replacement of instances in
    batches. Replacement of instances occurs prior to resize. The
    _lb_reload is called appropriately for each batch. The resize
    method is refactored to support underlying changes in
    _create_template.
    
    Change-Id: I8113a964fb6eb0ec16c2e3766d2771e64e1cf248
    Implements: blueprint as-update-policy

commit 7b255e4ee947624231c10252224794b2e9cc015a
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Thu Oct 3 14:37:50 2013 -0500

    Fail stack-create if script exits with non-zero status
    
    If the heat-script or cfn-userdata script exits with a non-zero
    status, the user will see which script failed and where to find
    the debug log on the server.  This will allow the template author to
    conditionally fail a stack-create in the user_data section.
    
    Change-Id: Ibc3768d8192102b9057d4ba873058cb50abcd1b1

commit b215a117c0a90048f2cff71d872816359fef2b32
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Oct 8 10:24:51 2013 -0700

    Add help for purge_deleted command age argument
    
    At a bare minimum explaining this argument helps understand what
    purge_deleted is going to do.
    
    Change-Id: If73ba272e8ea0742f8be93994ec2fac68d4ed3fd

commit 74b5d7b60d42bd8e10a41bb4c74d80c85293160b
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Mon Sep 30 20:43:02 2013 -0500

    Catch the appropriate exception for missing instance
    
    Catch ClientException instead of NotFound since this is
    what the underlying client library actually throws.
    
    Closes-Bug: #1236911
    Change-Id: I1e7f3c69c216d19705cab9bdcd7302e1b917fdd4

commit 09f4ff95f40290978b0b0ae17ebc110e9a0fb804
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Thu Oct 3 14:38:46 2013 -0500

    Don't install EPEL rpm on CentOS 6.4
    
    Attempting to install the already-installed EPEL rpm on CentOS 6.4
    causes stack-create to fail.
    
    Change-Id: I0474622e3976113ec3b80855f3a04a3e339ab193

commit 40f749be45c22d121256377fff748f3365700a86
Author: Simon Pasquier <simon.pasquier@bull.net>
Date:   Tue Oct 8 16:05:13 2013 +0200

    Increase support for the AllocationId property
    
    This patch makes it possible to use the following snippet:
    
      "VpcIp": {
        "Type": "AWS::EC2::EIP",
        "Properties": {
          "Domain":"vpc"
        }
      },
      "VpcIPAssoc" : {
        "Type" : "AWS::EC2::EIPAssociation",
        "Properties" : {
           "InstanceId" : { "Ref" : "Server"},
           "AllocationId" : { "Ref" : "VpcIp" }
         }
      }
    
    Previously the Heat service would fail the stack creation because it was
    looking for the Neutron router created by means of AWS::EC2::VPC
    resource.
    
    Fixes bug: 1234671
    Change-Id: I6fb6a5cd0d034d15516fcc0cb266c695836d972c

commit bc041a2a37362a826fd71f87542445ccad746d7e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Oct 8 16:52:35 2013 +1100

    Save parse errors in TemplateResource for later
    
    If there was a parse error re-raise it in the validate.
    
    Change-Id: I25759c4f03fe8f9353c03f8fd4d9bb099ea1b478
    Close-bug: #1232127

commit 0a7ebeb9389253cbd776270819e7a55a1f8bb1a4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Oct 8 15:37:54 2013 +1100

    Create a better exception in Fn::Replace
    
    if the replace value is the wrong type we get a generic exception
    out of string.replace that does not really help with debugging
    a template.
    
    Change-Id: I2d6d5509b8900b11bfbf148230d57438e1f9962a

commit f30ca4419cdf922fd7b65ceb2605af561e490c5c
Merge: dd2ae33 7848c08
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 04:50:35 2013 +0000

    Merge "Make sure that nested stacks have their watch rules checked"

commit dd2ae33b65ce7615fae6a9a682393a4250b900ca
Merge: c3ea27d 1078e88
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 04:50:28 2013 +0000

    Merge "Start the watcher task if a nested stack has watches"

commit c3ea27d780c1fbd409902e2bc858cd01e0d9e6bb
Merge: 84986cb 717930e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 04:46:37 2013 +0000

    Merge "Add a new db api stack_get_all_by_owner_id"

commit 84986cb55a9f88445698e8f42f41dd6fb2aad2b8
Merge: 73479b5 bacc479
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 04:05:47 2013 +0000

    Merge "Fix clashing loop variables in TemplateResource"

commit 73479b55f17cec038a3a86d569a6dff6366a180a
Merge: 22dacf0 5e84144
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 03:38:36 2013 +0000

    Merge "Update resource stacks automatically"

commit 7790d40d374d8d9e297f6bf438b64afed9d884e7
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Oct 8 16:16:34 2013 +1300

    Update some cases of iterating stack resources
    
    Since https://review.openstack.org/#/c/49879 iterating over a
    stack will return resource names instead of resources.
    
    This change updates some cases of iterating on a stack, there
    are likely others which remaint to be updated.
    
    Change-Id: I3fff5d7d7fd0016d741151010d0e1ce969da01b3
    Partial-Bug: #1236678

commit 22dacf01f14374a6d5361dd361dbc05dd665e93a
Merge: 9747bdc 4fac04d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 03:04:24 2013 +0000

    Merge "Implement parser.Stack.__delitem__()"

commit 9747bdcf72f446f00e0dcdd5fae2cbf21038fbf0
Merge: 37cf7e0 5a620e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 03:00:49 2013 +0000

    Merge "Don't iterate over Stack.resources dictionary"

commit 37cf7e0a3fc751f5e3260cbd43bc887eefa4ac12
Merge: d9dbf48 c1dea05
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 02:55:10 2013 +0000

    Merge "Get InstanceGroup InstanceList from get_instances()"

commit d9dbf48983b940af532b755b8050b757294142cd
Merge: cd241a4 5eb3d74
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 02:55:02 2013 +0000

    Merge "Refactor total_resources"

commit e9d2016bc74a000b42e985faa556df1c4deaf8b9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Oct 8 10:24:22 2013 +1100

    Don't try validate TemplateResource properties in template_validate
    
    If the user runs "heat template-validate ..." and one of the resources
    is a TemplateResource we won't be able to validate the properties
    of that resource as we have to instantiate the TemplateResource
    to kick off downloading the template and conversion of parameters to
    properties.
    Note: validation will happen properly when the user creates the stack
          so this just delays the validation of one resource type by one step.
    
    Change-Id: I6ce53a9e78ae470b54320862fe910eef9f603941
    Closes-bug: #1236327

commit d8ed9bdf201a6e1f83f3f8f6585cc1788546bb19
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Oct 7 22:13:19 2013 +1100

    Cleanup nested loop variables in TemplateResource
    
    This patch makes these variables more verbose.
    
    Change-Id: I40d6d3d2b0ffc9d792c75de51b5107e5fa73bd91
    Partial-bug: #1235077

commit bacc4797657283868dac3a79d2d76bd955733460
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Oct 7 22:10:07 2013 +1100

    Fix clashing loop variables in TemplateResource
    
    There were two loops using "v" as a variable name.
    
    Closes-bug: #1235077
    Change-Id: I5198621ce724abe9638da4a7482ae6817bbd86e7

commit 510299bed35456ea0a5b6c0cbab9660fdf1cbc36
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Oct 7 13:12:04 2013 +1100

    Move the registration of the global env to after plugin resources
    
    This prevents a user's template resources from getting overridden
    by a resource plugin.
    
    Change-Id: Idd1a5155dd28d662df8cdc44d190e24c84fd7a81
    Closes-bug: #1236107

commit 504bd0c815e30829c604ae1f29bf8bd8323ca1ae
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Oct 7 22:04:37 2013 +1100

    Make the testing of resource loading easier
    
    Pass an environment object around so tests don't have
    to use the global object and then conflict with other tests.
    
    Change-Id: I0d9a0d3bd825ac415847213ee4a5d7473f80dbd6
    Partial-bug: #1236107

commit cd241a45c4a0168ff68617e146d9e2ad5aeaa35f
Merge: f81a172 556704b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 7 06:42:00 2013 +0000

    Merge "Make parser.Stack a proper Mapping"

commit f81a172d7ac1aa764d3ee43d189b91b351ead0da
Merge: de0d860 8ffbc0c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 7 00:03:27 2013 +0000

    Merge "Enabled request_id in RequestContext"

commit de0d860e2e2094721537f45fbe358bbdf81c0bd2
Merge: a5d387f e999413
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Oct 6 23:45:16 2013 +0000

    Merge "Handle NetworkNotFoundClient and PortNotFoundClient"

commit a5d387f0a33b296f2e922c04a4319b245ab8118c
Merge: 8dd860d d4b75d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Oct 6 23:41:09 2013 +0000

    Merge "Unit tests: don't use status strings from class"

commit 8dd860d865f8539a2f9cdaf13458ba76796284ba
Merge: 2192bce ec29941
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Oct 6 23:39:31 2013 +0000

    Merge "Don't obtain resources through stack.resources"

commit 2192bceec92575c4add1b06f2dc95f0bff2babf5
Merge: 94f2133 b938dc2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Oct 6 23:37:36 2013 +0000

    Merge "It is necessary to update pool_id for Neutron LB"

commit 94f2133d613c3653e6bea0667471d31d8ea0cf06
Author: Stephen Gran <stephen.gran@guardian.co.uk>
Date:   Sun Oct 6 10:47:46 2013 +0100

    allow "members" property to be absent
    
    Closes-Bug: #1235904
    Change-Id: If18f6d386d07ee65ce54f8372ad646864b486303
    Signed-off-by: Stephen Gran <stephen.gran@guardian.co.uk>

commit b938dc2e88c95c4d2a21f59a437487c02fa1e872
Author: Stephen Gran <stephen.gran@guardian.co.uk>
Date:   Sun Oct 6 09:43:43 2013 +0100

    It is necessary to update pool_id for Neutron LB
    
    Closes-Bug: 1235903
    Signed-off-by: Stephen Gran <stephen.gran@guardian.co.uk>
    Change-Id: Ie48312efd7f04c425436b8dae9c8bccf21dc768e

commit 093e203c09fd92f6838c1eb5d2a0b86aea8e5658
Merge: fa31873 d2bd4be
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Oct 6 01:03:13 2013 +0000

    Merge "resource_data saved unencrypted"

commit 5e8414425cf78240977093ba98f48e9c0406cae1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 27 17:28:08 2013 +0200

    Update resource stacks automatically
    
    When moving resources between stacks during an update, update the
    resource's stack pointer automatically when adding it to its new stack.
    
    Change-Id: I92666589fe417f5d905104d5a0890650da70e825

commit 4fac04dbe76800f2187af9d7484f34d52643ccbc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 27 17:28:08 2013 +0200

    Implement parser.Stack.__delitem__()
    
    Allow the update code to delete old resources from the stack without
    accessing the stack's resource attribute.
    
    Change-Id: I9dbc623d7396dd84cdbee992fa91d88b6c01a0e5

commit 5a620e36b688765650ed6b26a8972bc026984e27
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 27 17:28:08 2013 +0200

    Don't iterate over Stack.resources dictionary
    
    Now that parser.Stack is a proper Mapping, we can iterate over its
    keys/values/items directly instead of accessing the resources attribute.
    
    Change-Id: I6bd9f357c21a0e75623a71543e981d3f4f87fcbe

commit c1dea05eaff9130d6775911ee6b3d8b0446eafaa
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 27 17:28:08 2013 +0200

    Get InstanceGroup InstanceList from get_instances()
    
    Change-Id: I477aeede396e247134c838663fe7d54941758cd0

commit 5eb3d74cfa284d077b5deadb8f67f6a5f938be68
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 27 17:28:08 2013 +0200

    Refactor total_resources
    
    Make the implementation slightly faster and more robust:
    
    - Check that res.nested is callable
    - Don't call res.nested() more than once
    - Check for None explicitly
    - Calculate totals directly, rather than with a for loop
    
    Change-Id: Ib43cf5555620e54b9d4634e40cf46f75b50782ac

commit 556704b928f4ecea139b1e9c8073d3b824fcbadf
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 27 17:28:08 2013 +0200

    Make parser.Stack a proper Mapping
    
    We no longer iterate over things in dependency order, so get rid of the
    iterator methods that return values instead of keys. Instead, make
    parser.Stack conform to the standard collections.Mapping interface.
    
    Change-Id: Id66b2da4ba8e4335c72f1b538abfc2e97eab1e20

commit d4b75d10333a891d84fa5cc970e6efb86bb30ac0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 27 17:28:07 2013 +0200

    Unit tests: don't use status strings from class
    
    We should always obtain the status strings from the object we're actually
    using them with. In this test, the parser.Stack class is actually stubbed
    out, which can cause problems for accessing its attributes.
    
    Change-Id: I8e060c6c937542dd11e96f243af26ee4dfa348dc

commit ec29941bb83fc9043590e78cb6e9bbd1a544cd22
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 4 16:38:40 2013 +0200

    Don't obtain resources through stack.resources
    
    A particular logical resource name can be looked up by subscripting the
    stack object directly.
    
    Change-Id: I621280318cfb104ab9bfe1ae7c31fe2b5e55cfc6

commit fa31873529481472e037e3ce157b87f8057fe622
Merge: 9876ca0 6f81001
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 3 22:31:58 2013 +0000

    Merge "Add contrib to tox pep8 check"

commit 9876ca0bee175e41754bb5fa27b272e0dcebf22c
Merge: 4f15f4c 45f1a3f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 3 21:52:00 2013 +0000

    Merge "Add some docs on how to setup Ceilometer to use Alarms"

commit 4f15f4cfc1786d86975482b5fae425159a5a39e9
Merge: d61a898 0becb5f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 3 21:51:53 2013 +0000

    Merge "HOT str_replace default to empty string for param"

commit 6f81001f269c7326be2c0a3203fab4cd0a323232
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Oct 4 10:06:45 2013 +1300

    Add contrib to tox pep8 check
    
    This implements Clint's comment in
    https://review.openstack.org/#/c/48690/1 adding # noqa
    to the relative imports and adding contrib to the pep8 check.
    
    run_tests.sh -p now returns no warnings.
    
    Change-Id: I05085151258a6d0f3cc348211f64533fd4cbded9
    Closes-Bug: #1234938

commit e99941380006506b5accdef00cb589dfc7d37bad
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Oct 4 09:28:13 2013 +1300

    Handle NetworkNotFoundClient and PortNotFoundClient
    
    neutronclient has changed is behavior (recently?) in that it now
    raises PortNotFoundClient for missing ports and NetworkNotFoundClient
    for missing nets. These exceptions extend NeutronClientException but
    do not set the status_code to 404 so the existing resource 404
    checking has stopped working.
    
    This change handles both 404 exceptions and the new exceptions
    so that it continues to work with different neutron releases.
    
    Change-Id: Id06e04d4b98e62b8062b119e959634fd61c8beb5
    Closes-Bug: #1234924

commit d2bd4bee7b0c283da1bd5b6f28bcf9319e04d33a
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Mon Sep 30 14:20:51 2013 -0500

    resource_data saved unencrypted
    
    Sqlalchemy is commiting unencrypted
    data when a session commit happens after
    doing a resource_data_get.
    
    Closes-Bug #1233337
    Change-Id: I9d20bf1faaf12cc1427976bf1223d4dfc9392c5f

commit 1318617103be85b22a785aa17cc0c0e424fcb0c9
Author: Daniel Givens <daniel.givens@rackspace.com>
Date:   Thu Oct 3 10:33:22 2013 -0500

    Change pyrax identity_type of Rackspace resources
    
    The Rackspace resources utilize the pyrax library. As of v1.4.11 of
    pyrax, the manner in which default region is determined changed, such
    that the keystone identity_type returned 'RegionOne' as the default
    region rather than one of the Rackspace regions. Changing the
    identity_type to rackspace fixes this.
    
    Change-Id: I36cd61393a76fbb9b0bb1fd4b31f26f6a95df3a3
    Closes-Bug: 1227387

commit 8ffbc0ce431529753dcb2770b57471f717fa32fb
Author: Daniel Givens <daniel.givens@rackspace.com>
Date:   Tue Sep 17 14:08:41 2013 -0500

    Enabled request_id in RequestContext
    
    As a means to enable logging on request id's, request_id in the RequestContext
    can be set.
    
    blueprint log-request-id
    
    Change-Id: I13cd494d5af3255c03ec30e1040ef01c856c960d

commit 7848c08b9551f6ddd0e55d115b4267b275abdae9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 3 11:19:26 2013 +1000

    Make sure that nested stacks have their watch rules checked
    
    Change-Id: Iee9629739e9549e33f8ed8c4ca08098a7e4d0acf
    Closes-Bug: #1234010

commit 1078e889f52b4d2646ba89a971cf813c2e337e1d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 3 11:17:52 2013 +1000

    Start the watcher task if a nested stack has watches
    
    Even if the parent stack has no watches.
    
    Change-Id: I06322f908fdbd474778776749cb3e1634183ed23
    Partial-Bug: #1234010

commit 717930e4f5aacaee91726322e1c708c13f29e03d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 3 11:15:31 2013 +1000

    Add a new db api stack_get_all_by_owner_id
    
    This is to get the next level of child stacks.
    
    Partial-Bug: #1234010
    Change-Id: I64b30b4040bc443b64d23d85a054010da4dd1130

commit d61a8980bf8a5ffbe56aa833bd44c78c628b505c
Merge: a4027f0 caa43b3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 3 00:34:06 2013 +0000

    Merge "Handle BadRequest in VolumeDetachTask"

commit a4027f0956d915961da67e95fc4a0228f4871b2c
Merge: b365b60 e20fbec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 3 00:34:03 2013 +0000

    Merge "resource_id check on router gateway, interface delete"

commit b365b60130203c6a8f83830b89f6d7ce1c720c87
Merge: f77e344 7df4613
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 3 00:34:01 2013 +0000

    Merge "Validate template size during download"

commit f77e344eaddc6b6218771ef01924716219aae2f8
Merge: 605eb36 8d90404
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 3 00:28:45 2013 +0000

    Merge "Open Icehouse development"

commit 605eb36c5a57c77ec9b696154e974571b9530071
Merge: 3dbff38 2fead38
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Oct 3 00:28:42 2013 +0000

    Merge "Updated from global requirements"

commit 45f1a3fb516612fee599cac968be8aac135d1aeb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Oct 3 08:56:46 2013 +1000

    Add some docs on how to setup Ceilometer to use Alarms
    
    We need to use Ceilometer's mongo backend if we want to use
    alarms as the sql backend is missing a feature.
    
    Works around bug #1223710
    
    Change-Id: Ib569cfd650ce14480496530e7bbf1b2f71a24c02

commit 3dbff38ef6183433537bdaadf3c9c4d7add3f2d1
Merge: b3bf2a8 e90cebe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 22:33:47 2013 +0000

    Merge "Fix F17 CFN link in Getting Started"

commit e20fbec4a9089b5b9662e2f0f02c89333f0ffb60
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Oct 3 11:25:03 2013 +1300

    resource_id check on router gateway, interface delete
    
    This change prevents RouterGateway and RouterInterface
    delete failing if create never managed to set the resource_id.
    
    Change-Id: I88ba2dd9b92546fca684dad2f921c6caf8467367
    Closes-Bug: #1231805

commit caa43b3b506a5f92eec842b2ccfdcc958f6eec6a
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Oct 3 11:10:35 2013 +1300

    Handle BadRequest in VolumeDetachTask
    
    Novaclient raises BadRequest(400) if a volume is already
    detached when delete_server_volume is called.
    
    This change treats BadRequest the same as a NotFound in the
    VolumeDetachTask, and logs the actual exception string.
    
    Change-Id: I34c01a493e8c87281d2adecb6d4404376cf78738
    Closes-Bug: #1232234

commit b3bf2a80e4426fd2ba271eee003a81a5aed3bf7e
Merge: 5f845e0 7cb30c6
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Oct 2 21:17:33 2013 +0000

    Merge "Imported Translations from Transifex"

commit 0becb5f5f58b608b41e8b11d2dbb2da7e3077a5d
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Tue Oct 1 00:37:54 2013 -0500

    HOT str_replace default to empty string for param
    
    If a str_replace param cannot be resolved or is None,
    substitute an empty string in order to prevent raising
    an exception during validate.
    
    Closes Bug: #1234390
    Change-Id: Ica6b84cfc2157b4e1f561f737e9aa67b9f6018ca

commit 5f845e064b483168f9487d394fd9368c818a8b5a
Merge: 6c093a1 d5d890a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 19:35:37 2013 +0000

    Merge "Purge ubuntu getting started guide of old info"

commit 6c093a1e90fe9227397c0e3c2074a4b504d5ba75
Merge: d2a6f5a 956858a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 15:42:01 2013 +0000

    Merge "Purge Fedora getting started of old info"

commit 8d9040425ccd49e3571eea0b905d1b7d27b57799
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Oct 2 17:11:30 2013 +0200

    Open Icehouse development
    
    This should be accepted/merged once all the RC1 bugfixes are in.
    
    This bumps the target version to 2014.1, effectively opening the master
    branch to Icehouse development, ending the feature freeze.
    
    The Havana release branch is cut from the previous commit in master.
    
    Change-Id: Iff3f857b5e273eec927e2d4f22371c2ae4683ca6

commit d2a6f5a5f503a3900b7466498b72e062ce2960e4
Merge: 0441e16 2511205
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 15:04:34 2013 +0000

    Merge "Add the "show" attribute to the neurton attribute_schema"

commit 0441e162481c8a568166a71ca2bfb90e0e11eafa
Merge: 8585816 f6dbd14
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 15:02:15 2013 +0000

    Merge "Add _() around the attributes_schema in net.py"

commit e90cebe2d877ba56e8f2572ccac52fe54016dd3a
Author: Stephen Gordon <sgordon@redhat.com>
Date:   Tue Oct 1 09:58:30 2013 -0400

    Fix F17 CFN link in Getting Started
    
    F17 CFN links in Getting Started material were no longer valid. The
    missing path component (F17) has been added.
    
    As other impacted content is slated for removal this resolves the issue
    with the CFN links described in bug #1231310.
    
    Change-Id: I21e1c69aadc4d36b7c3e3e277c01bd80345611b9
    Closes-Bug: #1231310

commit 85858169d5b2f9255e2f389981e09351f0339c08
Merge: f32a2ce 288ae01
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 10:45:26 2013 +0000

    Merge "heat_keystoneclient: Fix consuming trusts via v2 API"

commit f32a2ce0093630c5a76833eb73b4109a679f5dc1
Merge: 1780208 53b9314
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 10:34:05 2013 +0000

    Merge "Disable lazy translation"

commit 1780208abfb9598d76ce304a02b2abc22c97a692
Merge: 003a3b9 7c1cb04
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 06:39:30 2013 +0000

    Merge "Log exception traces in APIs"

commit 7cb30c6831e943e0c341f3570e2deffff9a37b4e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Oct 2 06:03:59 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ic7b4bb59245e9bdd132aaf11dc06808013ecf939

commit 251120513d447b2e5382cdf4063b00046c1d7851
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Oct 2 08:41:46 2013 +1000

    Add the "show" attribute to the neurton attribute_schema
    
    This is so current templates like heat-templates/cfn/F17/Quantum.yaml can work.
    
    Fixes bug #1233882
    Change-Id: I1db234742c1213e345a08c0aa9ea5d1473d168f6

commit f6dbd14c73b8cdb23aebf99d89b2a07027f74385
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Oct 2 08:43:37 2013 +1000

    Add _() around the attributes_schema in net.py
    
    part of bug #1233882
    Change-Id: I706ede5f05b52409d4d770af1804fa65f0060244

commit 288ae018ebf511b9fc5e6a2559feb8bed2821be2
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 27 08:11:03 2013 +0100

    heat_keystoneclient: Fix consuming trusts via v2 API
    
    Contrary to my understanding when I first wrote this code, it is
    possible to consume trusts (ie get a trust scoped token) via the
    v2 keystone API.  So this patch reworks the heat_keystoneclient
    so we:
    - Consume trusts via the v2 client (so we can access the ec2tokens
      extension which is v2-only)
    - Only create a v3 client when required (when creating or deleting
      a trust), so we minimise the requests to keystone.
    - Similarly it's only necessary to create the v2 client when creating
      the client object if we need to consume a trust
    - When a trust is found in the context, we always consume it
    - Don't modify the request context, as this has undesired side-effects
      if the context is subsequently used to perform actions which require
      obtaining a keystone token, instead create a context containing a
      trust_id and trustor_user_id when the stack is stored.
    
    Note this change depends on this patch to python-keystoneclient:
    https://review.openstack.org/#/c/48462/, so consuming trusts won't
    work unless a version of keystoneclient including this change is
    used.
    
    Change-Id: I61b380bc63d606c128ce029f1960c6812a3324e3
    Closes-Bug: #1227901

commit 53b9314799c7d83779032c4535734f1c05326a27
Author: Ben Nemec <bnemec@redhat.com>
Date:   Tue Oct 1 21:39:07 2013 +0000

    Disable lazy translation
    
    Late in the Havana cycle bug 1225099 was found in the lazy
    translation code, and to be safe it was decided to disable lazy
    translation for Havana.  This change does that.
    
    Change-Id: Ia934a7df9386baf6ae8eb9ff48c24386c47ecd23
    Partial-bug: 1225099

commit 003a3b978de76241f34c01085bd51a8980aeecc3
Merge: 3baf358 f4a9c0f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 1 16:16:00 2013 +0000

    Merge "Remove tools/openstack*"

commit 2fead38829d7007b8ea70351b08f086f5dce46cd
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Oct 1 16:13:02 2013 +0000

    Updated from global requirements
    
    Change-Id: Ie89f43f6d8aa4a263b5e6515dcbd7bd534c6bce6

commit 7df46139580bca28c1ab3ba2c26e440617a92ccc
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Mon Sep 30 13:13:21 2013 -0500

    Validate template size during download
    
    The API downloads the entire template before validating it. For a 100 MB
    file, this causes the API process to use several hundred megabytes of
    memory. If several requests like this come in simultaneously, the API
    server will run out of memory.
    
    Closes-Bug: #1233366
    
    Change-Id: I453274d62e71b3f860322dfcd98c2830ef039e9b

commit 3baf358e7c4576d998a446d6745c6cb3654bea29
Merge: 235cbf2 f066769
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 1 13:53:00 2013 +0000

    Merge "Lazily load resources when loading a Stack"

commit 7c1cb04eefc968b6b352c24d2ac8b10800766a18
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 1 15:49:27 2013 +0200

    Log exception traces in APIs
    
    Fixes bug: #1229292
    
    Change-Id: I3b87c63cf1dc0100e34418b588d215a6e61e2ad1

commit d5d890a00f47848b5231f81244b380a052c5ca9d
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 30 23:03:31 2013 +0100

    Purge ubuntu getting started guide of old info
    
    The ubuntu getting started guide has not been maintained, and
    most likely no longer works.  We should point people to Debian/Ubuntu
    docs when they exist, or the devstack getting started guide.
    
    Change-Id: I27a12b5366739ffcad459706c0712882b89abd2f
    Closes-Bug: #1182428

commit 956858a20ced2e354becb028a75bead9d5f9e0ab
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 30 22:50:01 2013 +0100

    Purge Fedora getting started of old info
    
    Remove all of the old tools/openstack related info from
    the on_fedora docs - the best source of documentation for
    Fedora is now the RDO docs (for Heat RPM package installs),
    or the on_devstack guide for development installs.
    
    Change-Id: Id33d94cc063361698eb87315a56ef7f720ecaa73
    Partial-Bug: #1182428

commit f4a9c0fcc6adaa6b579d1cfbc68c4cee9c35fc6d
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 30 22:30:04 2013 +0100

    Remove tools/openstack*
    
    Remove the tools/openstack* scripts - they're no longer maintained,
    and there are several alternative documented ways to install openstack
    with Heat now, so we should direct people to those instead.
    
    Change-Id: I649f384f6acc3d7edab25f104f8e9d7e0050f2c1
    Partial-Bug: #1182428

commit 235cbf217a8a79e0a953de0002c01e60c885683f
Author: Thomas Spatzier <thomas.spatzier@de.ibm.com>
Date:   Mon Sep 30 20:49:52 2013 +0200

    Fix inconsitencies in HOT template guide and spec
    
    Fix description of outputs section in the HOT specification, and thus make it
    consistent with the HOT template guide (which is correct).
    
    Also fix incorrect uses of the native server resource's resource name and
    attribute names.
    
    Change-Id: I98643873c370d03619ee7df9c7e09b2cdf3cf08c
    Closes-Bug: #1233318

commit f06676970388061fcec9580966cfbc3b70d30b17
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Sun Sep 29 15:46:10 2013 -0500

    Lazily load resources when loading a Stack
    
    Stack-list is one of heat's slowest operations.
    It uses the orm to fetch resources for every stack
    in the database, then spends a lot of time deserializing
    resource data. This patch forces resources and dependencies
    do be lazily loaded.
    
    bug 1214602
    Change-Id: Ieec481cb8ab211054f8956090ad97a687c9a616b

commit 002dcaac45e583060d44c8f01bb6a2d8d4c277dd
Merge: 5a01a0c 3f1a309
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 30 10:36:07 2013 +0000

    Merge "Do not assume fixed_ips is a specified property"

commit 5a01a0c817eacac32ab8f54f67aa36008a07ffc4
Merge: 31dac07 9233d44
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 30 00:00:52 2013 +0000

    Merge "Conform stack resource error so it gives a 4xx"

commit 3f1a3091866ce0b071c3ae8794f695dee021e001
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Sep 27 16:52:41 2013 -0400

    Do not assume fixed_ips is a specified property
    
    Check if property is set before attempting use to avoid KeyError
    
    Fixes bug #1232252
    
    Change-Id: I731c13eb73b1ed624a99f84e4b6977f82a731cfc

commit 31dac07a05b6d23b97c713706a9fba4b9e85e9e4
Merge: 14cb54b 393e29d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 28 23:04:28 2013 +0000

    Merge "Remove Neutron VPN resources id attributes"

commit 14cb54b51936d820ef54c7d02893f163b1cc1339
Merge: 38d130c 3226077
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 28 15:31:55 2013 +0000

    Merge "Provide config option to cap events per stack"

commit 38d130c247e0f1e762701dcacf1c76e8c9a5e198
Merge: 93cdf9e 7a82df1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 28 14:36:49 2013 +0000

    Merge "Remove Subnet id attribute"

commit 93cdf9ea47791592f83ac571d98dac21ecd321c3
Merge: f96d0bf 9819c05
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 28 11:13:31 2013 +0000

    Merge "Remove Router resource id attribute"

commit f96d0bfd9e69aaacf70c59d175a1ce171873c9e5
Merge: 99a9ff1 01d6ce3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 28 09:10:54 2013 +0000

    Merge "Store tenant with trust details in user_creds"

commit 99a9ff19e4d3c8e7f8e5ba8cd4b227ccf62c2c0e
Merge: 5ec0397 525e0fe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 28 09:10:52 2013 +0000

    Merge "api : default signal body to None"

commit 5ec03972afa68a817166733a8bb8972dc5ee73f0
Merge: dcbd7b6 332d19f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 28 07:23:39 2013 +0000

    Merge "Document EIP resource properties:"

commit dcbd7b6f1990838676324cf7c53088dba03952af
Merge: be21622 7f81f29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 15:45:56 2013 +0000

    Merge "Return parsed list value in CommaDelimitedList"

commit be21622e1e2262a7b47c9b760c47a809d2e81348
Merge: b5b522a dcf594c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 15:10:26 2013 +0000

    Merge "Skip None values in fixed_ips when creating Port"

commit b5b522af58e6b32c91dc604c78ebd4e48468688d
Merge: f01d6c5 d755c1a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Sep 27 14:42:30 2013 +0000

    Merge "Imported Translations from Transifex"

commit f01d6c55ba7838e7ea167504528822aff4afd4ac
Merge: 0fa6d75 25d77fa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 14:35:52 2013 +0000

    Merge "Make availability zone for CinderVolume optional"

commit 0fa6d75f9bca796cd7d2d325b34fe71d7edd3125
Merge: e3cc8ec 7b9a04d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 12:18:19 2013 +0000

    Merge "Document neutron Net properties"

commit 525e0fef97b0fd641f36f8c0bec179015488c99e
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 27 11:55:56 2013 +0100

    api : default signal body to None
    
    Default the signal body to None, so requests without a body don't fail
    
    Change-Id: Ia42d71a338459c8b6543b3d4c5b296d005f4c9ee
    Closes-Bug: #1231926

commit 01d6ce3858606f5f7896c133681bde4ba9d88bd3
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 27 11:11:59 2013 +0100

    Store tenant with trust details in user_creds
    
    Currently we don't store tenant name/ID to user_creds when a trust_id
    is found in the context.  However as mentioned in bug #1231483 keystone
    currently requires the tenant_id when re-scoping a token to a trust via
    the v2 tokens API.
    
    Change-Id: I5bd9cb914a8c9365ed30ece8e0a61ba1e0a3c4bc
    Partial-Bug: #1227901

commit e3cc8ec2aeabe19fe8467788a2972e679786f2b4
Merge: e3c59c1 3991797
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 10:07:35 2013 +0000

    Merge "Move Rackspace resources into contrib"

commit e3c59c10bb2bb8d230d6438596e9390a0a003677
Merge: 1b55740 c8293a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 08:52:32 2013 +0000

    Merge "Handle HOT param constraints in provider templates"

commit 1b55740a15ea7519e95707f974fd6d211b81def1
Merge: 685ed26 cdd3896
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 08:21:19 2013 +0000

    Merge "For Subnet gateway_ip, pass None for empty string"

commit 685ed2699fa7c088e8bbcc6693280cc57daa6a48
Merge: fad5022 fa32578
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 08:19:17 2013 +0000

    Merge "Document floatingip properties"

commit fad5022332ec10ecfa1eac7ff9cdb756984d8173
Merge: 6e7fa32 a5c3a6e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 06:35:11 2013 +0000

    Merge "Sync gettextutils from oslo"

commit 9233d44f955f18c56ffbdacc280dea0e9dccc699
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Sep 26 23:05:16 2013 -0700

    Conform stack resource error so it gives a 4xx
    
    This exception was added and landed while the change to use
    RequestLimitExceeded was still in progress. Giving a 5xx error when the
    user has caused the problem directly is not what we want.
    
    We leave the exception in place to allow the shared error message. I
    also have hopes that we will be o-k with extra exceptions and just
    extend RequestLimitExceeded when we have a similar situation.
    
    Change-Id: Ic9b176625e6ad2b8c42c420dab79984d134304e5
    Partial-Bug: #1230191

commit d755c1a9931536cbd5a1773267bdd57601f5fa1d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Sep 27 06:04:38 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I45b1a31c0fdb17fa5110af58065c1c45e4e8125f

commit 7f81f29a975ce4e84eb5ed7863020dd3dbab0d8b
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Thu Sep 26 17:04:53 2013 +0800

    Return parsed list value in CommaDelimitedList
    
    What's `Ref' got from `CommaDelimitedList' parameter is unicode
    string, so failed validation in properties.
    
    The solution here is add list value in `CommaDelimitedList'.
    
    Fixes bug #1226483
    
    Change-Id: I5534ff6027d6f5be3a844778d025b73ab9500796

commit 25d77faffda2acd2616ea6358b259064ad47c8c9
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Thu Sep 26 17:56:51 2013 +0800

    Make availability zone for CinderVolume optional
    
    So if end user does not specify, default availability zone will be
    used.
    
    Fixes bug #1231346
    
    Change-Id: I54c8c714062916cb78c8762829411eaa73d609f8

commit 6e7fa3266a47fb858c15a6235866972b7b3418c0
Merge: 9e0e6c8 1709206
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 00:16:27 2013 +0000

    Merge "Do not translate HOT param constraints"

commit 9e0e6c8bf2bd9d162401e19af18a5cbc9b3f3154
Merge: 841862b 7afd1f4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 23:39:37 2013 +0000

    Merge "Rename counter_name to meter_name in alarm"

commit 841862bf93383401237cb0b775ace42905513051
Merge: 2af3683 ce94dfe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 22:08:25 2013 +0000

    Merge "Add attributes_schema to CinderVolume"

commit 7b9a04d7b9dc788ea6611dcaa81bed79c4c0f26b
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Sep 26 09:06:28 2013 +1200

    Document neutron Net properties
    
    Change-Id: I94694f7b89e6264cdcc7de1fd6228f061673464b
    Closes-Bug: #1224175

commit 32260776443fd5d6cbb8dd2af3fd4c2fea2c1a6d
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Sep 24 15:25:32 2013 -0700

    Provide config option to cap events per stack
    
    Previously users could write to the events table infinitely. With this
    change Heat will automatically prune some events if the maximum is
    reached. The behavior can be disabled by setting max_events_per_stack to
    zero.
    
    Change-Id: I4fb2fefbd9bcd10ce1767ddf58a870206a6482a1
    Fixes-Bug: #1209492

commit 2af36838789dd463ffbb5276537043533fe64c1c
Merge: d79ee71 8c16d30
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 16:00:45 2013 +0000

    Merge "Add config option to limit max stacks per tenant"

commit c8293a3143c7a11e7c9d922797f47943e04c9d50
Author: Thomas Spatzier <thomas.spatzier@de.ibm.com>
Date:   Mon Sep 23 18:47:42 2013 +0200

    Handle HOT param constraints in provider templates
    
    When HOT templates are used as provider templates, parameter constraints
    have to be translated into provider resource properties correctly. The
    properties Schema class has been design to cover both CFN and HOT, but
    the code in Schema.from_parameter has to distinguish between CFN and
    HOT parameter constraints to correctly build the schema.
    
    This patch fixes the handling of HOT parameters.
    
    Change-Id: I59027d3b51e5d6dcc2a867cc5b5015cd6c88051c
    Closes-Bug: #1224111

commit 170920638206d0ece54e945c97da7f281cea9cad
Author: Thomas Spatzier <thomas.spatzier@de.ibm.com>
Date:   Mon Sep 23 15:05:02 2013 +0200

    Do not translate HOT param constraints
    
    Do not translate HOT parameter constraint definitions and have them processed
    by default CFN-based code. Instead, do HOT parameter constraint validation in
    HOTParamSchema class to handle HOT-specific constraint syntax appropriately.
    This is more robust than trying to map the new HOT syntax to old CFN
    constraint style.
    
    This patch is cleanup and first in a row for fixing the use of HOT templates
    as provider templates.
    
    Partial-Bug: #1224111
    
    Change-Id: Ia35f281f874b906aabeb684fd9caca03dd994b9c

commit d79ee713dd0b71dedcae9fe1deb304f3c70cf8f8
Merge: 34bd21b 77348fd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 12:08:58 2013 +0000

    Merge "Remove Port resource id attribute"

commit 34bd21b3f77b0efc6031d2abc299316cb823c641
Merge: baea8f5 fd21e5e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 12:08:56 2013 +0000

    Merge "Remove Neutron firewall resources id attributes"

commit baea8f5e7869361ff290d54bdb625ea26c0d2449
Merge: 4e178ed 14a6a98
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 12:07:44 2013 +0000

    Merge "Remove Neutron load balancer resources id attributes"

commit 4e178eded855c27543c105d92c76b56de89c1170
Merge: b336e48 1983e07
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 12:07:42 2013 +0000

    Merge "Remove Net resource id attribute"

commit b336e4832cffb51f19f3c15932b403ec7b89f9b7
Merge: 451c37c 1bf3dd3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 11:31:59 2013 +0000

    Merge "Remove CinderVolume id attribute"

commit 451c37c8f91b0be4caa035020fbd285c3387131d
Merge: 217be2a 850e2ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 11:07:17 2013 +0000

    Merge "api ec2token: allow auth_uri conf to be set via keystone_authtoken"

commit 217be2ad1de125a8861a0ac92b0943e30f9c92fd
Merge: 62bec0d 43ea5dd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 07:14:07 2013 +0000

    Merge "Make HOT parser errors translatable"

commit ce94dfe9ce3853aef9a9ee6e4334191824999b67
Author: Thomas Herve <th@rackspace.com>
Date:   Wed Sep 25 14:21:32 2013 +0200

    Add attributes_schema to CinderVolume
    
    The branch adds descriptions for the attributes of CinderVolume, and
    fixes some properties description.
    
    Closes-Bug: #1224349
    Change-Id: Ib9bf7aaeb1b4de7141e82e7e09d60f8c2de07de0

commit 62bec0dab9008ce46f647c64f3a42a59d2fcbadf
Merge: 637181b dfb9061
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 03:31:34 2013 +0000

    Merge "Add method to count events by stack"

commit 43ea5dd8a0ee04f63873ae1c6a1c29f63aec4fcb
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 20 15:21:49 2013 +0100

    Make HOT parser errors translatable
    
    These errors can get passed back to the user so wrap them in _()
    
    Change-Id: I2509b35fd7b6b68eb0342179656cbafd7559e2f3

commit fa325784f280b463069e8756a23675d470b628d0
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Sep 25 16:52:08 2013 +1200

    Document floatingip properties
    
    Change-Id: Ib936df0d546b6f1469498ac9b866e587e005bf84
    Closes-Bug: #1224169

commit 7afd1f4285d9a1e710ae6c04566064b62f3f19a5
Author: Bartosz Górski <bartosz.gorski@ntti3.com>
Date:   Mon Sep 16 08:24:38 2013 -0700

    Rename counter_name to meter_name in alarm
    
    In the newest ceilometer alarm version counter_name property was renamed to
    meter_name. Right now heat uses old ceilometer client which still support
    counter_name but newest ceilometer backend does not.
    
    Change-Id: Ie7876119dc9b2a80d862f10de5f7265ad2a059f0
    Closes-Bug: #1222830

commit 8c16d308d06324518504c0f674799f3577a43845
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Sep 6 11:29:42 2013 -0700

    Add config option to limit max stacks per tenant
    
    Tenants will not be able to create more than max_stacks_per_tenant top
    level stacks. This should prevent any one tenant from being able to
    exhaust a Heat engine's resources.
    
    Fixes bug #1221849
    
    Change-Id: I29be4ecf5d5b9eb44d7ecc01907d08f30ac27990

commit 332d19f94691ad9bfb7177cd3e205880085a1df7
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Sep 23 11:34:24 2013 -0400

    Document EIP resource properties:
    
    AWS::EC2::ElasticIp
    AWS::EC2::ElasticIpAssociation
    
    And wraps attribute descriptions with gettext _(
    
    Change-Id: Ie241b5081761eea13b9e7e0db8b1474843e2b8b9
    Closes-bug: #1224134

commit dcf594ce81b6f6c93d70faabaf93748189fc90e0
Author: Thomas Herve <th@rackspace.com>
Date:   Wed Sep 25 15:59:48 2013 +0200

    Skip None values in fixed_ips when creating Port
    
    Neutron create port doesn't like when a None value is passed for
    fixed_ips data, the value needing to be skipped instead. This patch
    handles that problem for ip_address and subnet_id, as testing showed
    that subnet_id wasn't mandatory.
    
    Change-Id: I18a06cbad456eb75c41c299bc4c51c704d9dabc3
    Closes-Bug: #1224472

commit 393e29d9dc58a9780c48ec741dbe262fb471d9a6
Author: Thomas Herve <th@rackspace.com>
Date:   Wed Sep 25 14:49:49 2013 +0200

    Remove Neutron VPN resources id attributes
    
    This patch removes the id attributes from the various Neutron VPN
    resources, as people should use Ref.
    
    Change-Id: Idf81d109b930b246791a0f3c22bc04ce5054b939
    Closes-Bug: #1230228

commit 7a82df133da580c16cc864415b2f295e8e9d8fde
Author: Thomas Herve <th@rackspace.com>
Date:   Wed Sep 25 14:47:04 2013 +0200

    Remove Subnet id attribute
    
    This patch removes the Neutron Subnet id attribute, and apply gettext to
    the attributes descriptions.
    
    Change-Id: I0b5f60d59dcde336ca7d67fb8fe8a527426dac98
    Partial-Bug: #1230228

commit 9819c059ee13a945eef659b4aaf65cda0d164b0a
Author: Thomas Herve <th@rackspace.com>
Date:   Wed Sep 25 14:43:46 2013 +0200

    Remove Router resource id attribute
    
    This patch removes Neutron Router id attribute, and apply gettext to the
    attribute descriptions.
    
    Partial-Bug: #1230228
    Change-Id: I91b6500c15a3b231296bb7bb0598a11819fe6981

commit 77348fdbff921205b792475cdec369cd01dbfd73
Author: Thomas Herve <th@rackspace.com>
Date:   Wed Sep 25 14:42:22 2013 +0200

    Remove Port resource id attribute
    
    This patch removes the id attribute of the Neutron Port resource, as
    people should use Ref.
    
    Change-Id: I7acf1564ff4c25c8cbac53cd58bf93195352b451
    Partial-Bug: #1230228

commit fd21e5edf26c638559a7be46a3a92b712b66962b
Author: Thomas Herve <th@rackspace.com>
Date:   Wed Sep 25 14:38:36 2013 +0200

    Remove Neutron firewall resources id attributes
    
    This patch removes the id attributes of the various firewall resources,
    and fixes attribute description to use gettext and proper sentences.
    
    Change-Id: I4ccbb86239cd904a1b8f7023abe92842762429f2
    Partial-Bug: #1230228

commit 14a6a98ab2cc710d3255e0ae842a50b01fbe38ce
Author: Thomas Herve <th@rackspace.com>
Date:   Wed Sep 25 14:31:57 2013 +0200

    Remove Neutron load balancer resources id attributes
    
    This patch removes id attributes from Pool and HealthMonitor as people
    should use Ref instead.
    
    Partial-Bug: #1230228
    Change-Id: I92d74fcaa2a5443cb38bc647056d4fc7a95677a0

commit 1983e0767426b9346c6bdc9b3c698d43b3290928
Author: Thomas Herve <th@rackspace.com>
Date:   Wed Sep 25 14:27:57 2013 +0200

    Remove Net resource id attribute
    
    This patch removes the 'id' attribute of Net resource to encourage Ref
    usage, and fixes some attribute description.
    
    Partial-Bug: #1230228
    Change-Id: I1674e67f6c20007ef809db8e16a707922e5cda1c

commit 637181bf3cf9a72dd513b27d00eab739cf79deff
Merge: 87a6fdc 5a87dbb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 12:20:14 2013 +0000

    Merge "Document internet gateway properties:"

commit 87a6fdcc756248ec6be1a3f486a4ecaf38ca5570
Merge: f32339e 1fdcc08
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 12:20:12 2013 +0000

    Merge "api ec2token: Clear failure when no auth_uri specified"

commit 1bf3dd39f36d6ac4bd491dcb848018ec9eff24cb
Author: Thomas Herve <th@rackspace.com>
Date:   Wed Sep 25 14:01:49 2013 +0200

    Remove CinderVolume id attribute
    
    Using the id attribute can result in problems when validating a
    template, as the resource_id is empty at that point, so we remove it to
    prevent issues, as people ought to use Ref anyway.
    
    Closes-Bug: #1230140
    Change-Id: I16778d8036e7e2ccacf93caa4581ae0b0368b7c2

commit f32339ecad5b7d6317141bc790ac1df01482830a
Merge: e5e829f 64f9ccb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 10:44:34 2013 +0000

    Merge "Comparing device name values instead of their reference"

commit e5e829f3b83b55b9a9b0016789c2c90aab66f101
Merge: 3e857d2 00b89cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 10:11:53 2013 +0000

    Merge "Replace first_public_address/first_private_address"

commit 3e857d26b5ddfc788944b002a6d0d2346f6ecbac
Merge: 9380395 f424d6f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 10:11:49 2013 +0000

    Merge "HOT str_replace to use string.replace, not string.Template"

commit 850e2ed240e60e18a26a9dc36655278a40dadd8b
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 24 15:37:49 2013 +0100

    api ec2token: allow auth_uri conf to be set via keystone_authtoken
    
    We already require the keystone_authtoken heat.conf section for the
    auth_token middleware, and heat_keystoneclient.py.  So this patch
    allows us to reuse the auth_uri specified in that section instead
    of requiring a duplicate auth_uri to be specified in [ec2authtoken]
    
    Change-Id: Ic5efafb7743aeddca990a4c560b423293108e1e0
    Closes-Bug: #1229674

commit 1fdcc087b4110480bcb3817f298ddcd839fbbc67
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 24 12:38:54 2013 +0100

    api ec2token: Clear failure when no auth_uri specified
    
    Currently if the CFN API is misconfigured, such that no auth_uri
    is set in the config, we silently fail because we don't detect that
    auth_uri==None in the code.  Instead catch this situation and assert
    that the service is misconfigured via a 500 response.
    
    Change-Id: I47a385aa6a34fe3133de00cf2b18fec6a4f6645a
    Partial-Bug: #1229674

commit 93803959efb1de1377b16f24c0dde55d3b209f37
Merge: 3be4aa7 5b9d65f
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Sep 25 07:55:48 2013 +0000

    Merge "Imported Translations from Transifex"

commit 3be4aa7a033821b81290f1e81c8101d99cc43399
Merge: 6bbdb23 fe93db5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 07:52:44 2013 +0000

    Merge "Add the shared property to neutron Net"

commit 6bbdb23c75a4f23c1f7b3d2bb64d0b6a25d7dd26
Merge: 3cc686a f2ade59
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 07:48:46 2013 +0000

    Merge "Stop nested stack updates exceeding resource limit"

commit 5b9d65ff4cdb9310658c28b24b61f447ca641c45
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Sep 25 06:04:25 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I26a25a5f5bae7b67241ada93bb87ad69ab235eaa

commit dfb90616edb1808051ef743e7eb60d007a8ceb6e
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Sep 24 10:22:13 2013 -0700

    Add method to count events by stack
    
    We need this method to efficiently count events by stack to allow
    pruning them if there are too many.
    
    Change-Id: Ifd5ed78e37a14116497f8bc008739ee9938e194d
    Related-Bug: #1209492

commit 3cc686a29e4f1ed8951efaecd96d3530c695e15b
Merge: abe907e 6de066d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 03:36:16 2013 +0000

    Merge "Improve test coverage of stack deletion"

commit abe907ea402dbc3432f21150c8a11f1c8e6ea997
Merge: af9a065 44d759d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 03:04:53 2013 +0000

    Merge "StackResource set requires_deferred_auth=True"

commit af9a0653c815ccced0e8439c1914a4af79212186
Merge: b057d6e 7754831
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 01:01:24 2013 +0000

    Merge "Require oslo.config 1.2.0 final"

commit 64f9ccb4829d246cbedca09ce56eccf133635de2
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Tue Sep 24 18:12:47 2013 +0800

    Comparing device name values instead of their reference
    
    Although end users specified device name as `vda' but since `is' in
    python is used to compare reference, bootable volume is not
    detected. We should use `==' to compare values instead.
    
    Fixes bug #1229610
    
    Change-Id: I7f127dc489706482f6bb245372bfd8079b91c40f

commit cdd38962ebd4d0cbc6c57b7892260ee359a08798
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Sep 25 09:55:16 2013 +1200

    For Subnet gateway_ip, pass None for empty string
    
    A None gateway_ip has special meaning for create_subnet but
    properties sanitise None values to be empty strings.
    
    With this change, the following properties should all result
    in gateway_ip=None being passed to create_subnet:
    gateway_ip: null
    gateway_ip: ~
    gateway_ip: ''
    
    Change-Id: I234542f7f2d7bddf7dee01f8a9c56c021b5f0c8c
    Closes-Bug: #1226666

commit b057d6e9abebba8ec33672e9a05583eb69494dd3
Merge: 14ea3db cd5d149
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 24 23:28:59 2013 +0000

    Merge "Use name property in OS::Nova::Server if set"

commit a5c3a6e9ecdf2280457ee1ff11676b500402ee64
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Tue Sep 24 22:38:31 2013 +0000

    Sync gettextutils from oslo
    
    Add type check for Message params when setting locale to avoid
    AttributeError.
    
    Fixes bug: #1229364
    
    Change-Id: I6fe55ebc4eea5fef1d335ad83a84c4879f7f06f9

commit 77548310a228d01cea7b27f48a1d5f2418120be0
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Sep 24 21:29:01 2013 +0100

    Require oslo.config 1.2.0 final
    
    Now that 1.2.0 has been released, require it rather than one of the beta
    release tarballs.
    
    Closes-Bug: #1182861
    Change-Id: I75ffc4a572d14488d19491a38742d6920951c171

commit 14ea3dbd5634f1ae26610ee6cb689df54b44b8c4
Merge: 32178a0 51f46c5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 24 18:18:59 2013 +0000

    Merge "Format error on urlfetch.get fail"

commit 3991797483c6f00576c5448a21fd8e0c78dd8612
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Mon Sep 9 18:02:49 2013 -0500

    Move Rackspace resources into contrib
    
    Using plain discover to run tests in contrib until
    I can figure out how to make that work via testr.
    
    Closes bug: 1220798
    
    Change-Id: I5669b90152efabfacbc4b786a67cd1f4b139521a

commit 6de066dcc4af1a61afbda525f2cbdaca746070a1
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Wed Sep 18 10:37:17 2013 -0500

    Improve test coverage of stack deletion
    
    Adding tests to cover stack deletion timeout, stack deletion
    failure and also to cover check_delete_complete.
    
    Fixes bug #1220723
    
    Change-Id: I50dbaf37f6d95b731e8496aa90c6c6e5bcc27ab1

commit f2ade590075138d524b14a2a909907ea01f346cd
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Sep 6 09:30:44 2013 -0700

    Stop nested stack updates exceeding resource limit
    
    This is the final way for a user to exceed the max_resources_per_stack
    configuration value.
    
    Fixes bug #1215100
    
    Change-Id: I5e0f86c1ad6d74c2fcb3aa2de1028ec93b3e2dd6

commit 32178a06aab963191815cf4f9777738819e01bfb
Merge: 74b1631 326788b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 24 04:16:45 2013 +0000

    Merge "Consider downloading a valid status for CinderVolume"

commit 74b16312b68fa36be81b891242feedc03b415dc2
Merge: cf38339 0c674a0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 24 04:04:05 2013 +0000

    Merge "Sync gettextutils from oslo"

commit cd5d149a6bf9773b865ead267ddbccbe91b8dc54
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Sep 24 14:41:29 2013 +1200

    Use name property in OS::Nova::Server if set
    
    Currently the name property is ignored if specified; the intention
    was to use the name as the nova server name if specified.
    
    This is implemented by overriding physical_resource_name
    in the same way as SwiftContainer.
    
    Change-Id: I06a6f3d69119fb470eb54930c2bd7b329cabd6c7
    Closes-Bug: #1229244

commit 51f46c57e209e35063f67055e45ff6e26f8aa552
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Sep 24 13:45:39 2013 +1200

    Format error on urlfetch.get fail
    
    The error messages for fetch failures of nested stacks have too much
    detail. This change formats fetch fail errors in the same way
    that TemplateResource does.
    
    Change-Id: Ib8afa281a53f895086ce8890c828fe4a8bb469ae
    Closes-Bug: #1214227

commit 44d759db8a5216e663b02fd3cf45c917b050a39b
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Sep 24 10:33:57 2013 +1200

    StackResource set requires_deferred_auth=True
    
    The dynamic evaluation of requires_deferred_auth will not work
    as the nested stack has not been created when requires_deferred_auth
    is evaluated.
    
    In some cases subclasses of StackResource could implement dynamic
    evaluation but for now it is safer to assume any template with a
    nested stack needs requires_deferred_auth=True
    
    Change-Id: I4ca3804ede5c7aa2167931279e5bed84480ac454
    Closes-Bug: #1229412

commit 00b89cba9308913a72a6837a3bfa55dc8a2af0e0
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 23 12:11:25 2013 +1200

    Replace first_public_address/first_private_address
    
    OS::Nova::Server attributes first_public_address and first_private_address
    will not work with neutron, which allows any network name to be assigned
    not just 'public' and 'private'.
    
    This change replaces these attributes with a 'first_address'
    attribute which uses the same nova_utils.server_to_ipaddress method
    that AWS::EC2::Instance uses to populate all of its IP address
    attributes.
    
    This needs to be fixed before the Havana release to avoid these
    broken attributes needing to be supported.
    
    Change-Id: I0b4dc009d665e4d7b4cbc32d484a2efc6068320a
    Closes-Bug: #1228929

commit f424d6f6c3fec5a534c7850551ad62b4f055b606
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 23 13:41:32 2013 +1200

    HOT str_replace to use string.replace, not string.Template
    
    str_replace uses python templates, whereas Fn::Replace uses python
    string.replace.
    
    During the original review for Fn::Replace, python templates were
    decided against because $ would often need double-escaping in shell scripts.
    https://review.openstack.org/#/c/31736/
    
    Having different behaviours between Fn::Replace and str_replace will
    add complication for users migrating existing templates to HOT.
    
    Another advantage of using straight string replacement is seen when
    the template generates a executable script. In this case it is generally
    possible to write a template that can also be executed directly in a
    dev/test environment. This would often not be possible if the template
    format required placeholders to be prefixed with a $.
    
    Whatever behaviour exists when Havana is release will have to be
    supported indefinitely so now is the time to decide if this is going
    to be fixed.
    
    Closes-Bug: #1228640
    Change-Id: I72879b374a3c61dfe0e4004251ab709d914f2e25

commit 5a87dbbb0ea4faa44d743a21a2f7d7aca46242f9
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Sep 23 11:53:53 2013 -0400

    Document internet gateway properties:
    
    AWS::EC2::VPCGatewayAttachment
    
    Fixes bug #1224143
    
    Change-Id: Ia896369f4cfcd5d13d66a2defb120b1c05d71fb6

commit cf383393284024cb0f8ae1429eb3060852e53998
Merge: 9f6ca49 02dcfc7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 18:42:45 2013 +0000

    Merge "Allow resource_by_refid returning resumed resources"

commit 9f6ca49d3695e9662eff9070338a7b45308cd84a
Merge: 7d1281e 62b4d55
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 18:03:52 2013 +0000

    Merge "Allow access to attributes of resumed resources"

commit 7d1281eb91c73653071e2cf942665cbfff0b6624
Merge: 211fb4e 9789468
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 17:58:34 2013 +0000

    Merge "Document neutron health monitor and pool properties"

commit 211fb4eaf2c65514f4f0787ef488ed1497e5d67c
Merge: f0232d6 3b9050a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 17:57:46 2013 +0000

    Merge "Document swift properties and attributes"

commit f0232d6ef1bb007f7ebd0599f0dc9b8b0effd11d
Merge: 28c87a8 0e363ca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 15:59:05 2013 +0000

    Merge "Nested stack derive requires_deferred_auth from resources"

commit 28c87a8a7f6051d11c065790b5575bda85d7736e
Merge: 0eeca3c 9e191f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 15:59:03 2013 +0000

    Merge "Mark reservation_id, config_drive as implemented"

commit 0eeca3c7d24353911583519ce2e61be590aaca6c
Merge: 0565acc a6fc747
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 13:40:08 2013 +0000

    Merge "Document aws cloud watch alarm properties"

commit 0565acc92842ab3706c41cdf4781159249b9e2a9
Merge: bae233c 9b28f22
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 08:20:22 2013 +0000

    Merge "Add tenant_id property to neutron Net and Subnet"

commit 326788bbd2a3fac1fd10e9e81de25e20ac3bb1c1
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Fri Sep 13 12:55:13 2013 +0800

    Consider downloading a valid status for CinderVolume
    
    "downloading" should be considered a in-progress state while creating a volume
    from an image. Because Cinder will first create a volume with specified size
    and set its status to downloading, then start fetching the image from glance
    and copying it to the volume.
    
    Fixes bug #1222676
    
    Change-Id: I573440f3184c3d47df0d7e78146b0ed030606d86

commit bae233c0f52d6d78cb09f23398c28b869ab7a36d
Merge: b21ce20 4ff53ac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 02:50:44 2013 +0000

    Merge "Use unicode() when serializing REST API errors"

commit fe93db5440b2ca491ec4d61b6d3fc7bd5741c8ee
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 23 14:06:37 2013 +1200

    Add the shared property to neutron Net
    
    shared has been added since this resource was written.
    
    Change-Id: I73cbb6e3268d6cd93a94a98874f44aa075e504a2
    Closes-Bug: #1227282

commit 9b28f22a008e1567701b11d7658f09d68df84bc6
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Sep 18 11:28:11 2013 -0700

    Add tenant_id property to neutron Net and Subnet
    
    tenant_id has been added since this resource was written.
    
    Change-Id: Ieb73df85f11e79e24755d2830927cde246651b38
    Closes-Bug: #1227287

commit b21ce20427c4e493284456b463cbab898433c69d
Merge: 9831689 89bb14f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 22 18:16:45 2013 +0000

    Merge "Stop stack updates from exceeding resource limit"

commit 98316898297206070cf26b25c68886195c2c8059
Merge: 0a72002 ac61272
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 22 00:40:13 2013 +0000

    Merge "assert_ is deprecated, use assertEqual"

commit 0a720025f8634559b30d0d1175c429ecb685f131
Merge: a06e37c c6b1c61
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 21 19:57:04 2013 +0000

    Merge "Tolerate bad environment until validation"

commit 02dcfc735741c6bcd18b24737c32afb221dd9e95
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Sat Sep 21 22:55:22 2013 +0800

    Allow resource_by_refid returning resumed resources
    
    Resumed resources aren't returned by resource_by_refid, which causes problem
    after a stack is resumed.
    
    Fixes bug #1227032
    
    Change-Id: I87893a04bb267e1b42b55f3c60c22a6268ae4464

commit 62b4d555073221407a34b91159e13009d34abd5e
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Sat Sep 21 21:42:13 2013 +0800

    Allow access to attributes of resumed resources
    
    RESUME COMPLETE|IN_PROGRESS were not treated as valid states while resolving
    attribute, thus causing Fn::GetAtt to fail after a stack is resumed.
    
    Fixes bug #1227025
    
    Change-Id: I37b900c61b7d3017afe75fa726597f458be95d93

commit 89bb14f49996c7a2bfe76d0067c46823be77b675
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Sep 5 20:00:56 2013 -0700

    Stop stack updates from exceeding resource limit
    
    Previous patches raise an error when a newly created stack would exceed
    the limit. This one applies the same logic during an update. Note that
    nested stack updates will be handled in another patch.
    
    Change-Id: Ic5d32501f582640cb77629b902c32c8cb9c20b42
    Partial-Bug: #1215100

commit a06e37c79d98939f2486b4018dd8f7a93f013c1b
Merge: abbe435 ee15454
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 20 20:17:07 2013 +0000

    Merge "Limit resources per stack in nested stacks"

commit abbe435203c7c1dbb95952bb4133a7c848504d0f
Merge: 6d01a0d ecf3954
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 20 20:17:00 2013 +0000

    Merge "Provide config option to limit resources per stack"

commit c6b1c61376de61445612370ae5eb8f97e2bcfc43
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 19 22:31:16 2013 +0100

    Tolerate bad environment until validation
    
    Currently if we get a bad environment for a template_resource,
    it causes an exception in the resource constructor, which does cause
    the stack create to fail, but also all subsequent operations too.
    
    By tolerating the error in the constructor, we can catch it instead at
    validation time.
    
    Change-Id: Ia971d8f1c50ca6f265ec36ea564aeba1638de541
    Closes-Bug: 1227816

commit 6d01a0daa7171c01f09a2b57e6afccb4b7e6b3e0
Merge: f00272b 68c1d8e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 20 03:32:18 2013 +0000

    Merge "Encode values as utf-8 before encrypting"

commit ee154544a23ad61318b38b2cebc2cfef60e20b00
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Sep 5 15:10:16 2013 -0700

    Limit resources per stack in nested stacks
    
    In an earlier patch, the root stack creation was limited by the
    max_resources_per_stack config setting. Now we need to apply the same
    limit for nested stacks.
    
    Change-Id: I2f871a5d5f4c51dd9cd7c93e94f8b0c8d87fa069
    Partial-Bug: #1215100

commit ecf3954d2320fc79797d83873805168b8c837a8a
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Sep 5 15:07:47 2013 -0700

    Provide config option to limit resources per stack
    
    This provides an upper bounds on the number of resources a root level
    stack can contain. The limitation is only applied to the engine creation
    point so that existing stacks that are over the limit in the database
    will not cause problems. Nested stacks will be addressed in a follow-up
    patch.
    
    Partial-Bug: #1215100
    Change-Id: I1adcb22cf9bd5750b4ae3f219dd3264d1d02c1fc

commit f00272b3b852221fd725bce5ff097d5a40211674
Merge: fd903f8 82b7aa6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 22:45:17 2013 +0000

    Merge "Replace OpenStack LLC with OpenStack Foundation"

commit fd903f8b0d8bf2db7ce8dbfd31a71507a5c62de5
Merge: 7de9033 2ac86c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 19:26:04 2013 +0000

    Merge "Document aws loadbalancer properties"

commit 7de9033c5a709b39b94c592fdaf246a3822a68b6
Merge: b1af31f dbc6118
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 18:47:40 2013 +0000

    Merge "Document user properties"

commit b1af31ff181d7d401c646c3b60e6cb800da3c6e6
Merge: 3dd43b3 5feb3ac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 18:45:39 2013 +0000

    Merge "Document nested stack properties"

commit 82b7aa6c6cec8e17780f81a414e7be42c5c6adb7
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Fri Sep 20 02:34:29 2013 +0800

    Replace OpenStack LLC with OpenStack Foundation
    
    Change-Id: Ia3489a1cff5070b000098e278c772cb823ae688c
    Fixes-Bug: #1214176

commit 9789468e244af86c65de4128940c621f1eb83787
Author: Thomas Herve <th@rackspace.com>
Date:   Thu Sep 12 10:58:30 2013 +0200

    Document neutron health monitor and pool properties
    
    This adds descriptions to the properties of OS::Neutron::HealthMonitor
    and OS::Neutron::Pool, as well as gettext wrapping for the attributes
    description
    
    Closes-Bug: #1224172
    Change-Id: I1b7a974b8e8b557bd0ed56f3c08c43f385106738

commit 4ff53ac470957c36ac5d80a91872110318a64c3e
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Mon Sep 16 22:43:22 2013 +0000

    Use unicode() when serializing REST API errors
    
    Fixes bug: #1226244
    
    Change-Id: Iabbf286cd35522e30fbb03f56f5274d12288a695

commit 3b9050a104048cd4ba1f6b09ac6e28e02bca5487
Author: Steve Baker <sbaker@redhat.com>
Date:   Sun Sep 15 10:09:13 2013 +1000

    Document swift properties and attributes
    
    Change-Id: I4fdc87162ccf07241af6432bf000818a8a276f16
    Closes-Bug: #1224153

commit ac61272cd0665ab2d691531fb345b23cdff70e4b
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Wed Sep 18 15:01:51 2013 +0200

    assert_ is deprecated, use assertEqual
    
    All of the assert_ (which is actually assertTrue) were just
    comparisons, so I switched to assertEqual instead.
    
    Change-Id: Ie2fe5ccd5d546cc4a3eccdc008b066ffe905b294

commit 3dd43b3bde835f5dc4f46f81d51ed14d21486867
Merge: 0bde10c e64a553
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 14:25:40 2013 +0000

    Merge "Document instance resource properties"

commit 0bde10c663e22157d1fa2d23adcefe3be156bf25
Merge: 3088aec b9cc7ab
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 09:42:11 2013 +0000

    Merge "make get_flavor_id to work if input is flavor id"

commit 2ac86c22797f57ee27ad7556b1dc4e819e6dceb0
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Sep 18 17:58:38 2013 +0800

    Document aws loadbalancer properties
    
    This add descriptions to the properties of aws loadbalancer.
    
    Fixes bug #1224144
    
    Change-Id: I51bb7f05e543665c0cd97675aa051ed47bf8fb66

commit 0e363cae364631d01aa751df0437ab4f492e3b70
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Sep 18 17:42:05 2013 -0700

    Nested stack derive requires_deferred_auth from resources
    
    StackResource requires_deferred_auth needs to determine
    its value from the requires_deferred_auth of the nested
    stack.
    
    Change-Id: I206390b3f2fe099d88f255bdff81d2abe2496333
    Closes-Bug: #1223054

commit 9e191f2cb7c4fefa96a4e504187da918d8363097
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Sep 18 16:34:00 2013 -0700

    Mark reservation_id, config_drive as implemented
    
    In OS::Nova::Server these are actually implemented and should
    work fine.
    
    Change-Id: I975fc180e3ee9f8e339c655cf410d56892b23e03
    Closes-Bug: #1226774

commit 0c674a09557bce261130d11cf87542aac6bbd26d
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Wed Sep 18 22:19:29 2013 +0000

    Sync gettextutils from oslo
    
    Some Messages, like those from Invalid exceptions, use a Message within
    a Message, and we were only translating the base Message but not the
    Message substitution within.
    
    Fixes bug: #1221808
    
    Change-Id: Ic3119df23a090cfaa160c1461e955f0af55fe1cf

commit 3088aece2f345474d54e1a532ce9a63c55b6b874
Merge: 4ac9d24 9aaddd5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 22:18:28 2013 +0000

    Merge "Use built-in print() instead of print statement"

commit b9cc7aba48b720b2714f7c5acca914a8b73d15cb
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Wed Sep 18 12:27:33 2013 -0500

    make get_flavor_id to work if input is flavor id
    
    Current implementation of get_flavor_id throws exception if input
    value is a flavor id. This method is used in couple of resources
    where input flavor could be flavor id. This change is to avoid
    throwing exception if the input is flavor id.
    
    Fixes bug #1227255
    
    Change-Id: I11054d5f3a34a7e2afea140f8f37a21cb8eba419

commit 4ac9d247d20eb26ae4d7488b84ebeab51c0b46f9
Merge: e4b3d67 86ee53f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 16:59:34 2013 +0000

    Merge "Remove broken tripleo links from on_devstack doc"

commit e4b3d6717abe3cd45e3a9a8faf64df0f809c9899
Merge: 3c9d83e 3fee39f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 16:58:18 2013 +0000

    Merge "Document neutron vpn service properties"

commit 3c9d83e24d5c18d37d71822add84deb47f777167
Merge: 4999e5f a5807e4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 16:53:49 2013 +0000

    Merge "Docs for building heat-cfntools images with diskimage-builder"

commit 4999e5f84b0a14a733325c5a0c99ff4420f970d6
Merge: dd2e5c9 7f39374
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 16:51:29 2013 +0000

    Merge "Document autoscaling resource properties"

commit dd2e5c9c10d316db33189eb40945b0a7a7bde017
Merge: a3dc416 f9e94b1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 16:21:12 2013 +0000

    Merge "Add 'repeat_actions' property for OS::Ceilometer::Alarm"

commit a3dc416c4a060e29b1e20a47500b77f10ccdcb98
Merge: 6370a87 e093f7c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 15:27:19 2013 +0000

    Merge "Consistent logging in the API to better log exceptions"

commit f9e94b18a2b5721a49839c65d24608c42a5734f0
Author: Swann Croiset <swann.croiset@bull.net>
Date:   Mon Sep 16 11:55:43 2013 +0200

    Add 'repeat_actions' property for OS::Ceilometer::Alarm
    
    The default value is maintained : repeat_actions=False
    Require python-ceilometerclient>=1.0.3
    
    Fixes bug #1223347
    
    Change-Id: I010b6555311e9e34b095d9216cf1c5873e244cc4

commit 5feb3ac516c597b3325afd1f7dcb32104da289df
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Sep 18 15:47:43 2013 +0800

    Document nested stack properties
    
    This adds descriptions to the nested stack properties.
    
    Fixes bug #1224150
    
    Change-Id: I04a74f17e8e7ffc2a2d2bd0de333b103ee831744

commit dbc61189bfa21129e60cb454668aaf9a55167a7e
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Sep 18 16:37:47 2013 +0800

    Document user properties
    
    This adds descriptions to the properties of user, access key, and access policy.
    
    Fixes bug #1224154
    
    Change-Id: Ib1a7d77540e67ef99b82c41c5f25a57b292c6003

commit 9aaddd5b48f8ce83591e7bba8a9141f98a65a60f
Author: Chang Bo Guo <guochbo@cn.ibm.com>
Date:   Wed Sep 18 00:56:48 2013 -0700

    Use built-in print() instead of print statement
    
    In python 3 print statement is not supported, so we should use
    only print() functions.
    
    Fixes bug 1226943
    
    Change-Id: If88d77982ddbd1eb47265f15a27b747cd8011e76

commit e64a553fba49a1fa209ce6134b63a2ab4d7f6cc9
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 13 16:42:56 2013 +0100

    Document instance resource properties
    
    Adds descriptions to the properties of:
    * AWS::EC2::Instance
    * OS::Heat::HARestarter
    and wraps attribute descriptions with gettext _(
    
    Change-Id: I772de4777ba21f2952a725da0c7fbd72f7d78820
    Closes-bug: #1224139

commit 7f39374e0af1c4fc10d051de582ea5495678ea10
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 13 16:39:02 2013 +0100

    Document autoscaling resource properties
    
    Adds descriptions to the properties of:
    * AWS::AutoScaling::LaunchConfiguration
    * AWS::AutoScaling::AutoScalingGroup
    * AWS::AutoScaling::ScalingPolicy
    * OS::Heat::InstanceGroup
    and wraps attribute descriptions with gettext _(
    
    Change-Id: Ie825c2b122a6c2ce8ff83f9beb9f98487aaa8d54
    Closes-Bug: #1224131

commit 6370a8790efbe103f09387f4653f50c38f691f50
Merge: 7c525b9 84c50ab
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 01:11:25 2013 +0000

    Merge "Validate OS::Nova::Server block_device_mapping property"

commit 7c525b92b80284cf86c78f52c109d03c7f6803fd
Merge: dcdfc12 f0ce5cc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 01:11:23 2013 +0000

    Merge "Use strings for block device mapping info"

commit dcdfc12f89b01cdb8f0570620cb43c21b64fba44
Merge: 2eb8138 b1f05b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 17 23:40:31 2013 +0000

    Merge "Document ceilometer alarm properties"

commit 86ee53f18cdf340403c821595f86367ba0731452
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 17 19:07:56 2013 +0100

    Remove broken tripleo links from on_devstack doc
    
    The links referenced in the doc no longer work
    
    Change-Id: I0cd5f4580998457d00231a513e9328ca2e5b314c

commit 2eb8138fce6acad31f19c639bdd8d2099f130a83
Merge: 632108e 87eac1e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 17 17:04:51 2013 +0000

    Merge "assertEquals is deprecated, use assertEqual"

commit 68c1d8ed88ba6b8fa9dd8b50b985fb9ff033a203
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 12 15:18:10 2013 +0100

    Encode values as utf-8 before encrypting
    
    Ensure strings are correctly encoded before encrypting
    
    This is necessary because some encryption libraries don't handle
    the unicode conversion appropriately.
    
    Change-Id: Iebbf32e57ba21d955c1984ee32360379579366c8
    Closes-Bug: #1207707

commit 632108e3ab53c60cb98ec2239b72868bfeee63f2
Merge: b97fb5c c8b1421
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 17 14:17:11 2013 +0000

    Merge "Fix misused assertTrue in unit tests"

commit 3fee39fa86916b7466c958dfe8033ee474074528
Author: Bartosz Górski <bartosz.gorski@ntti3.com>
Date:   Wed Sep 11 12:59:12 2013 -0700

    Document neutron vpn service properties
    
    This adds descriptions to the properties of:
    * OS::Neutron::VPNService
    * OS::Neutron::IPsecSiteConnection
    * OS::Neutron::IKEPolicy
    * OS::Neutron::IPsecPolicy
    as well as gettext wrapping for the attributes description
    
    Change-Id: I3312cfbeeccee925e6b06b7ac061be16997bdd34
    Closes-Bug: #1224182

commit c8b142182f38fa0d1752a9f02361e30413d9ccf2
Author: Chang Bo Guo <guochbo@cn.ibm.com>
Date:   Tue Sep 17 02:02:50 2013 -0700

    Fix misused assertTrue in unit tests
    
    Refactored unit tests to use assertEqual instead of assertTrue
    where needed.
    
    Fixes bug #1226374
    
    Change-Id: I6826fefbb7c6fed8b0e664da36b144e882fb6d0e

commit a6fc747937199f84348e496f45a6fb0b5e1832fe
Author: Bartosz Górski <bartosz.gorski@ntti3.com>
Date:   Mon Sep 16 09:58:17 2013 -0700

    Document aws cloud watch alarm properties
    
    This adds descriptions to the properties of OS::Heat::CWLiteAlarm.
    
    Change-Id: I55cd7d632f1332ecb42024f040a33d1dfcf8f5b4
    Closes-Bug: #1224133

commit b1f05b688c6479d8c8eba71f8849cbddebddf722
Author: Bartosz Górski <bartosz.gorski@ntti3.com>
Date:   Thu Sep 12 15:47:40 2013 -0700

    Document ceilometer alarm properties
    
    This adds descriptions to the properties of OS::Ceilometer::Alarm.
    
    Change-Id: I3851c8785c0bd94aae6412e75a02ee98ce13478b
    Closes-Bug: #1224162

commit b97fb5c7ad69c396afe245a0f7ca0fa475f8ebd4
Merge: 9ce68af 9510e87
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 16 22:23:42 2013 +0000

    Merge "Pass debug mode to eventlet.wsgi.server"

commit 87eac1e268168c83000b9b63128cf7d3675c9325
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Mon Sep 16 23:00:10 2013 +0200

    assertEquals is deprecated, use assertEqual
    
    Change-Id: If77b02e69d01e02db03ccb8613dcc327eb2844db

commit 9ce68af5fbd2456da9d06a659aafcd0fb4ffdb51
Merge: 684b401 9e9c747
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 16 20:11:41 2013 +0000

    Merge "Only send traceback to users when in debug mode"

commit 684b4017e15ce8c59f7dd77f766f2dedab637e62
Merge: adacf14 8f52870
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 16 18:49:32 2013 +0000

    Merge "Add methods to help calculate a stack's resources"

commit adacf1423d79d1a5acf2f28a609b97fddb76df23
Merge: 95bab11 350f48f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 16 18:14:15 2013 +0000

    Merge "Add DB API to get the count of stacks per tenant"

commit a5807e42719043fad6f46337d717450e0c8ed5c8
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Sep 13 17:04:28 2013 +1200

    Docs for building heat-cfntools images with diskimage-builder
    
    Change-Id: I5ec805f8800a48b798700532551f0414fc6f6be0

commit 95bab111c4abb7c47df1c12811075a02d45a0254
Merge: 378d73e 3640315
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 14 10:23:58 2013 +0000

    Merge "Add security_groups for create_port()"

commit e093f7c8b69fda6ff312ba99c3b3f4cfeaeb1a57
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Thu Sep 12 20:50:56 2013 +0000

    Consistent logging in the API to better log exceptions
    
    With this patch we log the actual message of an exception instead of its
    str() representation. This allows for consistent error logging in the
    API.
    
    Fixes bug: #1224646
    
    Change-Id: I3965bffb1c2c2eee0af440d1ecd30ccb3bb958d5

commit 378d73e6fbfedac73731c7ae2c29e4dde90ef5f4
Merge: a001844 34e01f8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 13 18:34:43 2013 +0000

    Merge "Use the generic RequestLimitExceeded exception when possible"

commit a0018444a9a82ba731db7df3bd340153d60b2653
Merge: a71749d 365cc42
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 13 17:58:50 2013 +0000

    Merge "Document volume properties"

commit a71749dcf37c92125def75d280dd62032c3af2ca
Merge: 688a04e 9d4af61
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 13 17:58:43 2013 +0000

    Merge "Add error handling to property value resolution"

commit 34e01f8c620326c8d9111aa08852ca57b669e369
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Tue Sep 3 14:35:07 2013 +0800

    Use the generic RequestLimitExceeded exception when possible
    
    Rather than having lots of specific exceptions that all pertain to request
    limitation, we can just use the RequestLimitExceeded exception when applicable,
    which can also simplify the handling of exception mapping in fault.py.
    
    Change-Id: I61b1e59912087fad286e74c22af15ffe6382bb65

commit 688a04ed999c679f3314cba1d9b1e40028160e79
Merge: 799b2ff 5658b72
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 13 08:28:05 2013 +0000

    Merge "Migrate remaining TEXT columns to LONGTEXT"

commit 84c50ab91cc8d2b080a064a81285b82fdb8df9fc
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Fri Sep 13 14:28:15 2013 +0800

    Validate OS::Nova::Server block_device_mapping property
    
    Make sure either volume_id or snapshot_id exists but not both. Also this patch
    ensures that a bootable volume is specified when image is not given.
    
    Fixes bug #1215267
    
    Change-Id: Ia51f6c7aec9c0b257318992ee58febc392ea3d84

commit f0ce5cce6e1845f33fc221309a0465753562f6e0
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Thu Sep 12 23:19:44 2013 +0800

    Use strings for block device mapping info
    
    Nova client receives colon separated strings for block device mapping info
    instead of a list.
    
    Fixes bug #1221693
    
    Change-Id: I321001d406f620d5f8a21e0f28cf706579ad64ad

commit 8f528704e154c9927c7f2bcd6bc25ea3fb100ae4
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Sep 5 15:02:32 2013 -0700

    Add methods to help calculate a stack's resources
    
    In order to limit a stack's size in future changes, we need to know
    how many resources are already in the stack. We also need to be able
    to find the root stack object of a nested stack.
    
    Change-Id: Ib848bcd2e10d02dffc30dce45a2675a9f718fa7d
    Related-Bug: #1215100

commit 9d4af61655f3808c789990e8423139ec2196b0e1
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Thu Sep 12 20:07:00 2013 -0500

    Add error handling to property value resolution
    
    Fixes bug 1224746
    
    Change-Id: I990de0159e0fb49e52afdaab546f8d74372422bf

commit 799b2ff31df372dcf8cf22b73353df9321bae31c
Merge: 6cd54b3 81def8b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 12 16:21:38 2013 +0000

    Merge "Remove py33 from tox.ini until eventlet is ported"

commit 5658b7267d3f7070371fb6a8d54e0c128db9b39b
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 12 12:00:28 2013 +0100

    Migrate remaining TEXT columns to LONGTEXT
    
    To avoid cases where mysql silently truncates json data
    when it is > 2^16 bytes, migrate all remaining TEXT columns
    to LONGTEXT, in a similar way to the fix for bug #1210799
    
    Combined with the fix for bug #1215501 which limits the request
    body size, we should never truncate, even if mysql is configured
    such that it can happen
    
    Fixes bug #1223029
    
    Change-Id: Ib536cfa8e2952a5e047cd8573288cdd9fee0622c

commit 365cc42c75d3b96eb71563e5f8c5cf76a971af00
Author: Thomas Herve <th@rackspace.com>
Date:   Thu Sep 12 10:28:28 2013 +0200

    Document volume properties
    
    This adds documentation to the volume and volument attachment
    properties.
    
    Closes-Bug: #1224158
    Change-Id: I22b4c8cb301b5de63418fd029ddf7f31087dfb8b

commit 6cd54b342a9e364971492fcda90e944cc16a9457
Merge: 322f86d 01fe090
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 11 21:27:09 2013 +0000

    Merge "Use physical_resource_name as Ref for Instance/AS Group"

commit 322f86d0cec22e11b2faecd68c0a26d3b2667aa0
Merge: fe3eccd d899f8d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 11 19:16:18 2013 +0000

    Merge "Impose a size limit on JSON request body"

commit fe3eccd0ac1a3d823ec07651859e718fbf78ceef
Merge: a4eb239 7809499
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 11 14:25:11 2013 +0000

    Merge "Enclose command args in with_venv.sh"

commit 364031588b7e1faee09191f469089ef62610f6b2
Author: Hui HX Xiang <xianghui@cn.ibm.com>
Date:   Fri Sep 6 05:48:52 2013 -0700

    Add security_groups for create_port()
    
    Currently if defined SecurityGroups and SubnetId properties for
    instance in heat template, the SecurityGroups were not associated
    to the port created within the previous SubnetId, in another word,
    the instance are not allocated to the specified security groups
    defined in heat template.
    
        * Modifies function _build_nics() in instance.py, adding an item
    'security_groups' in the post body of create_port sending by neutronclient.
        * Adds a new function _get_security_groups_id() to map security_groups
    names to ids.
        * Adds corresponding unit tests.
    
    Fixes bug #1221564
    
    Change-Id: Ica2df7c6f96bc982a5bd5ece3611949ae905e5c8

commit d899f8d9b745af7f9e7240389718bd3c8045a7dc
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Sat Aug 31 14:53:43 2013 +0800

    Impose a size limit on JSON request body
    
    The size limit on JSON request body is to ensure the server not being
    overwhelmed by extremly large JSON request body.
    
    Fixes bug #1215501
    
    Change-Id: Ia58f6690e994d34212953c44821f7a4cc4c435fe

commit a4eb239ac62ab121ed9ea969dec9fdc7434a27a3
Merge: e88568d ca0ec08
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 11 02:30:33 2013 +0000

    Merge "Make some heat resolve functions workable in hot"

commit e88568dadabe53fda873d751f3cd7a802bef3265
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Mon Sep 9 16:16:17 2013 -0500

    Add HOT functions to dependency checks
    
    Fixes bug 1223035
    
    Change-Id: I7859a59490151885d4efe9bd36c612474d45b5f5

commit 01fe09007222a3a701896a514a5de4dba7383e36
Author: Swann Croiset <swann.croiset@bull.net>
Date:   Fri Sep 6 14:48:41 2013 +0200

    Use physical_resource_name as Ref for Instance/AS Group
    
    This allows to distinguish groups by stack when using resource
    OS::Metering::Alarm with the rule:
    matching_metadata: {
        'metadata.user_metadata.groupname': { 'Ref': 'WebServerASGroup'}}
    
    And add test for AutoScalingGroup Tags
    
    fixe bug #1215840
    
    Change-Id: If3de5c4abddcfb49f711db223a0c1a8c70f3c15a

commit ca0ec0878a82bfb0f64beb73e669e3978d3a0e4c
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Thu Sep 5 13:26:01 2013 +0800

    Make some heat resolve functions workable in hot
    
    Make resolve functions Ref, Fn::GetAtt, Fn::Replace workable in hot.
    
    Fixes bug #1221017
    
    Change-Id: I9b7ca58720b3c7d157c79c3756510ebc62d81ee5

commit 7809499daba573b4c3b783a0c603595cf7d03c85
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Mon Sep 9 14:36:33 2013 +0800

    Enclose command args in with_venv.sh
    
    It will support argument with blanks.
    
    Change-Id: Ic3a00bdafc11459e9726eb99c7bc637d385e859a
    Closes-Bug: #1220937

commit 20a8a0833305854146206f69a41d12c3c681f4b0
Merge: 5f408db 6d1a3db
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 7 20:52:13 2013 +0000

    Merge "Set a small max_template_size for test_long_yaml"

commit 5f408dbee4b4ae0af5ccf64843933e18cfc4cd9f
Merge: 3734484 af238fb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 7 20:52:06 2013 +0000

    Merge "Only validate credentials on create based on resources"

commit 9510e87e421bc64d9784a171f7c49168e69898f4
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Sep 6 21:17:14 2013 -0700

    Pass debug mode to eventlet.wsgi.server
    
    Previously if any exceptions accidentally made their way to
    eventlet.wsgi.server's response handler it would print their traceback.
    We only want to show users tracebacks in debug mode. In production we
    want them suppressed.
    
    Fixes bug #1222008
    Change-Id: Ieb11f75ebffc67bd584432cfd8eeaac010fce7ca

commit 9e9c747b4ec0f1972da1d122e46402b00cd0911f
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Sep 6 20:53:58 2013 -0700

    Only send traceback to users when in debug mode
    
    API services currently send the traceback to clients. While the client
    hides it from user view, it is still present in the response, exposing
    the service to details of the engine that administrators likely would
    not like to have exposed.
    
    Fixes bug #1210623
    
    Change-Id: I554ba24b7ac9166e28a8a0a10f566ed9cfa03014

commit 3734484056d361d76e6040f4bca47d53a5a62532
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Sep 5 20:49:48 2013 +1000

    Change the dbinstance to F19
    
    The current template is based on F17 which is eol.
    
    Closes-Bug #1215797
    Change-Id: I888fba67dc8412c8b57243d76b45494a6beb91c4

commit 13b7f54ad810c7471afd55458c6034b7777a5a2b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Sep 5 20:47:07 2013 +1000

    Move dbinstance into a TemplateResource
    
    The old dbinstance will soon be overtaken by the trove resource.
    - The only reason for keeping this around is for people that don't
      have trove installed and want to use the AWS resource.
    - Seperating it out into a TemplateResource really makes it easier
      for deployers and users to customise it.
    - The old dbinstance did nothing "special" in python, and was really
      one of the first "TemplateResources" as it attempted to convert properties
      into parameters. Since this in now done a lot better in the TemplateResource
      lets just make use of that.
    
    This will make it easier to migrate to other distros and versions.
    
    Partial-Bug: #1215797
    Change-Id: If72e1f40f67dc831551e0db8df8caaa002aaaeda

commit 5fc4d75cf52ef39149a1d5fe69de7f7019659a58
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Sep 5 19:50:08 2013 +1000

    Make global TemplateResources usable in the tests
    
    At the moment we need the templates installed into /etc/heat/templates
    and this is not very nice for the tests. So this patch
    replaces "/etc/heat/templates" with the project's own template
    path so we can at least test the api of the template resources.
    
    Partial-Bug: #1215797
    Change-Id: Ie4924b0358b97af8feaad93ed9187976b8932e3d

commit e884ae5057420f936a03826ad047b81faa3f646b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Sep 5 11:16:55 2013 +1000

    Make the new template validation usable from tests
    
    This is so we can assert that new TemplateResources expose the
    api that we are expecting.
    
    Partial-Bug: #1215797
    Change-Id: I6273f6e046bb7bd5e075e9190d8011af976573b8

commit 350f48f505ed4dea8af5aed0d735b7d548411ee8
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Sep 6 10:34:53 2013 -0700

    Add DB API to get the count of stacks per tenant
    
    This method will be used to limit the number of stacks any one tenant
    can create.
    
    Change-Id: Ic990bf84fc1aa5592504f7c423fbce953615a4a1

commit 340dc1bdd2a14ca866e9d45f09a616359bc7521f
Merge: dc11872 8a0043f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 6 04:04:10 2013 +0000

    Merge "Run cfg.CONF.reset() on test cleanup"

commit dc11872f7d6329161234a1032aa6796d61cfd17b
Merge: 46dcceb 8282ab4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 6 04:04:03 2013 +0000

    Merge "Fix H233 in sphinx config"

commit 6d1a3db495b0d2a369dcbcc2e4a461aecfa0e768
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Sep 6 11:39:43 2013 +1200

    Set a small max_template_size for test_long_yaml
    
    Currently this test takes 22 seconds to run. As the intent
    of the test seems to be to assert that limits are enforced,
    this change reduces the default limit to speed test execution time.
    
    Change-Id: Ie12c53b832c993711c2187004d015b65045da901
    Fixes-Bug: #1221478

commit af238fbd081f7c14016d923c3924a648963fdeca
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Aug 30 17:21:56 2013 +1200

    Only validate credentials on create based on resources
    
    This change relaxes the validation which checked for credentials
    on stack create and update.
    
    As implemented, having any of the following resources
    in the template will result in credentials being mandatory
    on create and update:
    * AWS::AutoScaling::ScalingPolicy
    * OS::Heat::HARestarter
    * AWS::CloudFormation::WaitConditionHandle
    
    For all other templates, credentials are not needed.
    
    When trusts are merged, this logic could also be used to decide
    whether a trust token needs to be created at all.
    
    Fixes bug: #1217617
    
    Change-Id: I3e4b8698d3712053dc3c0851433ef0cbbadbdfed

commit 8a0043f5d63c7f918eb103d7922ff6a1c2c5d588
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Sep 6 11:35:38 2013 +1200

    Run cfg.CONF.reset() on test cleanup
    
    This means clear_override and clear_default do not
    need to be called explicitly for each set_override and set_default
    call.
    
    This also fixes any potential test execution order issues
    where an option has been set without being cleared at all.
    
    Change-Id: Ic40c3be10b32eb3011bc0733cee9c1faaf8f1240
    Fixes-Bug: #1221476

commit 8282ab4ddbda95b16a84cf974d520c74cb132bf5
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Sep 4 11:14:50 2013 +1200

    Fix H233 in sphinx config
    
    This is being flagged in local flake8 runs.
    
    Change-Id: I99f05996711b3851811940ad5741e96d5ae61ed6

commit 46dcceb8986b7e93a4a4bd4370b317d522c7d516
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Sep 5 14:19:23 2013 +1000

    Fix TemplateResource list property conversion
    
    In the convertion from "a,b,c" to ['a', 'b', 'c'] we are
    not checking for the case of an empty list.
    
    Change-Id: I834c4755abf33793a9484138f9dac97d7d8194da
    Closes-bug: #1221009

commit 4be24748750d09e5206d967b3c49077f33250ea0
Merge: d1d2285 a560ca0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 09:58:12 2013 +0000

    Merge "parallelize StackResource delete"

commit d1d22851b8e81f5b4c983274addc1d8b3c033b22
Merge: 9ded000 452f1ec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 06:40:46 2013 +0000

    Merge "Adding IPsec site connection to Heat resources"

commit 9ded000d81060164313abab69a626c6605c4bec4
Merge: 3088d35 aa8a3b8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 06:39:31 2013 +0000

    Merge "Adding IPsec policy to Heat resources"

commit 3088d35b41e7df7c27f91171315c14b09decb997
Merge: e8612dc 51d0d64
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 06:39:29 2013 +0000

    Merge "Adding IKE policy to Heat resources"

commit e8612dc9e1fd517f0b1c9118ee89e0e4f5fdd005
Merge: 7371558 109d01c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 06:39:26 2013 +0000

    Merge "Adding VPN Service to Heat resources"

commit 7371558ef37873a88ee4064cf6dd2bc239216351
Merge: 2c92aab 524a1e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 06:39:24 2013 +0000

    Merge "update neutronclient to 2.3.0 minimum version"

commit 2c92aaba6c22bb05a8f49380a4269f4e9029585b
Merge: 42aaccf 6c5c47f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 06:37:02 2013 +0000

    Merge "Remove some heat-cfnclients only exceptions"

commit a560ca0a1bea2b20a8aab42369a2319ca53d16f8
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Thu Aug 29 13:23:16 2013 -0500

    parallelize StackResource delete
    
    This is fourth and last  patch in the series to implement
    parallel delete. In this patch, parallelizing StackResource
    deletion.
    
    Blueprint parallel-delete
    
    Change-Id: I49fb4ad64dd4245b61fad28a401174b11f2b8272

commit 42aaccf6ab1f14e23ab0d2ad32f670811781e7f6
Merge: 207e6d3 00f751b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 00:39:31 2013 +0000

    Merge "parallelize instance delete"

commit 207e6d335d98d694ef637d4fe12c260372e87317
Merge: 484e698 bf65eed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 00:37:20 2013 +0000

    Merge "parallelize volume deletion"

commit 484e698ec482cae669027dfa49e1ba4b431b1cca
Merge: fceff8b 49d414e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 00:37:18 2013 +0000

    Merge "Implement parallel delete"

commit 452f1ec16709abf541ad6bf1a3216ba549661895
Author: Bartosz Górski <bartosz.gorski@ntti3.com>
Date:   Mon Sep 2 18:54:11 2013 -0700

    Adding IPsec site connection to Heat resources
    
    Adds Neutron IPsec site connection component to resources
    supported by Heat with unit tests.
    
    Change-Id: Idf3c92b9a7ac513e7f7ab0d2501668405189ebc6
    Implements: blueprint vpnaas-support

commit aa8a3b87a23bf24729cfbba5f0b65722d6fc86c5
Author: Bartosz Górski <bartosz.gorski@ntti3.com>
Date:   Mon Sep 2 18:54:11 2013 -0700

    Adding IPsec policy to Heat resources
    
    Adds Neutron IPsec policy component to resources
    supported by Heat with unit tests.
    
    Change-Id: I5014c50d51afe6a3a9b62cf3e88cbd6f7f60a62e
    Implements: blueprint vpnaas-support

commit 51d0d6407f07ad9a1f918ef1896f2cfede74a95b
Author: Bartosz Górski <bartosz.gorski@ntti3.com>
Date:   Mon Sep 2 18:54:11 2013 -0700

    Adding IKE policy to Heat resources
    
    Adds Neutron IKE policy component to resources
    supported by Heat with unit tests.
    
    Change-Id: I54a83aededc779ddcf44ce72b0a1bb2b69a26094
    Implements: blueprint vpnaas-support

commit 109d01c50fec51cb77ed78c9a9dac0f43ff30fdb
Author: Bartosz Górski <bartosz.gorski@ntti3.com>
Date:   Mon Sep 2 18:33:05 2013 -0700

    Adding VPN Service to Heat resources
    
    Adds Neutron VPN service component to resources
    supported by Heat with unit tests.
    
    Change-Id: I3a626166253bcb33d8875cf406b293688f53ffa3
    Implements: blueprint vpnaas-support

commit 524a1e32a53f6b66f298dc3055edf019300b507c
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Sep 3 16:37:01 2013 -0400

    update neutronclient to 2.3.0 minimum version
    
    Change-Id: I01a6899c43ae6ff63794267d2dd4ab32f06fa643

commit 00f751b2c479aee91d97a8d04b0cd6e5dbc0dbfa
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Thu Aug 29 12:44:33 2013 -0500

    parallelize instance delete
    
    This is third patch in the series to implement parallel delete.
    In this patch, parallelizing instance deletion
    
    Blueprint parallel-delete
    
    Change-Id: I86d2e25901b330dcf4b0e512eec66fb71199727b

commit bf65eedf3f1335088e332f26f54fa39c0bb2801d
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Thu Aug 29 11:39:18 2013 -0500

    parallelize volume deletion
    
    This is second patch in the series to implement parallel delete
    In this patch, parallelizing volume deletion and updating relevant
    tests
    
    Blueprint parallel-delete
    
    Change-Id: Iaded5951618c2ac52c26d6d6437f152c658ad9cf

commit 49d414e44551b3ec1513e7beb3c9ca7828aefd6d
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Thu Aug 29 08:59:46 2013 -0500

    Implement parallel delete
    
    This is first patch in the series to implement parallel delete
    and it includes following changes:
    
    1. changing Stack.delete to use stack_task
    2. In Resource.delete polling for check_delete_complete
    3. Updating unit tests to use TaskRunner for resource.delete and
       resource.destroy
    
    Blueprint parallel-delete
    
    Change-Id: I8a96b1a956388372c29f9f45445f397467667110

commit fceff8b9651e3e43c72be679448802111a17d17c
Author: Simon Pasquier <simon.pasquier@bull.net>
Date:   Wed Sep 4 16:12:08 2013 +0200

    Fix AttributeError exception in autoscaling
    
    Use the nested() method instead of directly accessing the _nested
    attribute which isn't always initialized.
    
    Fixes bug #1220737
    Change-Id: I9f36d98e91d5175b354e423d7159e690b1e5b696

commit 9a46d0a3301047ac4fb8e9fe407422addfd33e3b
Merge: f8dc4e9 a9e7278
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 15:34:36 2013 +0000

    Merge "Update nested stacks in parallel"

commit f8dc4e960a78b8d8a7e1a6e2a1c49471f64ca96f
Merge: e03d113 f28446e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 15:33:05 2013 +0000

    Merge "Fix problem with mocking tasks"

commit e03d1131a5a1c1b5acb8403c553e9bf1ea13040f
Merge: c0cc662 8f57e2e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 15:33:03 2013 +0000

    Merge "Create a Stack.update_task() method"

commit c0cc662d739aaedacb0ceac19642a401ddd90a48
Merge: cf4b2e6 7f3c7c6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 15:25:18 2013 +0000

    Merge "Change _testnoexisthost_ references in tests"

commit cf4b2e6d45c0f91a740b861eeae0886eec6f14e3
Merge: 0ea7f8c e686699
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 15:25:16 2013 +0000

    Merge "Migrate stored credentials to keystone trusts"

commit a9e7278d00d95a5376a895069624517429c7671b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 4 10:44:39 2013 +0200

    Update nested stacks in parallel
    
    This parallelises updates for AWS::CloudFormation::Stack resources, but not
    for autoscaling groups. Other types of nested stacks (the old LoadBalancer
    and DBInstance resources, and provider templates) have not yet implemented
    stack updates.
    
    Change-Id: I86e1d5289487b34712c248bc5e68e62cc4651ec6

commit f28446e970258fac0979ddd0f6d436cc779cb488
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 4 10:44:39 2013 +0200

    Fix problem with mocking tasks
    
    It was previously impossible to stub out a task with mox, because when the
    TaskRunner attempted to get the __name__ attribute it prompted an assertion
    in the mock. Using hasattr() instead of getattr() eliminates this issue.
    
    Change-Id: I3757a77daf59cbb3c0a8b60329d490a89e7ec1d3

commit 8f57e2e8b2019b72de5ee5496746944f306784f8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 4 10:44:39 2013 +0200

    Create a Stack.update_task() method
    
    This will allow nested stack resources to run updates in parallel with
    other resources.
    
    Change-Id: I184666182f5b9648d2d297d4290eb8608a09c0f0

commit 0ea7f8c966a61afeac66c5aebac2866f70dba244
Merge: e8739a5 b4130af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 03:35:35 2013 +0000

    Merge "Make error message for InvalidTemplateReference sane"

commit e8739a5f352cabdd0b59043d6913e86b1416f8e3
Merge: 9d5d70c f2acd0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 02:12:14 2013 +0000

    Merge "Add unit tests for Resource dependency inference"

commit 7f3c7c690ee1968304b239486419d17dcd0bdbc8
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 4 00:05:42 2013 +0100

    Change _testnoexisthost_ references in tests
    
    These dummy urls are obviously invalid, but could potentially trigger
    unexpected failures due to the underscores.
    
    Instead use RFC2606's recommended test TLD of '.test' ensures
    that these will never resolve.
    
    Change-Id: I2723b18ef3eba81ee8c8a22d866ceb79c00aad75

commit e686699b00ee2ca190946261677d89641707e6c6
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 2 16:32:40 2013 +0100

    Migrate stored credentials to keystone trusts
    
    Migrate the stored user_creds, which currently only supports
    storing username/password credentials to use the keystone v3
    API OS-TRUST extension, which allows explicit impersonation of
    users calling heat (trustors) by the heat service user (the
    trustee)
    
    Note this feature is made optional via a new config option,
    defaulted to off, and it requires the following patches to
    keystoneclient (in 0.3.2 release) and keystone to work:
    
    https://review.openstack.org/#/c/39899/
    https://review.openstack.org/#/c/42456/
    
    Also note that if the feature is enabled, by setting
    deferred_auth_method=trusts in heat.conf, you must add
    a keystone_authtoken section, which is also used by the
    keystoneclient auth_token middleware.
    
    blueprint heat-trusts
    
    Change-Id: I288114d827481bc0a24eba4556400d98b1a44c09

commit 9d5d70ca6d7132e1e8ad244237bfd57e4894465b
Merge: 963ae76 9cf5a38
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 3 21:49:50 2013 +0000

    Merge "Allowing to pass network name to router gateway"

commit 963ae7696f567b477d6ca1ae523a34ec254f52dc
Merge: ff0122f fc0361a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 3 21:42:22 2013 +0000

    Merge "Don't use a query for watch_rule_get()"

commit 81def8b28d1e8bbcab1a529131a035cef77dda48
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Sep 3 11:36:49 2013 -0700

    Remove py33 from tox.ini until eventlet is ported
    
    There is no point in trying to run the py33 unit tests until eventlet is
    ported to Python 3. Meanwhile the expected failure means we get a bunch
    of garbage and extra lag time when trying to run 'tox' before sending to
    gerrit for review/CI checks.
    
    Change-Id: I343e24e77e097a2249a7ace1903faeaed71d7393

commit ff0122f83f13082b3a89f38fe2aa0b52c7e6d492
Merge: b6189b3 723b90e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 3 18:28:25 2013 +0000

    Merge "Parallelise Server updates"

commit b4130affa26ce17b311fea8a23dbe5c22f972ed6
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Sep 3 17:22:22 2013 +0200

    Make error message for InvalidTemplateReference sane
    
    Previously it was more or less incomprehensible. Now it will report the
    non-existent resource the uesr tried to reference and the path (starting
    with Resources) in the JSON document where the error occurred.
    
    Change-Id: Id98eb4157df16674b8c8a9a190b82ee350c5386f

commit f2acd0e6147b71f4fa989a0ce44c6cb59ce5eb78
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Sep 3 12:04:13 2013 +0200

    Add unit tests for Resource dependency inference
    
    Change-Id: Idd05c880913081dccfbcbb1f26a528705e5ec924

commit b6189b33b46d000e6f225278711a9b429c98fef1
Merge: f1da454 85968a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 3 13:54:43 2013 +0000

    Merge "Add trust_id and trustor_user_id Context and DB"

commit 6c5c47fa0e7daa9d61e87b4e3335b0f07aab3a9d
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Tue Sep 3 13:30:50 2013 +0800

    Remove some heat-cfnclients only exceptions
    
    Remove some exceptions that were written specifically for
    heat-cfnclients and are unlikely to be referenced anywhere
    else in the future.
    
    Change-Id: I834138a833042449293f7b96a6c5bcfba8424d73

commit 85968a7495c10a03be58bbfd074a2a7e6d7116d5
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 2 16:29:39 2013 +0100

    Add trust_id and trustor_user_id Context and DB
    
    Add trust_id and trustor_user_id to the user_creds table
    and related RequestContext object
    
    blueprint heat-trusts
    
    Change-Id: Ie0fdc5068475db7e84f366d1eb2b9ae56db0b3fc

commit 9cf5a38a6e48a5c97dc552fcdd00c26b05bb2842
Author: Bartosz Górski <bartosz.gorski@ntti3.com>
Date:   Wed Aug 14 03:52:37 2013 -0700

    Allowing to pass network name to router gateway
    
    This patch allows to pass newtork name instead of network id to create router
    gateway. It is really useful feature because often router has gateway as public
    network. It is easy to pass the name because id will change after deleting the
    network and creating it again.
    
    Change-Id: I5768408b86b509ecfd117f17b10db06af82369d8

commit fc0361a897b4683740b75feca82c022b0b1465e0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Sep 2 16:02:14 2013 +0200

    Don't use a query for watch_rule_get()
    
    When getting a database record by ID, it is much more efficient to get() it
    directly than to perform a query or the database to obtain the ID (again)
    and then get it.
    
    Change-Id: I89b46d698c033e54ee9a50172ccad3eb3833cb1e

commit f1da4547beff30c922bdf8dca7e074f64bd6ae88
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Sep 2 16:00:36 2013 +0200

    Don't use a query for stack_get()
    
    When getting a database record by ID, it is much more efficient to get() it
    directly than to perform a query or the database to obtain the ID (again)
    and then get it.
    
    Since stack_get() returns only a single record that can be trivially
    checked for deletion in code, do this rather than performing a query with a
    filter.
    
    Change-Id: I4bb3ea1a9c4ae928fe0f5bce5c02b842a3f1ab4f

commit 4fd744173f7f8ab5a0e4e825e85f2729bed18677
Merge: 31c42e4 c8c61d9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 2 13:31:55 2013 +0000

    Merge "Delete the old example config files"

commit 31c42e4757e22a3c1831eecaf711ceee8996873b
Merge: 9471186 ae28bf4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 2 13:02:58 2013 +0000

    Merge "Remove references to the multiple config files"

commit 947118656794844a1fbb6e4b1f5065e8c580a8ad
Merge: ce9f800 24c5d98
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 2 12:02:28 2013 +0000

    Merge "Rackspace: Parallelise CloudServer updates"

commit ce9f80014ef375997b2e851da81701d033ae524d
Merge: fa0c762 fc007a1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 2 12:00:47 2013 +0000

    Merge "EC2token middleware implement multi-cloud auth"

commit fa0c7622b6318dc73e90e88c929894baa4d47ca6
Merge: 1263159 7f1c6e9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 2 12:00:45 2013 +0000

    Merge "Sync rpc from oslo-incubator"

commit 1263159442138ddec5c1abfe5cfc1949c7bfa540
Merge: 3a5ec73 cb5fae0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 2 11:02:47 2013 +0000

    Merge "Parallelise Instance updates"

commit 3a5ec7371733bc6a7bd751cc601cbf9da8ee5220
Merge: 60dc7a8 5532be0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 2 11:02:40 2013 +0000

    Merge "Allow resources to be updated in parallel"

commit 60dc7a8bdd07d962079b69cfc02fd2aff90e8d1f
Merge: a162d04 4da718c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 2 11:00:37 2013 +0000

    Merge "Don't stub LoadBalancer.update in autoscaling tests"

commit a162d041372d6f0102af8929db659fbaf26e89a6
Merge: 24cb75b 8b73224
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 2 11:00:30 2013 +0000

    Merge "Do updates based on a single dependency list"

commit 24cb75b932a397d0a737c5b20b7b069d484b435f
Merge: fb5b145 3334a88
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 2 10:54:11 2013 +0000

    Merge "Make security groups associated with Neutron port work"

commit fb5b145417a41570710b2ef76d45cf68a2689352
Merge: e710fd3 f70d459
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 2 10:45:43 2013 +0000

    Merge "Support ISO8601 duration format for UpdatePolicy PauseTime"

commit c8c61d93a575ee82255f5d6676626f4dda7f291b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Aug 29 11:58:44 2013 +1000

    Delete the old example config files
    
    heat.conf.sample is the master sample now.
    
    Change-Id: I732bc8a363c3829a68fddfb4c03cf4bca52d8842

commit ae28bf4c89a69f854eb4556fb584f0d4f92526ad
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Aug 29 12:05:37 2013 +1000

    Remove references to the multiple config files
    
    Only refer to heat.conf in the docs and scripts.
    For install.sh copy the iniset() function from devstack
    to assist in setting some semi-sane defaults.
    
    Change-Id: I933891e35103c003f1272bc89c7b42d2ad76697b

commit f70d459ea6dd1b5e994d6a2fb0ded4b4f4c0d8d3
Author: Winson Chan <winson.c.chan@intel.com>
Date:   Sun Sep 1 13:13:58 2013 -0700

    Support ISO8601 duration format for UpdatePolicy PauseTime
    
    Adds a timeutils module in heat common to handle ISO 8601
    duration format. Separating this as a different patch per
    request.
    
    Change-Id: I2fe6fccde838f4ddac6b898e4518ffb33e2a76fc
    Implements: blueprint as-update-policy

commit 7f1c6e97736ba36de27e7faf76442c3706557811
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri Aug 30 17:57:29 2013 -0400

    Sync rpc from oslo-incubator
    
    This includes the following changes:
    
    76972e2 Support a new qpid topology
    284b13a Raise timeout in fake RPC if no consumers found
    9721129 exception: remove
    7b0cb37 Don't eat callback exceptions
    69abf38 requeue instead of reject
    
    Change-Id: I9113991aebe7d566c8877d74aad9d55b65fdfb9e
    Closes-bug: #1178375

commit 3334a882490e7fe048fa73cdc4004ba02b455854
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Aug 23 16:44:37 2013 -0400

    Make security groups associated with Neutron port work
    
    The security group names are now translated to UUIDs which is required
    when using the python API. The lookup has been improved to find
    existing security groups not part of the stack as well.
    
    Fixes bug #1179481
    
    Change-Id: I4f86bade87f89b867d12822c5f80aa5b075b7fbb

commit 723b90ef8942af2300af544459349f4fbf7f35c7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 30 15:27:59 2013 +0200

    Parallelise Server updates
    
    Change-Id: I6a2e5841a3a65edb99f227d5849800eb696c9faa

commit 24c5d98ae44c82a50e56a38b6996f87d7b496da0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 30 15:25:54 2013 +0200

    Rackspace: Parallelise CloudServer updates
    
    Change-Id: I7c5f42500a3c207f0f2e9149dba092519f65a2a2

commit cb5fae02f50342b4d0621653c89151bfbf67ff75
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 30 15:16:24 2013 +0200

    Parallelise Instance updates
    
    Change-Id: I358f7fbdb3232f4bf528d170476935ef2b4239cc

commit 5532be0ecf46e0affa7999ebebea977c4be6b6f4
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 30 20:45:54 2013 +0200

    Allow resources to be updated in parallel
    
    Turn Resource.update() into a coroutine.
    
    Change-Id: I625a2d81095cc28161f8e2342121bfe1939611e3

commit 4da718ce544076926abeb01a8ba61b71d33e530e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 30 20:45:54 2013 +0200

    Don't stub LoadBalancer.update in autoscaling tests
    
    Stub handle_update() instead. We can still verify that the arguments are as
    expected, while still exercising as much of the logic as possible.
    
    Change-Id: Iebb861bb5af27d92e65083c8bac6821f91382dd5

commit 8b732241df6007c3005b14413ee1fe047eb4d108
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 30 20:50:11 2013 +0200

    Do updates based on a single dependency list
    
    This ensures that updates proceed in the correct order with maximum
    parallelism, for arbitrarily complex dependency graphs.
    
    Change-Id: Ia11f4cfef58a3045199e1e5e49050cb1646f5057

commit e710fd3f151c1315cc5093e3547da1c034eebcdb
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 30 11:25:33 2013 +0100

    autoscaling test fix assertRaises Exception warning
    
    Fix "H202 assertRaises Exception too broad" warning
    
    Change-Id: I162dbd8e421b22cbf3a55b7052107c8332b8d59a

commit 752da8e0c1b22709fcbbbe906efb48dbf2217510
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 30 11:12:24 2013 +0100

    Remove localhost references from tests
    
    Using localhost in dummy URLs is a bad idea, because if you get
    your mocking slightly wrong, some tests try to connect to the
    services running in your local test environment.
    
    Change-Id: I5550c397230f94740c63e6cab30ac35b3ae85297

commit 566bc322170f9dc5f51933b841872f923363f399
Merge: 160555c 10f9360
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 16:40:36 2013 +0000

    Merge "Add schema for security group rule"

commit 160555cfdc99cfb173d362068a66487808afe340
Merge: 88e6bff 03638aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 06:53:11 2013 +0000

    Merge "Fix CFN API error responses"

commit 88e6bff0cc41b3dd024b51b4a7907f066f908c00
Merge: cfbb9e4 46ae684
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 04:18:03 2013 +0000

    Merge "Implement interruption-free update and rollback"

commit cfbb9e4d9fb199a3aed986b342740989f8e94354
Merge: e6157ae 7e23212
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 01:46:12 2013 +0000

    Merge "Cleanup the Properties doc strings"

commit e6157ae100fa67e844b22827c61cc15cb94c8e67
Merge: 79deb72 83737d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 01:45:20 2013 +0000

    Merge "Add auto code api doc generation"

commit 79deb723a2d529044dc818d098b2da944a56579b
Merge: 4c6a73d fcd91d8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 01:45:18 2013 +0000

    Merge "Generate docs using new properties Schema class"

commit 4c6a73dced00a02b2e86fba7ce55d4a6feb21e37
Merge: e459236 032a3a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 01:45:17 2013 +0000

    Merge "Implement native nova server resource"

commit e459236897ba53aefda4925d6185754965cf5ab3
Merge: 1fdc7e0 e820a28
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 01:44:58 2013 +0000

    Merge "Add the missing heat.po files into heat"

commit 1fdc7e0116c62cedf4a1e8f70e280ee13ccc3290
Merge: e6d4ef6 f075b4e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 23:09:25 2013 +0000

    Merge "Give Property constraints a string representation"

commit 032a3a72713b0322a25de62a5f45844c1e50bf22
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Aug 19 11:12:59 2013 +1200

    Implement native nova server resource
    
    Some notes on the implementation:
    - extends Resource rather than Instance since most of the
      complexity of Instance is in the handling of the Volumes
      attribute
    - exposed properties and attributes map as closely as possible
      to the underlying v1 nova API (rather than the nova client library)
    - property or attribute key namespaces have been stripped to provide
      a cleaner API and avoid YAML quoting.
      (eg instance_name -> 'OS-EXT-SRV-ATTR:instance_name')
    - an assumption is currently made that any volumes specified
      in block_device_mapping should not be detached on suspend
    - Network address properties attempt to cater for simple and
      advanced use-cases:
      - 'first_private_address' and 'first_public_address' for simple
        template attribute scenarios, and to aid with AWS::EC2::Instance
        transition
      - 'networks' for a simple data structure which provides all addresses
      - 'addresses' for the raw data structure returned by the API
    
    Implements blueprint native-nova-instance
    Change-Id: I4136da22961c8aa90e3fc8a9411457622f1909fb

commit e6d4ef61c1d26b24e4a46dbecfc2e9558e1587d1
Merge: db9e130 d78dd98
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 20:55:15 2013 +0000

    Merge "Remove aws_creds from DB API"

commit db9e1300813802994a20c5ad6cf1ad031ac987b1
Merge: ec766ca b1b31f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 20:29:44 2013 +0000

    Merge "Provide user control for maximum nesting depth"

commit ec766ca1b409a9b7617d582f1f238b58e122b676
Merge: 933d6a2 0bf8393
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 20:29:36 2013 +0000

    Merge "Change localhost references in test_nested_stack"

commit fcd91d895dafa39478b5fe3ffb33fa89e10ffbf7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Aug 28 18:35:39 2013 +0200

    Generate docs using new properties Schema class
    
    Change-Id: Ic7849a7aaeeb88379695557f7992330f83638c48

commit f075b4ed7d31a51a2c33b5b1ac739294decb41fb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Aug 28 18:35:39 2013 +0200

    Give Property constraints a string representation
    
    This will enable constraints to describe themselves when we generate
    documentation.
    
    Change-Id: Iba410f11c79d1e5d677a5d8aba90052d1c88528a

commit 03638aad74d416f31439aa1150dff29e1c7855be
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Aug 28 22:55:42 2013 +0800

    Fix CFN API error responses
    
    A remote exception (included in conf.allowed_rpc_exception_modules)
    is now restored to a subclass of its original type (with the
    exception of non heap types which will always be restored to its
    original type). Catching rpc_common.RemoteError is not enough
    anymore.
    
    Fixes bug #1214831
    
    Change-Id: Iae3ce0c9d0d3f6565fab25ec899f83f19d46e81b

commit 933d6a2f53077790168da7c157e8e21344b83f99
Merge: 8c804ef 0fb5cb4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 14:46:32 2013 +0000

    Merge "TemplateResources need to download from local "file://" urls"

commit 8c804ef34b24ead4d50b7652d085fccf182d0435
Merge: 189fa36 15de6d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 14:45:00 2013 +0000

    Merge "Add support for local file urls"

commit 189fa364d81379511c574cd2de731d6fdd6825c3
Merge: b430188 0d083f9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 14:18:15 2013 +0000

    Merge "Add the api config opts in groups to deal with the single heat.conf"

commit d78dd985df687b51221b36f5913adb82e1b490a1
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 28 11:09:15 2013 +0100

    Remove aws_creds from DB API
    
    aws_creds has been removed from the DB and the model, needs
    removing from the API too
    
    bug #1215850
    
    Change-Id: I008acc13576c857d9e6238f186424e43dcdd7850

commit b43018834e1e14d06aac9f21ed9593b2e262793e
Merge: 8765bf3 3117a96
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 08:40:02 2013 +0000

    Merge "Make logical_resource_id renaming backward compatible"

commit 0fb5cb47eec59290fc3f1ead4cbae0747304c043
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Aug 27 09:12:21 2013 +1000

    TemplateResources need to download from local "file://" urls
    
    This is ONLY when the template is from the global environment
    (not user provided).
    
    Change-Id: Id554b098fdeaaf04e7bb1a8e2e80abe6d484ae9c

commit 15de6d43093d5e665e4def75358b1949454b229d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Aug 26 14:37:05 2013 +1000

    Add support for local file urls
    
    Change-Id: Ie54508ade52b80790d11958a820998c902d10fd7

commit b1b31f170b2256cb73b330341b143f1299e424dd
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Aug 27 09:10:54 2013 -0700

    Provide user control for maximum nesting depth
    
    In the case of an infinitely recursing stack, Heat will continue to
    keep nesting stacks until python's maximum stack recursion depth
    is reached. By this point a lot of memory and time may have been
    spent parsing/loading/etc.
    
    The default of 3 is enough to deploy a stack of stacks of stacks. It
    can be raised by deployers if there is a desire to do larger and more
    complicated stacks, at the cost of more resource utilization.
    
    Fixes bug #1214239
    
    Change-Id: Ic492ef84b94b1f715c49eef7e1794a486fb8182f

commit 7e23212de971533cb4dcf618221aa28d937de3fb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Aug 28 10:06:55 2013 +1000

    Cleanup the Properties doc strings
    
    This is just fixing the errors/warning from "make html"
    The examples needed to be escaped with code blocks "::".
    
    Change-Id: Ic55d3af38aea70f83dabb7e2a8e8b9069a930fd7

commit 83737d253d0f21fe64348b8cb1be1a92aef243f9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Aug 28 09:56:43 2013 +1000

    Add auto code api doc generation
    
    This will document the python api to:
    heat.api
    heat.engine (not the resources as we have docs for those)
    heat.rpc
    
    (copied from ceilometer)
    
    Change-Id: I5a400f72d4ec115fb700ab8b24dbccf0b5cd3200

commit 46ae6848896a24dece79771037b86cc6f4b53292
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Aug 27 20:15:08 2013 +0200

    Implement interruption-free update and rollback
    
    During an update, where a resource must be replaced in its entirety, create
    the replacement resource before deleting the old resource.
    
    Also, allow rollback to the previous version of the resource without
    replacing it, where that is possible.
    
    Fixes bug #1176142
    
    Change-Id: Id89654bad297815bdbcc86f666367772889b5df4

commit 8765bf3d2ef07eb0e15719738e16cc0da2fa6afe
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 23 11:28:01 2013 +0100

    Remove unnecessary aws_* from user_creds
    
    We currently store aws_creds, but it's never used in any of the clients
    which consume the stored context.  It makes sense to remove it from the
    DB, but leave it in heat/common/context.py; then the credentials used for
    real requests *to* heat (authenticated via the ec2token middleware) are
    obtainable in the context, but we don't populate them in context to be
    used in client connections for requests going *from* heat.
    
    Fixes bug #1215850
    
    Change-Id: I7a75c70beb0318a1e83ac0ab45d13802999d1282

commit cc0b6e74079c62ab0678bfcdbad87d0ed319cb2b
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 23 11:16:13 2013 +0100

    Remove unused service_* columns from user_creds
    
    The service_user and service_password columns are not used anywhere
    so remove the columns from the DB and the model
    
    bug #1215850
    
    Change-Id: If2df8cb768a1e2b10897cc09d64df5bcb1c7cd24

commit 8e64406c3f2d3beb356b741840fecb28d9f24c2e
Merge: d7bb1f0 c60a606
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 16:58:53 2013 +0000

    Merge "Rename OS::Metering::Alarm to OS::Ceilometer::Alarm"

commit d7bb1f0cdbcc5c58909352f3c6e94285d9c6d8b1
Merge: 6336afd fb4e4a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 16:58:50 2013 +0000

    Merge "Catch a NotFound exception in signal_responder delete"

commit 0bf83934977f55f028cf782ae1be717d91388557
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Aug 27 09:04:28 2013 -0700

    Change localhost references in test_nested_stack
    
    These references are using localhost which may be running a server and
    provide valid responses, contaminating the test. Using RFC2606's
    recommended test TLD of '.test' ensures that these will never resolve.
    
    Change-Id: Ie555a321c2af23fbcf4aca9207acb6a0e40bb703

commit 6336afdb5a9ce6203d7ee933afa5a1dd7ea8d966
Merge: 08ed06f c2298b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 14:42:33 2013 +0000

    Merge "Add VPCZoneIdentifier attribute for autoscaling"

commit 10f93602551d6c718fcabe720e5038eecf793ed7
Author: Simon Pasquier <simon.pasquier@bull.net>
Date:   Tue Aug 27 15:43:30 2013 +0200

    Add schema for security group rule
    
    This applies to the SecurityGroupEgress and SecurityGroupIngress
    properties of the AWS::EC2::SecurityGroup resources.
    
    Change-Id: I339227190db42707560f00cc825bc791d2bde5ce
    Fixes: bug #1214333

commit 08ed06f58ac7ef6fac3e69c7994dd5ffd36f541d
Merge: fe498a2 8be1de4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 13:08:29 2013 +0000

    Merge "Improve error message for nova unknown status"

commit fe498a2d4f97287cffe60a02d27a5e4b2665862d
Author: Christopher Armstrong <chris.armstrong@rackspace.com>
Date:   Mon Aug 26 12:52:53 2013 -0500

    Don't delete failed instances in InstanceGroup
    
    This gets rid of the code to delete failed instances in
    InstanceGroup so that administrators can debug what happened
    if any instances fail to start. It also allows the resize operation
    to raise an error, so the InstanceGroup should be in a FAILED state
    after a failed resize operation.
    
    fixes bug 1214007
    fixes bug 1215140
    
    Change-Id: Id508195c847f09dd986e450f35876ff574ff7673

commit b1b26d82293be1d86698f88979682194f865820c
Merge: 31689a2 8a0c244
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 10:45:32 2013 +0000

    Merge "Include Description in conversion from legacy Property schema"

commit 31689a26df7f536bbce0c9b988e795f4b3d0ea3f
Merge: 2a01ae7 8ce7f96
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 10:18:52 2013 +0000

    Merge "Remove backup resources on stack delete"

commit 2a01ae7dc330963ae328855dff14f4c1dd726498
Merge: d61e014 fbd598b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 08:51:06 2013 +0000

    Merge "Add a DB API to swap two resources between stacks"

commit c2298b6b7d97cf5c758ee92cb4e3d85d6ed77ecf
Author: Simon Pasquier <simon.pasquier@bull.net>
Date:   Wed Aug 21 11:52:27 2013 +0200

    Add VPCZoneIdentifier attribute for autoscaling
    
    For now, only one subnet can be specified in the launch configuration because
    Neutron doesn't have the ability to map subnets with availability zones.
    See bug #1096017 for details.
    
    Change-Id: I46ef4d17b2109c97664f7606c97b16071553ebcd
    Fixes: bug #1196494

commit 3117a96d455f2813d2c91baf22f76820839f8712
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Tue Aug 27 13:05:05 2013 +0800

    Make logical_resource_id renaming backward compatible
    
    The rename of logical_resource_id to resource_name changed the
    return value of resource and event API. Adding a redundant
    logical_resource_id back to make the change backward compatible.
    
    Change-Id: I08ab00e38bae6e9bbaf8387dc01effaf776d0b3c

commit e820a28edf293da7fa02c53220eedec77903b49c
Author: YangLei <yanglyy@cn.ibm.com>
Date:   Tue Aug 27 12:27:17 2013 +0800

    Add the missing heat.po files into heat
    
    There is only one file "heat.pot" in heat/locale/.
    We need to add the missing heat.po files.
    I updated "heat.pot" file and added the supported languages
    (Take glance po files as reference).
    The added files are used for
    setting up the structure of directory.
    The po file doesn't have any translated strings.
    
    Fixes bug #1217172
    
    Change-Id: I1e017c332c80eb01b04e042b5da0129198169bd5

commit d61e0146418358356567b683dcd787ce39b6335c
Merge: d264018 4a790e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 03:47:53 2013 +0000

    Merge "Support native naming in InstanceGroup"

commit d26401849d9353994469f91db8e12361d80eb316
Merge: cb72519 230fe1e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 02:56:30 2013 +0000

    Merge "Autoload Nova extensions"

commit cb72519b375cc94dd605d2bcd9822e52793c125c
Merge: 043ba04 83bbb97
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 02:30:46 2013 +0000

    Merge "Add a "rollback" parameter to StackUpdate"

commit 043ba04774b855e1c3e718da8791bf06bf88e407
Merge: 5565763 8adfc44
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 02:30:44 2013 +0000

    Merge "Always resolve properties against the current stack"

commit 556576328a24893d7de69251fd3f20dc8706f50c
Merge: b6f4bea 458f1df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 02:30:25 2013 +0000

    Merge "Adds support for Neutron Firewall"

commit 0d083f972a4e408323c5f2f6aa346842927194e9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Aug 27 10:26:53 2013 +1000

    Add the api config opts in groups to deal with the single heat.conf
    
    So first off, I also don't like the replicating of the api_opts in wsgi.py
    but if I don't do that the sample generator doesn't work:(
    
    We add the wsgi options into a group for each of the api servers with
    the deprecated group of "DEFAULT" so it still deals with the flat layout.
    
    The behaviour is as follows (assuming heat-api):
    1) if you have both (/etc/heat/{heat.conf, heat-api.conf}
       the value in heat-api.conf wins over heat.conf
    2) if you have just one of the config files but a value in both the
       [DEFAULT] section and the [heat-api] section then the value in heat-api
       wins.
    
    bug #1209141
    Change-Id: I66ddb3dca91d13b28e68dfb4306e94eb4e537fa7

commit c60a60614b9bd1182c85e6e9df0a84f60c5ee946
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Aug 23 16:30:12 2013 +1000

    Rename OS::Metering::Alarm to OS::Ceilometer::Alarm
    
    The other resources are named by project so this is to
    try and be more consistent.
    
    There is a mapping to allow the original name to work.
    
    Change-Id: If60cc577a5a770bdaada70c7eae1ae3fc1776056

commit fb4e4a34dceff8cd313daed1686752d66d9194fa
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Aug 22 17:17:33 2013 +1000

    Catch a NotFound exception in signal_responder delete
    
    If the alarm does not get created (error condition) and
    the url does not get created (no one referenced it) then
    the delete will fail with a NotFound.
    
    Change-Id: I431ebef9b9341548176d977e336558df9f5deb6c

commit 8be1de454016a86df7b75dc8ad03c56b255db147
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Aug 22 13:39:05 2013 +1200

    Improve error message for nova unknown status
    
    The current message is obtuse and fails the zbitter
    test of good taste.
    
    Change-Id: I12b6904f78452a7dedf3265af4930ba0fc6902a1

commit b6f4bea47365f7b69f1acb9f2b5d5a7ceb205dfe
Merge: 1584bc1 2236716
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 22:09:48 2013 +0000

    Merge "Use oslo.sphinx for the doc templates"

commit 8ce7f968418e8cdbd7d80f08dcae140c7f65fb46
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 26 21:11:59 2013 +0200

    Remove backup resources on stack delete
    
    If any resources are cached as backups after a failed stack update +
    rollback, ensure they are deleted when the stack itself is deleted.
    
    Change-Id: I1e271cec146681759cc657ba82c205a648339ec1

commit fbd598b9ab5fdcb1db253a1e9115d65112989775
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 26 21:11:59 2013 +0200

    Add a DB API to swap two resources between stacks
    
    When rolling back a stack update, we will need to swap the current and
    previous (backup) resources so that the former moves to the backup stack
    while the latter returns to the current stack. This API allows us to effect
    the switch using a database transaction (thus avoiding having to create a
    *third* stack).
    
    Change-Id: I2b7247e384e3914778179260e198e5ae5c701525

commit 83bbb975cab56ffa452e41ccfe9e965b939b66e6
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 26 21:11:59 2013 +0200

    Add a "rollback" parameter to StackUpdate
    
    We can only consider restoring backup resources during a rollback
    operation. If they are present during a standard update, there is no way of
    testing whether or not they match the new template definition, so we need
    to treat them differently in this case.
    
    Change-Id: Ibd73ed047486c253a6c06b7340a3a591f0fee3db

commit 8adfc448e5d719cbadcc040f0f1e765c5453db7f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 26 21:11:58 2013 +0200

    Always resolve properties against the current stack
    
    During an update, resources can get moved around between stacks. Ensure
    that the properties are always resolved against whatever the current stack
    is, without needing to replace self.properties.
    
    Change-Id: I09f984cdf4478ca7dda2b0a0f1aa5a63dd2c19bc

commit 1584bc17bb748a8b93f03781e1e210182b2708d3
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Sun Aug 18 20:48:49 2013 +0800

    Remove the rest references to exception.py
    
    Remove the rest references to Oslo exception.py in Heat code base, so that Oslo
    maintainer can go ahead and remove the openstack/common/exception.py file.
    
    Change-Id: I19d325e2117f31a887c593e31b61e25729f7a053

commit 4a790e347e1c598a479bd5d591df9a65392c1c60
Author: Thomas Herve <th@rackspace.com>
Date:   Mon Aug 26 14:46:49 2013 +0200

    Support native naming in InstanceGroup
    
    The branch adds support for the native neutron load balancer resource in
    in InstanceGroup. It also raises an error if a non load balancer
    resource is passed.
    
    Implements: blueprint lbaas-resource
    Change-Id: I9b6e7341e2d3c9f14be704c7fbce1e318efbc2d4

commit 4c1bfe32a5e2cead15a9cb03668bf439a867af7e
Merge: d719d0b e9d1298
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 11:35:56 2013 +0000

    Merge "Implement a load balancer resource using new neutron pool"

commit d719d0b0723916e376580d03c333bb8134c737ea
Merge: 7e6b914 24f185a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 11:20:27 2013 +0000

    Merge "Allow in-place update of nested stack"

commit 7e6b9147ccfc365fef0e50817def842526242121
Merge: 82f7086 112283f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 11:20:20 2013 +0000

    Merge "Enhance StackResource update for more use cases"

commit 8a0c24449e27fe06e3e0fd436336120005ec4103
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 26 12:29:06 2013 +0200

    Include Description in conversion from legacy Property schema
    
    Change-Id: I042afdc3b5e3d4677c207e53497e3bcceb6739ad

commit 82f7086e232915ca2744a081afca51211c99e813
Author: Simon Pasquier <simon.pasquier@bull.net>
Date:   Wed Aug 14 15:00:44 2013 +0200

    Add support for source security groups
    
    This patch adds support for the SourceSecurityGroupName and
    SourceSecurityGroupId properties. It covers Nova and Neutron.
    
    Change-Id: Ic12512dfb4375ccccbe1282bb48b80cde16ceb9d
    Fixes: bug #1193415

commit 458f1df58f7ef248da60310f3b2642eb621a3f46
Author: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date:   Thu Aug 22 14:27:45 2013 -0700

    Adds support for Neutron Firewall
    
    Introduces the following Neutron Firewall as a Service (FWaaS)
    components to Heat resources:
    * Firewall
    * FirewallPolicy
    * FirewallRule
    
    Change-Id: I646a1402a336e7cc7c88d555cc836614bda9dca2
    Implements: blueprint fwaas-heat

commit 093638e0c62bc4230bf684e127a85310283b5e2f
Merge: efc400d b35245b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 02:31:42 2013 +0000

    Merge "Only create user_creds row on initial stack store"

commit efc400d46b30a8cf9bbd932f5ba557ba767475d8
Merge: 8e98d27 2a2cc62
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 01:52:25 2013 +0000

    Merge "remove unused config options"

commit 8e98d27a1e31e5e9e2d35ca665f0492a489185d6
Merge: 5c8b2a4 6c14d8e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 01:40:31 2013 +0000

    Merge "Process request exceptions while fetching template"

commit 5c8b2a4554126c1e22c37c1536adcc144af090a7
Merge: 3ebf67e 95bffe0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 01:40:24 2013 +0000

    Merge "Use system locale when Accept-Language header is not provided"

commit 3ebf67eda30d1497e211d8d821b944e005dd2612
Merge: d85b810 8a9c7a1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 01:21:52 2013 +0000

    Merge "Fix incorrect use of ServerError"

commit 230fe1e5ef53d3884f09b59f1c999a1046b23deb
Author: Tim Smith <tsmith@gridcentric.com>
Date:   Sat Aug 24 18:07:23 2013 -0700

    Autoload Nova extensions
    
    This patch adds logic to autoload standard novaclient extensions
    (e.g. baremetal) and any third-party extensions that might
    be installed. Thus, resource plugins that make use of
    installed extensions are able to use the standard OpenStackClients
    rather than have to a) subclass and override OpenStackClients
    or b) create a shadow nova client within the resource plugin
    with the desired extension loaded.
    
    Change-Id: Ifdcaa896babda0e1e7e10a55253a8baa37582264

commit d85b810b5c6918085164fae20d8bcbb961a5d7c2
Merge: bb20f6b f3f3964
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 01:12:24 2013 +0000

    Merge "Fix install.sh calling setup.py"

commit bb20f6bf4e2c8135dcd219af77580b06e86cb5f0
Merge: 7aa0b8f 0cba44e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 00:19:48 2013 +0000

    Merge "Store the backup stack during updates"

commit 7aa0b8f29e86fce3fdb7e4c1a3d790188cd520a5
Merge: e5f43bb dc6940c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 00:19:45 2013 +0000

    Merge "Pass owner_id to stack_get_by_name()"

commit e5f43bb935d5cf4967f966edb0f10c3c12f1c329
Merge: af8086f d635451
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 00:19:38 2013 +0000

    Merge "Add a method of creating a backup stack in the DB"

commit af8086f4a6a0fd17f608d461d61f8886355ba17f
Merge: 67e7d8b 26488c8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 00:04:54 2013 +0000

    Merge "Allow a Provider with a known facade its own schema"

commit 67e7d8bd2014f19f35dbc7af9070d1be0b6eadf6
Merge: b4cbc76 a67f852
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Aug 25 23:21:18 2013 +0000

    Merge "Evaluate lazy translation in exception __str__"

commit b4cbc76baf37f86d8b2752eef8aaf2130076abcb
Merge: c7f07fe 8197900
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Aug 25 22:03:19 2013 +0000

    Merge "Handling re-delete in rackspace db resource"

commit c7f07fe33b9a9d7e13f1b767dd98a2ac0769331f
Merge: 0492890 ff24b65
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Aug 25 20:39:38 2013 +0000

    Merge "Replace httplib with requests for ec2tokens auth"

commit 24f185a21d75a5345057093db19d550fa87278ea
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Thu Aug 22 13:42:18 2013 +0800

    Allow in-place update of nested stack
    
    Not raising UpdateReplace exception anymore for nested stack update.
    Instead, propagating the update request to the nested stack, so that
    the nested stack itself will decide the best way to handle the update
    request for every of its resources.
    
    blueprint nested-stack-updates
    
    Change-Id: Ibfe7bee71fe57a601b93fa05a4a0c1cda972290e

commit 112283f1352010d44cbebc1b7ac76f997abc3a21
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Thu Aug 22 13:41:52 2013 +0800

    Enhance StackResource update for more use cases
    
    Enhance StackResource.update_with_template to accommodate more
    possible use cases. This will take care of the nested stack update
    failure by raising an exception in such case, so the the concrete
    nested stack resource implementations will have a chance to take
    some actions upon nested stack update failure.
    
    blueprint nested-stack-updates
    
    Change-Id: Id31ef67e1d7c4928704c6e169bce13f0f7232932

commit 0492890b6876107f9bb32b54b3ab8a23938c34da
Merge: 732ae66 7904094
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 24 00:17:44 2013 +0000

    Merge "Use the global environment to map Quantum to Neutron"

commit 732ae663a97909a02c06a4222356e45720b8e4fa
Merge: d9ea8e4 ee8b29e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 24 00:17:37 2013 +0000

    Merge "Add a has_interface() method to the resource class"

commit 0cba44ee3f3e3fe15cf0c1c025baefdc560ddce0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sat Aug 24 01:05:47 2013 +0200

    Store the backup stack during updates
    
    Change-Id: I64e19b0117c98eced4308727594b77e938d7ee4c

commit dc6940c8f6bd76212285d04b1bd9ac7bc76d880c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sat Aug 24 01:05:47 2013 +0200

    Pass owner_id to stack_get_by_name()
    
    The heat.db.sqlalchemy.api supports this parameters, but heat.db.api did
    not.
    
    Change-Id: Ic805dcf6c8afdbe9e667c55d9c3b6864a76ce19a

commit d63545118e8a250dd5f24900374d9ac0d593e0ba
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sat Aug 24 01:05:47 2013 +0200

    Add a method of creating a backup stack in the DB
    
    This is a temporary storage place for resources that are going to be
    deleted once their replacements are created. They must be moved out of
    the stack in order to avoid conflicting with the replacement resource.
    
    Change-Id: I081498f4c8732f893dc0d0677cf2b3f40f56d808

commit d9ea8e4925ae70da640be2e30b0c07794547f633
Merge: f4388dd da0313c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 17:04:35 2013 +0000

    Merge "Always validate auth_uri with allowed_auth_uris"

commit f4388dd05e3460b1d65979732902e97d85550e81
Merge: 1c20d35 bef420b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 15:49:24 2013 +0000

    Merge "Rename event logical_resource_id to resource_name"

commit a67f85267acee85c2073373ce1206ec3d174f930
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Thu Aug 8 18:11:48 2013 +0800

    Evaluate lazy translation in exception __str__
    
    The OpenStackException.__str__ method returns
    self._error_string which is actually a gettextutil.Message
    object not a str.
    
    str(o) will check the return type of o.__str__() and raise
    TypeError if __str__ returns non-string object.
    
    The fix will not go into oslo as OpenStackException is
    about to be deprecated. And this patch is also the first
    step to remove all the references to oslo exception.py.
    
    Fixes bug #1208454
    
    Change-Id: Ib6abe3517bcb1b34fc6a71e5c46ee3774e067f9a

commit 26488c8b2e16d097ae070d6d01078dff624e5c98
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 23 15:56:41 2013 +0200

    Allow a Provider with a known facade its own schema
    
    Allow a TemplateResource behind the facade of a known plugin to supply a
    different schema to the facade resource. However, check during validation
    that the two are basically compatible. The provider template must:
    
    - Define parameters for all *required* properties of the facade.
    - Define parameters that map to the same types as the facade properties.
    - Not have *required* parameters that do not exist in the facade.
    - Define outputs for all attributes of the facade.
    
    Change-Id: Ie40ecbb43d3d6749266f2cb6d723c8537fcc23dd

commit 7904094e11ad255574bc58e46c982b93c987d8f8
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Aug 8 11:29:46 2013 +1000

    Use the global environment to map Quantum to Neutron
    
    Change-Id: Id3ccc0538d79955d0112daf37bcd80dce78a0373

commit ee8b29ee7ecf558a6e19822f5e6b6bbffd28e773
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Aug 20 15:37:26 2013 +1000

    Add a has_interface() method to the resource class
    
    This is to better indentify resource types, given that they
    can be mapped in the environment.
    
    Change-Id: I6dd552c87b80eb34baec306acd663657ee929b30

commit 1c20d351b1c0765f300e1578abc1fd9af6a6a036
Merge: 94e6c1c 41cff26
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 13:00:43 2013 +0000

    Merge "Pass token as a callable to Ceilometer client"

commit 94e6c1c58b590738c59d1fa8b127a7ccb92a41d3
Merge: 892f5b2 6b8c2a1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 13:00:36 2013 +0000

    Merge "Remove the Property.schema_from_param() method"

commit 892f5b210107c83b17de92e72979e0fcdf08beba
Merge: 8f3422d 5769f8f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 13:00:29 2013 +0000

    Merge "Generate property Schema objects directly from parameters"

commit 8f3422d25bd65f88165bf0771f7aad35963fc2ee
Merge: c1d7699 01924a5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 13:00:22 2013 +0000

    Merge "Use Template to instantiate TemplateResource"

commit b35245b6cd506b69ae6e2ff9aec1f3fe7c0dc4ef
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 23 13:26:35 2013 +0100

    Only create user_creds row on initial stack store
    
    We should only store the credentials on inital stack store,
    otherwise we end up creating orphan user_creds rows every
    time the stack status is updated.
    
    Fixes bug #1197074
    
    Change-Id: Ib8414dd774386578dbc4d654b1773727d2998f80

commit c1d769972ddccde5c3d47bc1711b26d5b9f26cc8
Merge: d6b952b d5db424
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 11:14:17 2013 +0000

    Merge "Use string constants to prevent typo errors"

commit d6b952bc23fd4fc4f61e2b73a11255fa8aa755c5
Merge: bc35c66 8711651
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 11:14:15 2013 +0000

    Merge "Add a CloudWatch::Alarm implementation based on Ceilometer"

commit bc35c6688525b833b8519c90d7c79f592c31104c
Merge: e7a008e cd927f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 11:14:13 2013 +0000

    Merge "To support both CW and CM, return alarmurl from policy ref"

commit 2a2cc6268d96955c2b1084a9d92d8b3feb72b061
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 23 10:57:16 2013 +0100

    remove unused config options
    
    There are several historical cut/paste unused options, which have
    also now found there way into heat.conf.sample, which will confuse
    users, so best to remove them.
    
    Fixes bug #1215834
    
    Change-Id: I0fe4717327fc67fe109bef4ba1758d2f18e84520

commit e7a008e079df75e28bdc322a447049fb3ff80c9c
Merge: 8c74053 b615fc9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 08:45:00 2013 +0000

    Merge "Do not delete nova server on create fail"

commit 41cff2646854c78c77d2c4555c13c1ae42dc7401
Author: Swann Croiset <swann.croiset@bull.net>
Date:   Mon Aug 19 14:06:01 2013 +0200

    Pass token as a callable to Ceilometer client
    
    fixes bug #1209240
    
    Change-Id: I5e3e3bb15135273c887f9518f148f17e8953fc96

commit e9d1298e9266380fc501cdb8c02fe25fe07802d2
Author: Thomas Herve <th@rackspace.com>
Date:   Mon Aug 12 18:08:04 2013 +0200

    Implement a load balancer resource using new neutron pool
    
    It creates a new resource linking to a neutron pool, and taking a list
    of servers to be linked to it.
    
    Implements: blueprint lbaas-resource
    Change-Id: Ie1590e12449a8e086eee7e7960a45103cbf20860

commit 8c74053cd9a225604f208b2b6da2c1d32ffd5e17
Merge: 265a6f6 2911321
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 08:29:24 2013 +0000

    Merge "Do not assume nova provides a fault on ERROR"

commit 265a6f6dc96b9d7f5f6c548fed6a523c6f8f8118
Merge: 083ecf4 1f7d5b0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 08:29:22 2013 +0000

    Merge "Add a script show all possible state transitions"

commit 083ecf430a3ee6dbf8f1b01bfcc16f38bdc41a68
Merge: ef54dc4 e72ec15
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 06:33:46 2013 +0000

    Merge "Convert heat.common.template_format to use C yaml"

commit ef54dc48ddebfb1714dcd96d19b4210a600a85c9
Merge: 0e4d6a1 ffc5543
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 06:33:39 2013 +0000

    Merge "Fix the main docs index page"

commit 0e4d6a110e9cb28547bbb60999105d2a2f08e56f
Merge: f00bc02 55bdcec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 06:32:19 2013 +0000

    Merge "Remove the usecases from environment.py as they are in the docs"

commit f00bc02bef8b8662e87b5884c336121fd62e75a5
Merge: a8c336a 898c14f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 06:29:46 2013 +0000

    Merge "Add some basic evironment docs"

commit a8c336a24972aa09c031878de2876320a8654a85
Merge: 0120817 ffddeaa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 05:28:00 2013 +0000

    Merge "Store the generated signed urls in resource_data"

commit 0120817c1d315f60aa60f159de540c9a2948bbad
Merge: 711f639 23e7b58
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 05:27:58 2013 +0000

    Merge "Remove "lazy=joined" from the resource_data backref"

commit 711f6396f1322faca2308565ff2ea3230a370069
Merge: 9f10571 17653e5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 05:23:34 2013 +0000

    Merge "Try to reduce the number of tests with the same stack_id"

commit 9f10571cfa1871e89e9bfdc1a390dbaa8a1be7f0
Merge: 161d134 76281f4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 05:23:26 2013 +0000

    Merge "Implement Fn::MemberListToMap"

commit 161d1340dfa4d6d0b78b1ec3e55689191412dbd0
Merge: 8a684c1 9fe8cba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 04:26:57 2013 +0000

    Merge "Limit maximum size of all templates"

commit 223671658f4e8fe8f522f84b22ff9946b93caaf7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Aug 23 12:09:58 2013 +1000

    Use oslo.sphinx for the doc templates
    
    This is to make the look of the developer docs consistent
    with the other projects.
    
    Change-Id: If538b5fcc974606c1628ca4a510cd1f34cb631a2

commit 8a684c1742a32830175e2d213586fb0d607f4a8d
Merge: 82b915e 23aa437
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 01:27:15 2013 +0000

    Merge "Make the API for getting dependency graph edges public"

commit bef420b980344d1b6c7c0156449a59ceb440d20e
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Sun Aug 18 20:38:04 2013 +0800

    Rename event logical_resource_id to resource_name
    
    This is to address an unimplemented comment at
    https://review.openstack.org/#/c/41290/2/heat/engine/event.py
    Bascically, there is a logical_resource_id/resource_name mismatch to
    address, and this patch is trying to resolve that.
    
    Change-Id: Idac696259af30f8db7816499474057c354d73800

commit 82b915eb0203534efee8d0e3b2a9ab31b3385258
Merge: 4654f68 f2e9b31
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 23 01:24:58 2013 +0000

    Merge "Pass the previous stack to StackUpdate"

commit d5db424a9785ae70abe9ef85ede7fe5039f7313c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Aug 15 14:16:15 2013 +1000

    Use string constants to prevent typo errors
    
    Change-Id: If8fccaa3f5d77698a50f803c2b97b85c5a7613ea

commit 8711651fc3d02b7f0932a0638b80be4fa507b88a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Aug 14 21:55:59 2013 +1000

    Add a CloudWatch::Alarm implementation based on Ceilometer
    
    It's off by default for the moment so the current cloudwatch tests can run.
    
    Change-Id: Ibdce9c9223969bdcb8f2368e98dc6ab1241b84df

commit cd927f7018463972500b311ed26fd39037b21456
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Aug 20 09:46:59 2013 +1000

    To support both CW and CM, return alarmurl from policy ref
    
    This is so we can still have the following:
      AlarmActions:
      - {Ref: ServerScaleUpPolicy}
    
    and use Ceilometer underneath.
    
    The watchrule now tries to look up the resource by
    both name and resource_by_refid.
    
    Change-Id: I4759806919ab4f3ccef66698235b23f7f310cb03

commit ffddeaa9342a85ce5513bbb72bee1ad085b788ec
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Aug 14 16:57:13 2013 +1000

    Store the generated signed urls in resource_data
    
    This is so it does get regenerated everytime GetRefId() is called.
    
    fixes bug 1206505
    Change-Id: Ia69d6d65247555918850ecaadfd1c5d1bc837af8

commit 23e7b585a23b153e4cb5787f95377a5932ce8eec
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Aug 14 16:51:21 2013 +1000

    Remove "lazy=joined" from the resource_data backref
    
    This is having some weird interaction with the rsrc_metadata column.
    In a later patch I add a call to resource_data_set() in signal_responder
    and the metadata tests start failing.
    
    Change-Id: Ib59972fe69570f4ae36e672987419f4841a2de40

commit 17653e5d9aaf30496788fb9904f615fe7d2e411b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Aug 14 15:47:33 2013 +1000

    Try to reduce the number of tests with the same stack_id
    
    Change-Id: I38a689ed65998adc9a3e6542d11d15283ae61044

commit 76281f4fa5d7741520b7dfb1baf199cd162c9bfc
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Aug 23 08:31:54 2013 +1000

    Implement Fn::MemberListToMap
    
    This is to allow the CloudWatch::Alarm to be implemented as
    a resource template. The Dimensions need to be converted
    from [{Name: bla, Value: foo}] into a normal dict.
    
    So we define the Dimensions as a CommaDelimitedList in the template,
    then in TemplateResource we see that the property is a list of dicts
    and convert it into the aws style memberlist
     '.member.0.Name=bla,.member.0.Value=green'
    then in the CW template we can do the following:
    
    matching_metadata:
      "Fn::MemberListToMap": [Name, Value, {"Fn::   Split": [",",
    {Ref: Dimensions}]}]
    
    Note: this in not a single case usage as we can use this for the Tags
    property that is in a lot of other resources.
    
    Change-Id: I68910c51eaeb0857531028e87b89b9192db4c8ba

commit ffc55433d4ce3240f2de8639a0ef50334f6ac699
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Aug 23 09:51:55 2013 +1000

    Fix the main docs index page
    
    This magic new line makes the main index look a lot better.
    It wasn't showing the "HOT templates" level.
    
    Change-Id: I3f7fb65911a4b0f3ad57ddf22c00ec8236261c7e

commit 55bdcec8447858e6093ed24b5d0d85149109238a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Aug 23 09:54:31 2013 +1000

    Remove the usecases from environment.py as they are in the docs
    
    Change-Id: Ibe0b55663a62b4a68f1478d254f1333a56514c38

commit 898c14f822641644047b67349ab43bae07dc136b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Aug 23 09:49:39 2013 +1000

    Add some basic evironment docs
    
    Change-Id: I6edbb7da0d333bd86eabba73631d5df3d4dc8328

commit b615fc9bada36e04473564ec0af1c088906f94b9
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Aug 22 13:32:01 2013 +1200

    Do not delete nova server on create fail
    
    To keep in line with the behaviour of other resources,
    a nova server should only be deleted on resource delete.
    
    Fixes bug: #1215132
    
    Change-Id: Ic478754b7b96001fa0d4110a66d008609de7b482

commit 2911321e9d08a4905c98f183ad86d6d4f5831d4a
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Aug 22 13:18:57 2013 +1200

    Do not assume nova provides a fault on ERROR
    
    A nova server object in an ERROR state does not
    always provide a fault attribute to get the error
    reason from.
    
    Fixes bug: #1213285
    
    Change-Id: I861951207cf8fd526a65f768154c76afd0be9081

commit 4654f68e841b56e2f18aca71521e8429e3d5abfe
Merge: d009d9c 3d5ee0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 21:13:25 2013 +0000

    Merge "Improve update debugging messages"

commit 1f7d5b07d62abd7fd041af3a425d22c5309acc40
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Wed Aug 21 15:15:17 2013 -0500

    Add a script show all possible state transitions
    
    The output of this script will be useful in documenting all possible
    state transitions.
    
    Change-Id: I24e442ce20fe7730c915a77b85014f44075e03fd

commit 9fe8cbacd26bbf003ba31c415cd4a4798fc50201
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Aug 21 13:24:17 2013 -0700

    Limit maximum size of all templates
    
    Templates of an extremely large size can eat up tons of CPU time,
    memory and storage. By refusing to parse any template over a certain
    size, we can prevent users from abusing the service.
    
    Fixes bug #1214234
    
    Change-Id: I2f731c8e2fc9e1f497199e310de81fa48c9582af

commit d009d9cc8836142b319772c568a305b6ef1e5b18
Merge: a8bd951 167b9a5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 13:31:16 2013 +0000

    Merge "Add UpdatePolicy attribute to Instance/AutoScalingGroup"

commit 23aa437766c1b0da82b0b196176cc843936f44f0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Aug 22 13:01:21 2013 +0200

    Make the API for getting dependency graph edges public
    
    This will allow us to build new dependency graphs from combinations of
    existing graphs.
    
    Change-Id: I6da62607fa1e361d4d2e1581fd286c62f0d9470a

commit f2e9b31a965e3ef0168da1f9dc65afb2d8e24810
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Aug 22 13:01:21 2013 +0200

    Pass the previous stack to StackUpdate
    
    This starts out like the existing stack, but is not stored in the database
    or updated as the stack update proceeds. This allows the StackUpdate object
    to store any information that might be relevant to a future rollback.
    
    Change-Id: I94f0dd69b5e7818f811c8c0d50566a79b81acba7

commit 3d5ee0e075b4ab5ad054b1382f2110114a340e67
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Aug 22 13:01:21 2013 +0200

    Improve update debugging messages
    
    Change-Id: I231275c1ce7dcba441a57d2ac29d2ad59e993e98

commit a8bd951cb244c43e0b4c587304e213a43e905884
Merge: 11b9a21 ead65c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 10:43:04 2013 +0000

    Merge "Use the global environment to define AWS::CloudWatch::Alarm"

commit 11b9a21539db781b8263298631e2f45b99632025
Merge: a0cd1d5 19df260
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 10:43:02 2013 +0000

    Merge "Load deployer/global environment files at startup"

commit a0cd1d51db4dd237e55dc1a655c71f42c269c50b
Merge: ebc8bdd 4034963
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 10:43:00 2013 +0000

    Merge "Add an environment_format.py like the template one"

commit ebc8bdd2c44add51f2de3dfd113347e4d1896e0a
Merge: d152e31 4b578db
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 09:23:19 2013 +0000

    Merge "Fix all the sphinx-build warnings"

commit d152e31120f21605c142520e029add0a7a7eaffe
Merge: 2964458 ca0bea4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 09:23:17 2013 +0000

    Merge "Fix some flake8 warnings in doc/resources.py"

commit 29644581cf80462a45b63d2fbf4e61a5033b4b02
Merge: c335693 67b4e94
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 09:21:43 2013 +0000

    Merge "Fix crash in "make html" introduced by the global env"

commit c335693b7fdb584033d7c28d44ba34e09f586b5a
Merge: a150baf 29d1e24
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 05:28:07 2013 +0000

    Merge "Add new attributes to EIPAssociation resource"

commit a150baf7a5eb53b90d60f48b1433766ceafe8a05
Merge: 044a8aa c401858
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 04:00:09 2013 +0000

    Merge "Introduce nova_utils.server_to_ipaddress"

commit 4b578db8fb1ed28087ca04892be6148dc9cab0ce
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Aug 22 12:27:21 2013 +1000

    Fix all the sphinx-build warnings
    
    except this one:
     WARNING: toctree contains reference to nonexisting document u'api/autoindex'
    
    Change-Id: I176a75c1c3fc9603304f11f867df54d7a7b3610a

commit ca0bea47e5f5a216db6c24d098329e72608ea2b3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Aug 22 11:42:31 2013 +1000

    Fix some flake8 warnings in doc/resources.py
    
    remove doc from the ignore and just fix the issues in conf.py
    
    Change-Id: I30833dd24409087c3482d2034a797fea3f90aa85

commit 67b4e94be6124798867c2f072dca8748dcd6da37
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Aug 22 11:34:47 2013 +1000

    Fix crash in "make html" introduced by the global env
    
    Change-Id: Iece0e122841829d3561b71575065ffa7b656b504

commit fc007a1ec8a7c14335b992638c96893d7bfe6762
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Aug 21 14:05:17 2013 +1200

    EC2token middleware implement multi-cloud auth
    
    Making ec2token middleware multi-cloud aware presents a
    challenge as the API assumes there is only one cloud and
    Heat must remain compatible. This means that unlike multi-cloud
    heat-api, the request cannot explicitly say which endpoint it
    wants to authenticate against.
    
    However it must be possible to make authenticated cfn requests
    against a multi-cloud heat for the sake of cfntools requests.
    
    The approach taken in this commit is to attempt authentication
    against each configured allowed_auth_uris until one succeeds.
    
    This is safe for the following reasons:
    1. AWSAccessKeyId is a randomly generated sequence
    2. No secret is transferred to validate a request
    
    If all auth attempts fail, the last failed reason is raised
    as the error to the user.
    
    Change-Id: I3a5a7adc97b110fcb8c6e8b156749fdec8924b88

commit ff24b65eaeca07c07ef70b62e18a286ee52fb54c
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Aug 22 09:51:24 2013 +1200

    Replace httplib with requests for ec2tokens auth
    
    This vastly simplifies the implementation and test mocking.
    
    ec2token middleware is the last piece of code in the heat
    repository to be making direct httplib calls.
    
    Change-Id: I3807b27a7699ff19eb46e2721aaa5afd9d6c8ff9

commit da0313cf7b1591666d76b79615b2eccc78c67ffd
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Aug 19 14:35:06 2013 +1200

    Always validate auth_uri with allowed_auth_uris
    
    The original intention was to allow heat to orchestrate
    on any requested cloud when allowed_auth_uris is configured
    with an empty list.
    
    This change makes all requests be validated against
    allowed_auth_uris for the following reasons:
    - there is a potential security issue with requests
      being authorised by a fake keystone, allowing an exploit in
      heat to be executed without any valid authentication factors
      first being presented.
    - ec2token middleware will also need to be made multi-cloud aware
      however as a compatible API it is not possible to specify the desired
      auth_uri with each request. Instead ec2token will need a list of
      configured endpoints so that it can try each one until a request
      is authenticated.
    
    Change-Id: I3d6b7edf381a66b87b6e1fae07bc5dbe9db024bc

commit 167b9a58c7af34cae7103320b30a1e8ca444e263
Author: Winson Chan <winson.c.chan@intel.com>
Date:   Fri Aug 16 11:35:04 2013 -0700

    Add UpdatePolicy attribute to Instance/AutoScalingGroup
    
    This is the second part of a series to implement support
    for AutoScaling UpdatePolicy.
    
    Defined new update_policy attribute for InstanceGroup
    and AutoScalingGroup, and modified init of InstanceGroup and
    AutoScalingGroup to parse UpdatePolicy from the template.
    Currently, only InstanceGroup and AutoScalingGroup manages
    update using UpdatePolicy and so this is not implemented in the
    Resource class. This can be revisited when UpdatePolicy is
    applicable to other resource types. The resource validation
    method is also overridden here to validate the UpdatePolicy.
    Included tests to validate various uses cases of templates
    with, with bad, without, and removal of UpdatePolicy. This
    patch does not address handling of instances update with
    UpdatePolicy yet. The next patch will address that.
    
    Change-Id: I1faf1a8a3ba1faf063b6687b34b57b2a96c6bfa8
    blueprint: as-update-policy

commit ead65c7e7ccdf17ed4c77f5903ae9c0441b6f242
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Aug 14 21:54:32 2013 +1000

    Use the global environment to define AWS::CloudWatch::Alarm
    
    This will make it easier for the deployer to define the default
    implementation.
    
    Change-Id: If1a8dceb4ad2cade90a56f16dd450e571425c4a6

commit 19df26016f232c1fe03ebde87e8330d1b2b7a546
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Aug 19 19:53:34 2013 +1000

    Load deployer/global environment files at startup
    
    This allows for a global environment that the deployer can use to set
    their own defaults.
    An example /etc/heat/environment.d/x.yaml
    
    resource_registry:
      "OS::Quantum*": "OS::Neutron*"
      "AWS::RDS::DBInstance": "file:///etc/heat/templates/AWS_RDS_DBInstance.template"
    
    Change-Id: Iee647a109e5a41d41cd4a79909c6edaca0d17b87

commit 4034963bd775b5960e5ad8f6678c8aa46ab44f9d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Aug 20 16:35:25 2013 +1000

    Add an environment_format.py like the template one
    
    This to make the section checking mechanism less spread out
    and more consistent. This can also be used by the global
    environment loader.
    
    Change-Id: I7ca7ad754fb702877dedc416a30f573d239933ad

commit 6c14d8e55de0c3045ee37e7d37c963cc35ade21d
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Aug 21 23:24:27 2013 +0800

    Process request exceptions while fetching template
    
    requests raises subclass of requests.exception.RequestException, not
    IOError. And the code explicitly calls raise_for_status to avoid HTTP
    errors being silently ignored.
    
    Fixes bug #1214429
    
    Change-Id: Ib3ea7e4fea459a231f0bb7f113e3d66983b006c2

commit 29d1e2472dd07af3160a71ca6abfe172c6b9ad45
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Jul 3 10:22:25 2013 -0400

    Add new attributes to EIPAssociation resource
    
    AllocationId
    NetworkInterfaceId
    
    The EIP resource also now supports the Domain property, which when set
    creates the resource using neutron networking. (Neutron networking is
    required for all VPC operations.)
    
    The EIP test covers the new functionality as well as some of the old
    using both nova and neutron.
    
    Fixes bug #1164865
    Fixes bug #1164866
    
    Change-Id: I7ad7fba8ed6f8a584fc2ca00aaf80144c5274134

commit 6b8c2a15e85fe918ee681f9f687578bf1fc8810f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 19 20:51:45 2013 +0200

    Remove the Property.schema_from_param() method
    
    This is now unused.
    
    Change-Id: I5da20effe72a791d6dd8e9cc99ec9e43dea2da07

commit 5769f8f31cb0c3173ec2775e61396d549a77383f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 19 20:51:45 2013 +0200

    Generate property Schema objects directly from parameters
    
    Use Schema.from_parameter() instead of Property.schema_from_param() to
    generate a property schema from a parameter schema.
    
    Change-Id: I1049822057d954ddbb47027aad136f7b45541943

commit 01924a501f1be863a665b2f0de93beb2ac63b994
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Aug 21 16:52:13 2013 +0200

    Use Template to instantiate TemplateResource
    
    Use the Template class, rather than the raw template data, to obtain the
    information required to create the schema of a TemplateResource facade.
    This will allow this feature to work with multiple template formats (e.g.
    HOT vs. CloudFormation).
    
    Change-Id: Ifde739b081e95ed9f14567f35a0a1680c5e9b631

commit 8197900238b69a3f707ba9cc5b8cb4315649252a
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Wed Aug 21 08:55:43 2013 -0500

    Handling re-delete in rackspace db resource
    
    Current implementation of db resource throws exception if the
    resource was already deleted(All the other resources are not
    throwing). This fix is to make db resource behavior similar to
    other resources.
    
    Fixes Bug #1197077
    
    Change-Id: I4537180115400e6f6183e72a74bdd3ada220a3fa

commit 8a9c7a11e008fde92905be1d1183da1b3f3f184c
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 21 14:09:31 2013 +0100

    Fix incorrect use of ServerError
    
    ServerError is being incorrectly used to report an internal error
    leading to an error formatting the response, as there's no body
    specified to the format string.  Use exception.Error instead and
    adjust the message to make the user-visible response clearer.
    
    Fixes bug #1214457
    
    Change-Id: I83435686170c4f40658968a35f1faa303f50f4a4

commit 044a8aaf69d9874edfafb1c7658055141545d1cc
Merge: 05ef968 de4158b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 21 12:46:42 2013 +0000

    Merge "Create a Schema from a parameter"

commit 05ef96801a47a294eab35c8a59cbd2db7f350b1f
Merge: 1623b03 d053963
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 21 11:49:32 2013 +0000

    Merge "Wrap the resource registration in a global environment"

commit c4018585871a56458cf4e223306430fc7bb178fa
Author: Thomas Herve <th@rackspace.com>
Date:   Fri Aug 16 13:24:55 2013 +0200

    Introduce nova_utils.server_to_ipaddress
    
    Create a utility function used for now by the instance and load balancer
    resources to retrieve one IP of a nova server.
    
    Change-Id: I87ace4c61b03a66f3b0c30f3bacd2fce79332ed0

commit e72ec15e1c871bf8c49d7d21456fd32bfcc0a260
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Aug 20 13:50:00 2013 -0700

    Convert heat.common.template_format to use C yaml
    
    Will fall back to pyyaml if CSafeLoader/CSafeDumper are not available.
    This should increase template parsing performance by a factor of 9 and
    reduce memory usage by an order of magnitude.
    
    We also convert the one test that was directly calling yaml to use the
    template_format.parse function, so that the same parsing is used
    everywhere.
    
    Change-Id: I0d14be2ef7fb2dccac43fc41b1d2d9e4395c6f77
    Fixes bug #1214580

commit 95bffe0d2c7adeaad99ca890a7fdbd7c18b8e72f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 20 16:54:01 2013 +0000

    Use system locale when Accept-Language header is not provided
    
    Remove en_US as the default language when no header is provided, and use
    None instead. Upon translation None will be defaulted to system as it
    was before the translation changes.
    
    Fixes bug: #1214476
    
    Change-Id: I0fe22c526710e69ae0731e7d0b42170e6f3a8523

commit 1623b035177272d290b7a7aa2918d9fba36405fe
Merge: e409910 a0d3536
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 20 15:15:24 2013 +0000

    Merge "Allow Description in properties schema"

commit e409910b14dd5c9bebf9fb73ef734774aa2ae025
Merge: 1e16ed2 3168e8b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 20 14:15:46 2013 +0000

    Merge "Allow Parameters to set defaults for TemplateResource"

commit 1e16ed2deab60995f5a49cb5396e9c43b8d24b91
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon Aug 19 15:02:53 2013 -0700

    Use LONGTEXT for templates in MySQL
    
    TEXT in PostgreSQL is an unlimited column size. However, in MySQL, it is
    limited to 2^16 bytes. LONGTEXT allows 2^32 bytes, which is overkill,
    but will prevent MySQL from silently truncating this column and thus
    rendering the entire tenant's API access moot.
    
    Fixes bug #1210799
    
    Change-Id: Ib2b379db32a8296cf8c5a2434e7615afc59288e3

commit d053963dadccf1c0d398fe74b90ba8d29be5655b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Aug 19 15:28:58 2013 +1000

    Wrap the resource registration in a global environment
    
    Change-Id: I065dadc9fae19ab21d6d4aeae08334f20da161bb

commit de4158bff299897668527807e532516f0ea76848
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 19 20:51:45 2013 +0200

    Create a Schema from a parameter
    
    Add a classmethod to create a property Schema object directly from a
    parameter schema.
    
    Change-Id: I335ec48086ea5aeb1fb2afd9af8e93529d9b6051

commit 3168e8b43e77a10c54a57345d2c06f9f4e4800c7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 19 20:51:45 2013 +0200

    Allow Parameters to set defaults for TemplateResource
    
    Although it is theoretically possible to infer default values for the
    Properties of a TemplateResource from the Parameters of the provider
    template, this presents a number of conversion issues that are presently
    unhandled.
    
    Instead, pass parameter values only for properties that are supplied.  For
    the others, allow the parameter defaults in the template to be used.
    
    Change-Id: I2ba49ffeee06c3a272694c18b3875f843ade1e6c

commit ad22636367fba61302923f320b6dd09bd4194985
Merge: ebda43e 6362a81
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 19 15:38:59 2013 +0000

    Merge "Revert "Implement an "Action in progress" error.""

commit f3f3964a3a6db67325a0e08ff102268c3a1d736f
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Aug 19 15:58:35 2013 +0100

    Fix install.sh calling setup.py
    
    a25d888c914b417b2e7fba9bd497088b22a46309 broke install.sh due
    to making the setup.py 644
    
    Change-Id: I18e0340e4ae191eea68516b54483db72d93a7b2c

commit ebda43e0d4339b5a18f4293738846ddeb9de4c18
Merge: 20bdc0f 9b47301
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 19 14:36:02 2013 +0000

    Merge "Add code from Oslo DB 96d1f887dda Part 2"

commit a0d3536ac5f132d9d4220c8a2bb3cdc324121581
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Aug 16 15:21:55 2013 +1200

    Allow Description in properties schema
    
    The resource document generation already expects
    and uses any supplied Description text.
    
    Change-Id: Ife31cd99f6ff88345c3c06e3efeb4b3393e6351b

commit 20bdc0f0dd9b4f137531aaaf94a8bf4e0848f047
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Aug 16 11:39:42 2013 +1200

    Use nova_utils for keypair validation
    
    This removes unnecessary code.
    
    Change-Id: Ide1d12a44213ffd8b7bd414eb00a4d12e3f6cc2a

commit e3681276fe47f15245e9039fb79c7d6f0c76169b
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Aug 16 11:38:19 2013 +1200

    Move _check_resize to nova_utils
    
    Refactoring as part of blueprint native-nova-instance.
    
    Change-Id: Ice9a4541316ad04ac04b24ac877e0fc3fbeae9c8

commit a18f711e81d237fdcb6a04008ae9a48d1d19e3b0
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Aug 16 11:37:27 2013 +1200

    Move _deferred_server_statuses to nova_utils
    
    Refactoring as part of blueprint native-nova-instance.
    
    Change-Id: I91234905a2647ed03fd105b0fe5964ce2319248b

commit 54201351d039867f8b94e2e27d20150e3ec25f1b
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Aug 16 11:23:49 2013 +1200

    Move _delete_server to nova_utils
    
    Refactoring as part of blueprint native-nova-instance.
    
    Change-Id: Iaf3ab0333d891e6ac3bb07832a1acffd3e5ba43e

commit ba05f5cee2ee2e8c0b309675678bf4731fb25e4a
Merge: 99d568c 93927c5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Aug 18 20:01:26 2013 +0000

    Merge "Translate user-facing exception messages"

commit 99d568c66459e4431bbdcb00c9e3cb9481bd0951
Merge: 99b15f4 0e1e4b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Aug 18 15:11:26 2013 +0000

    Merge "Catch "FloatingIpPoolNotFound" in eip.py"

commit 99b15f4eeceba666feaee49db562909bb76f7efd
Merge: a4a823a 9ad94ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Aug 18 14:27:03 2013 +0000

    Merge "Adding HOT str_replace and get_resource functions"

commit 6362a81b56bf7d436ee220b5c16d153ac1c7d4a4
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Fri Aug 16 13:05:38 2013 -0500

    Revert "Implement an "Action in progress" error."
    
    This reverts commit faf984cbb5e62980e025191450a02d30aae8e02d.
    
    Multi-engine support is being re-designed to account for the use-case in
    bug #1211276.
    
    Fixes bug #1211276
    
    Change-Id: Ief89dd6a9c5014752db8065037dd1dd03efe789e

commit a4a823ac22a718f3be2179881fc37bea7a4c7039
Merge: b807c5a d233cf6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 16 14:46:29 2013 +0000

    Merge "Make Event object independent of resource object"

commit b807c5a6da02a856a36184e9d7d0c2050ab777b0
Merge: b8268ec 91a4082
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 16 14:29:43 2013 +0000

    Merge "Updated LaunchConfig for AutoScaling UpdatePolicy"

commit b8268ec5be60184771a6787a23d9d866b6865cbe
Merge: dfdef84 bfddf66
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 16 14:28:28 2013 +0000

    Merge "Tests for s3 and swift resources were extended"

commit 9b47301dc5c435c898467bed5f9a56999e4b287c
Author: Alexander Gordeev <agordeev@mirantis.com>
Date:   Thu Aug 1 17:55:12 2013 +0400

    Add code from Oslo DB 96d1f887dda Part 2
    
    Oslo version 96d1f887dda21b43ba4376187f31953dee6f5273
    
    This commit just adds new db related code from Oslo
    into Heat without additional changes
    
    Partially implements blueprint oslo-db-support
    
    Change-Id: I97515beaf0713f409405bdc27590e216f6ed1937

commit d233cf67032af0a4484ebf4bbf668c060f61c792
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Tue Aug 13 15:47:58 2013 +0800

    Make Event object independent of resource object
    
    The event table is pretty much self contained. So we actually don't
    need to referece the corresponding resources to retrieve information.
    
    Fixes bug #1204506
    
    Change-Id: If0b88e0f9e243cf3cc6d747ffa04b9a429ea83a2

commit dfdef847f66ffa0606b944ee3da511124b4c6e6f
Merge: 99202b9 4a4a065
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 15 18:04:31 2013 +0000

    Merge "Store owner_id on Stack so updates maintain it"

commit 93927c5ff00835e6e3363ea939e17b0e3716f461
Author: Ben Nemec <openstack@nemebean.com>
Date:   Thu Aug 15 12:02:46 2013 -0500

    Translate user-facing exception messages
    
    Exception messages should be translated because they can be
    visible to users.  Also convert these strings to use named
    format parameters in case translation reorders them.
    
    Change-Id: Ife6de17890ba153b8124e91edce6e6d540da3cac

commit 99202b94a967279c67ca2e9aafed014e556843fe
Merge: 709df38 bd37a3b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 15 17:08:19 2013 +0000

    Merge "Tolerate missing user on signal responder delete"

commit 91a40824f49f7fac7f073d909f7426f50d833a5a
Author: Winson Chan <winson.c.chan@intel.com>
Date:   Tue Aug 13 00:37:48 2013 -0700

    Updated LaunchConfig for AutoScaling UpdatePolicy
    
    This is the first part of a series to implement support
    for AutoScaling UpdatePolicy.
    
    Updated LaunchConfiguration resource type to return
    self.physical_resource_name() in FnGetRefId(). For both
    InstanceGroup and AutoScalingGroup, the property
    LaunchConfigurationName is added to the list of update allowed
    properties. With this change, any property change to the
    LaunchConfiguration resource will be result in a different
    LaunchConfigurationName on reference resolution and thus will
    trigger InstanceGroup and AutoScalingGroup to handle the update.
    
    Change-Id: I94da8f7083b64873c511b953c6bc63dba2b51034
    blueprint: as-update-policy

commit 0e1e4b697b96328bf8d8a42e0c4fc8fb074e2a63
Author: Hui HX Xiang <xianghui@cn.ibm.com>
Date:   Sun Aug 4 22:30:32 2013 -0700

    Catch "FloatingIpPoolNotFound" in eip.py
    
    This patchset catch the "FloatingIpPoolNotFound" exception in eip
    of heat, the floatingippool cannot be configured by heat currently
    but it can be assigned by setting 'default_floating_pool' in
    nova.conf
    
    Fixes bug #1206865
    
    Change-Id: Idd0fd39f5470904dd351a39f66a57781d9f7c444

commit 709df3811eae80d6248446b46dc36d3907e7f2c0
Merge: c92aa02 800c432
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 15 04:43:49 2013 +0000

    Merge "Extract failure reason before deleting nova server"

commit bfddf669cc70958bbe2b4d1b5495151ac116e5e9
Author: Maksym Iarmak <miarmak@mirantis.com>
Date:   Wed Aug 14 18:20:12 2013 +0300

    Tests for s3 and swift resources were extended
    
    According to the description of the bug, the problem
    is in the mechanism of dependencies. That is an internal
    function Ref is not working properly. To repeat it, check
    was added to the test templates (s3_test, swift_test). Thus,
    the bug has not been reproduced.
    
    Also, the method FnGetRefId in s3 and swift resources,
    despite its name, returns the resource name in the format
    'stack_name-resource_name-resource_id'. This is achieved
    by the method physical_resource_name, that implemented in
    superclass resource.Resource.
    
    Bug 1202987
    
    Change-Id: I0f85c39e10e8b455f93fdd768cd5e6ee14497277

commit 4a4a0656f8ba7db8d41e781ce692ffef90a6fa99
Author: Christopher Armstrong <chris.armstrong@rackspace.com>
Date:   Tue Aug 13 23:40:12 2013 +0000

    Store owner_id on Stack so updates maintain it
    
    Instead of passing owner to the store() method of parser.Stack,
    it is now maintained as an attribute of the Stack instance,
    and store() will use that saved attribute when saving.
    
    This fixes the problem of losing the owner_id on updates to
    a stack.
    
    Fixes bug 1212013
    
    Change-Id: I1e3b7832291ca0f5cda24c1995ab782824e48943

commit c92aa027facaecc793bdd9256fe3883e086a4c73
Merge: b50733e b071b6e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 12:07:01 2013 +0000

    Merge "Handle heat with SQLAlchemy >= 0.8"

commit b50733ee21a6a47187d863fb08194cce435c5728
Merge: 752bf20 7c8181f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 10:06:50 2013 +0000

    Merge "Do validation in parameter schema"

commit 752bf20d2abd7e123a0be06f3d061eee43ff17d6
Merge: bdcb18b 9d6e174
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 06:33:19 2013 +0000

    Merge "Differentiate resource types in test_update_rollback_remove"

commit bdcb18b3dbde710b4bdd92ea482dd06825ff3141
Merge: ae93568 3297f83
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 06:33:17 2013 +0000

    Merge "Stub ResourceWithProps instead of GenericResource"

commit ae93568118f1bea36f51000b44cc3860d90de5b4
Merge: 608fe2d 3002760
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 06:33:04 2013 +0000

    Merge "Update test requirements"

commit 608fe2d4517b88ef7c3cc095ae69226ae1ffe2ef
Merge: 6dfd2d4 44e65a8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 06:21:03 2013 +0000

    Merge "Derive keystone_ec2_uri from auth_uri"

commit 6dfd2d4d415c973de90868d6fc5616cd0818d28c
Merge: 0bbed54 07341ee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 03:49:15 2013 +0000

    Merge "Not to eat Metadata parsing error"

commit 0bbed5463720be2f3624250a7d10b3d9f370d087
Merge: 1f9326a 3b64fd8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 03:49:01 2013 +0000

    Merge "Revert "Add missing _ imports to allow doc generation""

commit 1f9326ac172b68ff8702e2f5408648a8489f850d
Merge: 454c4cc 2fa20bf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 03:45:51 2013 +0000

    Merge "Hot SoftwareConfig model part"

commit 454c4cc54f4c8be5322ec4bdf31111a2323a1a7b
Merge: 45b5ac4 a25d888
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 03:43:54 2013 +0000

    Merge "Fixes files with wrong bitmode"

commit 45b5ac41071c058de4f7b735890a6883e96a6150
Merge: e9b63ba 433da26
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 03:43:44 2013 +0000

    Merge "Ensure all REST API error responses are consistent"

commit 44e65a8516f53f2f5fe86ea71afefea24d59561d
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Aug 13 09:25:03 2013 +1200

    Derive keystone_ec2_uri from auth_uri
    
    ec2token auth_uri must be correctly configured for heat to work.
    The /ec2tokens path is not an endpoint in its own right, it is
    part of the keystone v2.0 API. The keystone_ec2_uri configuration
    parameter was only used for ec2 style credentials validation in
    the ec2token middleware.  It might have also propagated all the
    way into the user_creds table to be stored for each stack were it
    not for this chain of failures (removed in this commit):
    - X-Auth-EC2_URL header is set in ec2token, but header X-Auth-EC2-Url
      is read by RequestContext
    - RequestContext stores the ec2 uri in aws_auth_uri, but UserCreds
      expects aws_auth_url
    
    Change-Id: I9908e17bed33fdc64d058a6d6db7b29f9c8d53d6

commit 800c43221e2ee98464c0621a3cbf17c5f0a93ec0
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Aug 14 15:31:01 2013 +1200

    Extract failure reason before deleting nova server
    
    If a nova server create fails, the server is deleted
    leaving no indication of the source of the failure.
    
    This change extracts the failure reason from the nova
    server fault attribute and includes that in the raised
    error.
    
    Change-Id: I7a4618d9e3fded3cde1c15d5322b52eaf63a68f5

commit 3002760cc835a27dda714163bc2c65b53fbbb2de
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Aug 14 15:27:26 2013 +1200

    Update test requirements
    
    As modified by auto-run of requirements/update.py
    
    Change-Id: I150a56dd7956ea2a3b01c1921dc35e51ccd35afe

commit e9b63ba4586f0b615e861b0307872285b99202a9
Merge: ce08713 f117580
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 02:49:51 2013 +0000

    Merge "Use correct actions for StackResource"

commit ce0871346d6424e0735531e56561a77a989fb69e
Merge: 8c4f835 d4fa4d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 02:49:44 2013 +0000

    Merge "Validate created/updated stacks in StackResource"

commit 8c4f8354d727e71e2e5d273ed2b07f3881372322
Merge: e656656 d3bc51f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 02:31:20 2013 +0000

    Merge "Tidy up a few places in test_engine_serivce.py"

commit e6566569c4cd6795d61173f98a4cd709b7470a7d
Merge: 315aa57 00e71c3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 02:28:30 2013 +0000

    Merge "Update Oslo to 96d1f887dda Part 1"

commit b071b6e73563e84a81f1eed77b05054511692db9
Author: Zhang Lei (Sneeze) <sneezezhang@cienet.com.cn>
Date:   Wed Aug 14 10:07:52 2013 +0800

    Handle heat with SQLAlchemy >= 0.8
    
    Lots of unit tests failed with the new SQLAlchemy(0.8.2)
    which makes build failed, this patch will fix all the related
    bug like no MutableType and changed module name in SQLAlchemy(0.8.2)
    
    Fixes bug #1199435
    
    Change-Id: I67d7588db088dd3dd88d44c32e78c6b8a4708bff

commit bd37a3bee6f8bd3996aa1e017adb01546df385a6
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Aug 14 11:15:38 2013 +1200

    Tolerate missing user on signal responder delete
    
    SignalResponder delete fails if the created user
    has already been deleted.
    
    This change catches the 404 as for the User resource.
    
    Change-Id: I55034469d10f2742296f0415fe26272d3683530d
    Closes-bug: #1211633

commit a25d888c914b417b2e7fba9bd497088b22a46309
Author: lawrancejing <lawrancejing@gmail.com>
Date:   Tue Aug 13 21:36:19 2013 +0800

    Fixes files with wrong bitmode
    
    Some modules have bitmode 755. Changed to 644.
    
    Change-Id: I4cb86987f1e2dd8420d511cb403228ba908d056b

commit 315aa5754a06ba5ae81b95be327e663ed48191fa
Author: Thomas Spatzier <thomas.spatzier@de.ibm.com>
Date:   Tue Aug 13 15:58:53 2013 +0200

    Fix syntax description of HOT get_attr function
    
    Fix syntax description of get_attr function in HOT specification.
    Colon instead of comma was used in array.
    
    Contributes to blueprint hot-specification
    
    Change-Id: I8007d476093ecd5be41020025b486147a5ac038b

commit 9d6e174542e46b3a4d23c53d73f6b16af804414f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Aug 13 15:18:17 2013 +0200

    Differentiate resource types in test_update_rollback_remove
    
    Ensure that the operations really are happening on the resource we think.
    
    Change-Id: Ie0c85853378e3f0ef3eab4cd0714af0e94108406

commit 3297f83688d0548d3ee3f1b8c9677037189c5bf7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Aug 13 15:18:17 2013 +0200

    Stub ResourceWithProps instead of GenericResource
    
    Stubbing methods in a superclass is an all-or-nothing affair: once a stub
    in the subclass is unset, the subclass will no longer inherit changes in
    the superclass (i.e. if you then stub out the same method in the
    superclass, the subclass will be unaffected).
    
    Previously, we always set the stubs in the superclass (for historical
    reasons, to avoid making this change). This would lead to tests that want
    to differentiate between types (by stubbing in the derived class)
    interfering with the operation of other tests. This patch changes to always
    setting the stubs in the derived class.
    
    Change-Id: I2c8dbd22826da14611a6a3f55321f0016446580a

commit 94a9cf26d7660e6cc37b4cf1dab30fba2075b1f0
Merge: d7712c7 dc4d670
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 11:22:56 2013 +0000

    Merge "Add debug option to run_tests.sh"

commit d7712c70e63b805fbbe59a4e8f595fa0928d306a
Merge: d01c05f 34e47b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 11:22:54 2013 +0000

    Merge "Move heat-cfn, heat-boto, heat-watch to new repo"

commit d01c05f93fc186253f2f129c0c386e7d3f70b49e
Merge: 012087b 7e8e1fa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 10:30:25 2013 +0000

    Merge "Fix intermittent failure in autoscaling tests"

commit 2fa20bf0c76c74b0d3473fe4dd203c8896432d22
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Wed Aug 7 14:35:13 2013 +0800

    Hot SoftwareConfig model part
    
    Provide components model and related methods
    
    Implements blueprint hot-software-config
    
    Change-Id: I251d10f25943513ef346883263a4dd2e0f6fb7a6

commit 00e71c3d7810e2f9e12f57c0a713d2b8939bb70f
Author: Alexander Gordeev <agordeev@mirantis.com>
Date:   Thu Aug 1 17:22:20 2013 +0400

    Update Oslo to 96d1f887dda Part 1
    
    Oslo version 96d1f887dda21b43ba4376187f31953dee6f5273
    
    This commit just injects fresh portion of code from Oslo
    into Heat and fixes all the issues with new code
    
    Partially implements blueprint oslo-db-support
    
    Change-Id: I7e98c12ddf6689efc6ea6a4deab0b1c840297730

commit 012087be2cec3869ec71bcaac8af46d1aa7a4ec0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Aug 13 10:48:16 2013 +0200

    Move property constraints validation to Schema
    
    Change-Id: I6e296dfc2243da7cabd24d65799036fc245f0f7a

commit 9cb8ca5a6b8a725dc8dbdb304e1fddce0663debe
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Aug 13 10:48:15 2013 +0200

    Remove unneccessary Property constraints from unit tests
    
    It doesn't really make a lot of sense to have constraints on the number of
    keys in a Map Property, or on the allowed values in a List Property. In
    both cases, we can and should define the Schema for each item. Neither is
    used anywhere in the code, since the new Schema/Constraints do not allow
    it, and SchemaTest.test_all_resource_schemata() tests that all existing
    schemata are valid.
    
    Change-Id: I24e11ec59c75ef770bf040ee8151bbe061f4a864

commit 68841467ee5e113e79541ed1b2b2be9b41627c5c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Aug 13 10:48:15 2013 +0200

    Add constraint checking to Property schema
    
    Change-Id: Ibec4068a0497ca6ac1dd25decd27fa87585b18a3

commit d3bc51ffaf075badf7243b702f8656089de8de9d
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Tue Aug 13 15:36:28 2013 +0800

    Tidy up a few places in test_engine_serivce.py
    
    Change-Id: I3ce32f5057cd074f55466de3a78d8783ab161943

commit 9ad94efb3a8b5d65333e1d54352ce70c2cecd535
Author: Thomas Spatzier <thomas.spatzier@de.ibm.com>
Date:   Mon Aug 12 18:10:48 2013 +0200

    Adding HOT str_replace and get_resource functions
    
    This patch adds support for two functions, get_resource and str_replace to HOT
    to enable the definition of new HOT samples. Especially str_replace aims to
    simplify the definition of scripts in HOT templates.
    
    Change-Id: Ic14fee36bdc0b9c5d79ade7ece5fa1b5331c864a

commit 3b64fd85190af18d39ca718c9bb11456367e6e80
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Mon Aug 12 21:45:46 2013 +0000

    Revert "Add missing _ imports to allow doc generation"
    
    This change reverts commit 0453785f3f7b2a578b433cb0544394aac9bcfb95 and
    fixes a bug where the _() was not being recognized when building the
    documentation while preserving the delayed translation of error
    messages.
    
    Closes-Bug: #1211507
    Related-Bug: #1209413
    
    Change-Id: I5d52941e1f08ec656f7279efb6cdf496d81861da

commit e8a742c850b89357690bfbe50df338b1bfc7bbe5
Merge: 1d1c792 0eff5be
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 00:53:16 2013 +0000

    Merge "Introduce new resource_data_delete db api"

commit 34e47b64d926c055d9895c5b3f27949eaca68999
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Jul 22 16:01:44 2013 +1200

    Move heat-cfn, heat-boto, heat-watch to new repo
    
    The new home for these tools is
    https://github.com/openstack-dev/heat-cfnclient
    
    These tools are now aimed at heat developers only
    and they will not be released or packaged.
    
    Change-Id: I1ea62ef17e81ab53cacb5e4940f0c4e2516ed383

commit 1d1c7927d1d89ba1aec43acf686addae7fa68da2
Merge: 499ef45 12bbfd7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 23:59:49 2013 +0000

    Merge "ReST API: Add an API for retrieving resource schemata"

commit dc4d670e10a244c153427f9d61cab2d814a13a43
Author: guohliu <guohliu@cn.ibm.com>
Date:   Tue Aug 13 02:33:50 2013 +0800

    Add debug option to run_tests.sh
    
    Change-Id: Ie21cb8b7a370d5e62c7ac75d37affd62f761765a

commit 0eff5bef38d42fb3a90714eddc23327797e34e46
Author: Thomas Herve <th@rackspace.com>
Date:   Mon Aug 12 16:51:36 2013 +0200

    Introduce new resource_data_delete db api
    
    This allows removing data associated during to resources during its
    lifecycle.
    
    Change-Id: Id45e7cb9129a8187229c708e0d3f6cb2a591bb39

commit 499ef457204bc44d7071a55541256e80ee67351f
Merge: 45e1a50 1ebc77b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 15:41:29 2013 +0000

    Merge "Fail fast if Resource action methods are missing"

commit 07341ee01b6d8e40992dbf61a7b5d19dcae2cb8a
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Mon Aug 12 23:21:18 2013 +0800

    Not to eat Metadata parsing error
    
    Exception raised while resolving metadata is treated as database
    exception and eaten.
    
    A few testing errors are revealed after metadata parsing error is
    propagated to callers.
    
    Fixes bug #1207193
    
    Change-Id: I3b5cc5fed3896b7fe59533c7d09f0226e5cf5ad9

commit 7e8e1faf5b759bf82d8e0a0525ec563fdff1a4e8
Author: Thomas Herve <th@rackspace.com>
Date:   Mon Aug 12 17:04:00 2013 +0200

    Fix intermittent failure in autoscaling tests
    
    Tests for autoscaling suspend and resume sometimes fail because of an
    order issue. The branch changes the mock calls to not rely on order.
    
    Change-Id: I74bcde5c6b486fecbb2c2ed0685ce18c786aa974

commit f117580efce5f82ad7ecadbdb553ef186beae0d9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 12 16:55:36 2013 +0200

    Use correct actions for StackResource
    
    To perform actions on a stack, we should use the action constants defined
    in the Stack, not in another object (and especially not in a Resource).
    
    Change-Id: I3044f6286fc2690c121a3446f42a6896b3ed3271

commit 45e1a50181246ce877301fbb710cabf70492a5c1
Merge: 6ce8c8e 1daadb9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 12:11:47 2013 +0000

    Merge "Get rid of unused greenlet things in test_resource"

commit 6ce8c8e3119f6067d00a9761c968ef5292cda2bd
Merge: d182dcc 6c842ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 11:59:58 2013 +0000

    Merge "Resolve LaunchConfig references"

commit d182dcca6da9ec018e986214b0e2d489ace138e9
Merge: 9f700a0 514e9b7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 11:02:36 2013 +0000

    Merge "Initial input for HOT template guide and spec"

commit 9f700a0d92f1e78dcbd2371849daab411c870ce4
Merge: 204bd7b 102e4c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 11:02:29 2013 +0000

    Merge "Don't raise ResourceFailure directly in Instance"

commit 204bd7bf7a758dd950d377c2ed370c4d273fa136
Merge: ea83af8 bd8b68e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 11:02:22 2013 +0000

    Merge "Enable multi-cloud standalone mode"

commit 6c842ed0bc7a76f2b57ec43f61160964ad209f27
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Aug 12 20:50:52 2013 +1000

    Resolve LaunchConfig references
    
    Autoscaling was not working if there were references in the launchconfig.
    
    bug 1211125
    Change-Id: Ie3be79d579e87a8026690cbe40c9056591c00e31

commit 1daadb9c12bdf8ceb37176db3c524b0c5d03bf2c
Author: Alexander Gordeev <agordeev@mirantis.com>
Date:   Fri Aug 9 17:25:58 2013 +0400

    Get rid of unused greenlet things in test_resource
    
    Removing useless test cases containing greenlet.GreenletExit
    for the sake of 56d5fb9f83b647d27a00d56cb4dad8aad9e1169f
    
    Change-Id: I6a1463c8467ee1750a66b00758428bc74f9371eb

commit 1ebc77bc04cac3ceb889a889e2266adaaccc5b06
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 12 11:12:33 2013 +0200

    Fail fast if Resource action methods are missing
    
    If a resource is not actually a Resource with create(), delete() &c.
    methods then something has gone horribly, horribly wrong. This is not a
    priority for handling gracefully at runtime.
    
    Change-Id: Iafce8e4a222677fc590bb579654e195dc4252a9e

commit 102e4c17e39cdbadcb99a696d05426b26b503d47
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 12 10:50:57 2013 +0200

    Don't raise ResourceFailure directly in Instance
    
    It's meant to be a wrapper around other exceptions that's invoked by
    top-level resource operations; don't use it as an all-purpose exception.
    
    Change-Id: I295202bca603006a4d5f5d56110fc4298ddd9cec

commit 12bbfd775b085bc74dc9e334aafc6f67f6a5310f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 12 09:51:39 2013 +0200

    ReST API: Add an API for retrieving resource schemata
    
    blueprint resource-properties-schema
    
    Change-Id: I07523a5996eea37a414310c21414be6454d08bfe

commit ea83af8836a55537ef6426edae9b6aaad879772c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 12 09:51:39 2013 +0200

    RPC: Add an RPC call to get a resource type schema
    
    blueprint resource-properties-schema
    
    Change-Id: Id316393d84b6f1112b80caf14ffb98c937597f40

commit 5f301b87db1a582b87d65b90334a521360c31220
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 12 09:51:39 2013 +0200

    RPC Client: Add missing unit tests
    
    Change-Id: I6b54a6a2191d094f539045567260e84b962b961b

commit 8f1f23d3f1a40d7056a5fec5ee170f0c680bf69f
Merge: 0dc3a1e eca7fda
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 06:09:51 2013 +0000

    Merge "Port policy from oslo and refactor heat policy"

commit eca7fdae8c61cce8b9be8d7c4d95664ff2c02694
Author: guohliu <guohliu@cn.ibm.com>
Date:   Thu Aug 1 00:28:56 2013 +0800

    Port policy from oslo and refactor heat policy
    
    This patch is to refactor Heat's usage to allow bringing the
    policy code from oslo up to the current version to address
    many fixed bugs which affect Heat.
    
        1. Refactor the heat wrapper policy.
        2. Add netaddr in requirement.txt.
        3. Add necessary unit test to cover the refactor part code.
    
    Oslo commit: 3626b6db91ce1e897d1993fb4e13ac4237d04b7f
    Fixes bug #1192551
    
    Change-Id: Ia71d14b2cfde9110216ba38a515fee16d0f0c35e

commit bd8b68e141f2238bf8555a19602335cc03e6a07e
Author: Ben Nemec <openstack@nemebean.com>
Date:   Sun Aug 11 18:15:17 2013 -0500

    Enable multi-cloud standalone mode
    
    Adds a multi_cloud configuration parameter for auth_password that
    tells a standalone Heat installation to look for its auth_url in
    the request headers instead of the configuration file.  Also adds
    an allowed_auth_uris configuration option to specify which
    auth_urls are allowed as targets.
    
    bp heat-multicloud
    
    Change-Id: Ic0929586ac3b57c7f9f3335e0dbd5e14e6b56067

commit 0dc3a1e3ab65641033179b9e800505889d3701ec
Merge: 82e01b6 8f8c9ab
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 02:39:47 2013 +0000

    Merge "Fix problem creating ResourceFailure"

commit 82e01b6e2c0dad22ab98e404d3b54801bc10d78c
Merge: 9015f27 53842f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Aug 11 07:10:13 2013 +0000

    Merge "Tidy up RPC API definitions"

commit 9015f27cb3f45e72198044beba388d0de9f9f3a0
Merge: 872fcf8 51dc4e2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Aug 11 07:10:06 2013 +0000

    Merge "Define a Schema format for properties"

commit 8f8c9ab6b7493cb402c16722d5255e792740df0f
Author: Ben Nemec <openstack@nemebean.com>
Date:   Fri Aug 9 20:12:23 2013 -0500

    Fix problem creating ResourceFailure
    
    The ResourceFailure exception is being instantiated improperly in
    a couple of places.  This changes fixes the problem and adds tests
    to cover the problem cases.
    
    Change-Id: I2662a3abde1fd00d275e2190401c20166256cae0
    Closes-Bug: 1210681

commit 7c8181f226f5f161590052da2cce3937754fb2ce
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Sun Aug 11 11:24:38 2013 +0800

    Do validation in parameter schema
    
    Provide validate method in parameter schema and call it in each
    parameter object.
    
    Implements blueprint hot-parameters
    
    Change-Id: Ia85c5fe9eb777bc1e5f76f9ddb08a6ec96100c38

commit d4fa4d25f322ac87efd5235b45c26cf814faea53
Author: Christopher Armstrong <chris.armstrong@rackspace.com>
Date:   Thu Aug 8 23:00:29 2013 +0000

    Validate created/updated stacks in StackResource
    
    StackResource.create_with_template and update_with_template now validate
    the resulting stacks.
    
    Change-Id: I52a81edb2af6bee70146f6dbd2179900e580d69b

commit 872fcf8a311292aedb16bb21e74e37bc32bebee9
Merge: 02899a8 6e2f315
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 20:34:04 2013 +0000

    Merge "Tolerance for modified ceilometer alarm notification"

commit 53842f7b5c7b828421d7d6020cef17f9d5fa8f45
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 9 20:19:50 2013 +0200

    Tidy up RPC API definitions
    
    Ensure that the layouts of names and values match.
    
    Change-Id: I8cea3dc7ea1fd2a1b722ddd7058564d5195b738b

commit 51dc4e2218d9f086960ffc5f72ffc974ceed00cc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 9 20:19:50 2013 +0200

    Define a Schema format for properties
    
    Define a Schema class for properties and their constraints that is easily
    serialisable to a JSON schema format that matches the proposed Parameter
    input syntax for HOT. Since resource properties have not been exposed to
    the user before, this format will make the most sense to a user in the long
    term.
    
    A future patch will switch the Property validation code over to using
    Schema objects instead of the dictionary-based schemata currently in use.
    
    blueprint resource-properties-schema
    
    Change-Id: I79fa5927bdffeaf103a1c2ba58b709b4ba72b551

commit 02899a8d09dff783ea1c24965f332000bcc4ff60
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Fri Aug 9 23:52:36 2013 +0800

    Remove meaningless property set in models.HeatBase
    
    Seems this was originally ported from Glance.
    
    Change-Id: I8124e9495a5c7585052e149481db44d1e180ac7d

commit 6e2f315a44b9a72322f8e59bbf228f79d73566ba
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Fri Aug 9 09:42:53 2013 +0000

    Tolerance for modified ceilometer alarm notification
    
    Changes to the ceilometer alarm notification payload are
    proposed here:
    
      https://review.openstack.org/40955
      https://review.openstack.org/41056
    
    i.e. field names in the JSON payload are changed with:
    
      s/state/current/
      s/alarm/alarm_id/
    
    Tolerance is added to the autoscaling logic for the new
    field names.
    
    Change-Id: I19f36d9331b6f28a3195fb5012ea0b9ee274ade3

commit cbf19dce1f781cb687b0212138a6ff38f0403dc2
Merge: 0c01275 ecf530e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 10:24:07 2013 +0000

    Merge "Use openstack rpc functions to generate _Remote exceptions"

commit 0c01275174ccd68f15c34cf21e7273c7d1740da8
Merge: f6b6cf8 4604158
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 10:10:18 2013 +0000

    Merge "HOT parameter validator part"

commit 514e9b746cc8c36ca1dad44b3ce10b99720b258c
Author: Thomas Spatzier <thomas.spatzier@de.ibm.com>
Date:   Thu Aug 8 18:59:11 2013 +0200

    Initial input for HOT template guide and spec
    
    This patch adds initial input for the HOT template guide and the HOT
    specification.
    Note that content so far is based on features implemented so far and
    not forward-looking in any way. Whenever new features get implemented,
    the guide and spec will be extended appropriately.
    
    Contributes to blueprint hot-specification
    
    Change-Id: I63d29ab0a1db6703b39f981161063d4fd9f97126

commit f6b6cf8097a597189e84e9931ceefb674aa3b59f
Merge: 17a6992 a328c00
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 03:58:27 2013 +0000

    Merge "Implement neutron pool resource"

commit 17a69923593fe464bbb62b5a879c4d74bc69977e
Merge: 5518425 b9da1c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 03:58:20 2013 +0000

    Merge "Implement neutron health monitor resource"

commit 5518425daf4a80cb250113732af215b1d66c7214
Merge: 6c9a97b 33edbd1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 03:02:37 2013 +0000

    Merge "db: Remove deprecated assert_unicode attribute"

commit 6c9a97ba251fbaa882a6f9ab689fa620cbf508b3
Merge: b97f9cb 3ef6a9d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 03:02:30 2013 +0000

    Merge "Add unittests for faultwrap middleware"

commit b97f9cb8f4689ebe1a6c963a96d58f853fb7b508
Merge: bafa5fe d53e913
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 01:56:11 2013 +0000

    Merge "Remove unnecessary individual import tests.utils.X"

commit d53e9139dc0db850147c8b90028381b15a8cd07f
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Fri Aug 9 00:41:37 2013 +0800

    Remove unnecessary individual import tests.utils.X
    
    Fixes bug #1210183
    
    Change-Id: I530675329a17b10ef684ceec6c51b418726abdb2

commit bafa5fef5b69d56bfc19bf4e32e30666ecf2f9a2
Merge: 3f6b875 65278b3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 22:05:55 2013 +0000

    Merge "Updated from global requirements"

commit 433da2654372cf6e1841b24266d3318c7d0c14af
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Tue Aug 6 18:36:02 2013 +0000

    Ensure all REST API error responses are consistent
    
    Heat exceptions are serialized into JSON/XML responses by the fault app,
    which is at the end of the WSGI pipeline. Some REST API errors however
    are raised as HTTPExceptions, which are treated by WSGI as responses
    ready to be sent back to the user, and they can't reach the fault app.
    
    This patch set disguises HTTPExceptions raised by the wsgi.Resource so
    they can reach the app that will serialize them just like all other
    errors.
    
    Fixes bug 1208620
    
    Change-Id: Id98dbc1e3b208401be8f0119a6d72d4561a2221a

commit 3f6b8758b707e16f7ffa4119c087d74e2b9c4fe3
Merge: b210c69 ac1e0a0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 17:21:57 2013 +0000

    Merge "Refactor compute resources to use nova_utils"

commit b210c69055619b53c1f829c4f6d0069bf713b7fb
Merge: f3259d3 f77cbbc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 17:21:49 2013 +0000

    Merge "Remove raw_template_get_all from db api"

commit f3259d3126b7006cfd354485c9b2a553cd86920d
Merge: c0125ca 30b8a18
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 17:17:39 2013 +0000

    Merge "Provide a way to clean up soft deleted data"

commit c0125ca85504d7224fa2c6a5a19440f1c569485e
Merge: 636ea6c 1e0c5d7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 17:17:32 2013 +0000

    Merge "Enable stack soft delete for event persistence"

commit 636ea6c45acac8f4c9b2156de8267aeb10248a4f
Merge: 2b4b248 ace0231
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 16:15:42 2013 +0000

    Merge "Exclude heat-cfn, heat-watch from pep8"

commit f77cbbc9f421bf08e077e960eaebf2ac6b6d2b69
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Aug 7 08:18:14 2013 +0800

    Remove raw_template_get_all from db api
    
    This is not used anywhere in the code base anymore, and does not
    seem to be useful in the future.
    
    Change-Id: I5964bc0d402abdb5dde889a4c605fe4d4b4b1376

commit 30b8a186a83522838b9bc1a30a4032770d2fb2e8
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Fri Jul 26 21:39:09 2013 +0800

    Provide a way to clean up soft deleted data
    
    Add a purge_deleted command to heat-manage. The command takes an
    'age' argument, and removes all database records that have been soft
    deleted for more than 'age' days. Default to 90.
    
    blueprint event-persistence
    
    Change-Id: I8a62108a907b4e709c91a93a1f7db6c702cec6b5

commit 1e0c5d7d44bca0e4e45f53299fdc84e2b100a4f2
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Aug 7 08:08:22 2013 +0800

    Enable stack soft delete for event persistence
    
    Instead of removing database records when deleting data from stack,
    table, mark them as deleted through the deleted_at field. And allow
    access to soft deleted records by stack Id.
    
    blueprint event-persistence
    
    Change-Id: Iaddd9ba683deab65a9b2be3cc2e727c34e816dd4

commit a328c003e8f661f9235d2dfa37f1822b791e85f8
Author: Thomas Herve <th@rackspace.com>
Date:   Wed Aug 7 13:48:04 2013 +0200

    Implement neutron pool resource
    
    The branch adds a new resource creating pool instances in
    Neutron LBAAS.
    
    Change-Id: Ie55dd0cc5d2a67296ab175dc3bea11ffb63ba928
    Implements: blueprint lbaas-resource

commit b9da1c07f12c534d0bd924dcad48327ada864d43
Author: Thomas Herve <th@rackspace.com>
Date:   Tue Aug 6 11:32:40 2013 +0200

    Implement neutron health monitor resource
    
    The branch adds a new resource creating health-monitor instances in
    Neutron LBAAS.
    
    Implements: blueprint lbaas-resources
    Change-Id: Ie133f9c55bf57166e1999bbc0f11fd9b9519c1c2

commit 33edbd16781b97e1c57e3b539835ad74f89df591
Author: Chuck Short <chuck.short@canonical.com>
Date:   Thu Aug 8 08:41:58 2013 -0400

    db: Remove deprecated assert_unicode attribute
    
    Remove deprecated assert_unicode sqlalchemy attribute,
    removed in sqlalchemy 0.8.0. The deprecation is described
    at:
    
    http://docs.sqlalchemy.org/en/latest/changelog/changelog_08.html#change-ad44af79c886d1bb283042deb64f9cbe
    
    Change-Id: I874be66948fc296bc6afe7f731dc4731645f0fbe
    Signed-off-by: Chuck Short <chuck.short@canonical.com>

commit 2b4b248242a91649ea934cbcc600d7d7e287f580
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Aug 7 08:04:12 2013 +0800

    Refactor some tests for stack soft-delete
    
    A few tests need to be refactored so that they will not break after
    applying soft-delete on stack table.
    
    blueprint event-persistence
    
    Change-Id: I62d958521ca41717455d5a26756966cab8bf2bb7

commit 3ef6a9d7d40dd66c89fd3e5c309ad76b5d4e836c
Author: Jianing YANG <jianingy@unitedstack.com>
Date:   Thu Aug 8 12:55:37 2013 +0800

    Add unittests for faultwrap middleware
    
    Partially implements bp exception-formatting
    
    Change-Id: Ib57ce625775e222e5b42b22c10687bce7b63d26d

commit ecf530e9aa469bc1901e4395d8f618f056111267
Author: Jianing YANG <jianingy@unitedstack.com>
Date:   Thu Aug 8 15:36:00 2013 +0800

    Use openstack rpc functions to generate _Remote exceptions
    
    use serialize_remote_exception and deserialize_remote_exception
    to generate _Remote exceptions in api testing.
    
    Change-Id: I30865306830678db493b83512bbcfac3b27ff13b

commit 029d324b3da6cc26b33a394e53ff65a51685aaa6
Merge: 8e68e00 6e1985c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 09:11:21 2013 +0000

    Merge "Provide a way to clean up testing database"

commit 8e68e004842238f8887776f209ede866625d8f06
Merge: 66ce8ca c6e82c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 04:54:08 2013 +0000

    Merge "Refactor InstanceGroup to use a nested stack"

commit 66ce8caaa021401b80963ead7bf653ca7ae40222
Merge: 40b115e 0453785
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 04:48:24 2013 +0000

    Merge "Add missing _ imports to allow doc generation"

commit 40b115e60aeebff0f861887ebf8f683a774657d0
Merge: 6dd4218 e24a3a4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 04:48:17 2013 +0000

    Merge "Fix H231 Python 3.x incompatible 'except x,y:'"

commit 6dd4218be05cbf2acfa094180859ac708f164432
Merge: 49e236e 6e70181
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 04:47:57 2013 +0000

    Merge "Fix H501 Do not use locals() for string formatting"

commit 49e236e530a847db277878f710eed3311a159031
Merge: c84b280 faf984c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 03:43:16 2013 +0000

    Merge "Implement an "Action in progress" error."

commit ace02312a77c59390bd895216e288f4d3037e428
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Aug 8 14:13:07 2013 +1200

    Exclude heat-cfn, heat-watch from pep8
    
    They are due for removal in https://review.openstack.org/#/c/38228/
    and are causing many H233 errors when using the syncronised
    requirements versions.
    
    Change-Id: Ie632de44360519a0f705052ebaf4fe1304a0c290

commit e24a3a496ab7776e3d4d8254bc7676728315ae0e
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Aug 8 14:10:57 2013 +1200

    Fix H231 Python 3.x incompatible 'except x,y:'
    
    This is triggered in the pep8 check when using the syncronised
    requirements versions.
    
    Change-Id: Ie73c44b85025f79e7358303fab2697e076f7cabf

commit 6e70181f742cd4605b379ad02f8ddfdaeaf45316
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Aug 8 14:03:03 2013 +1200

    Fix H501 Do not use locals() for string formatting
    
    This is triggered in the pep8 check when using the syncronised
    requirements versions.
    
    Change-Id: If0e38fecaf32d4ba6ec9755f2f11c675acf6d20b

commit 6e1985c0d8386fde50d9bfd30948e9272e1348bf
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Aug 7 07:50:27 2013 +0800

    Provide a way to clean up testing database
    
    We will need to clean up stacks(hard delete) sometimes in the tests.
    Resoure, ResourceData, and Event need to be cleaned up as well because
    of the integrity constraints.
    
    blueprint event-persistence
    
    Change-Id: I355f7a9909eb3ad3febca62fdb57ecbaab73f2ce

commit 0453785f3f7b2a578b433cb0544394aac9bcfb95
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Aug 8 11:20:48 2013 +1200

    Add missing _ imports to allow doc generation
    
    Fixes bug: 1209413
    
    Change-Id: I7d405ceb6a500cbb3d0eb19e85cb0540564e0643

commit ac1e0a030d5abd7c69a1f79f35aab36c31fa4b6d
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Tue Aug 6 19:48:02 2013 -0500

    Refactor compute resources to use nova_utils
    
    Change-Id: I4a03a8062998c8f713ada47d0d86f2ace52cc253

commit 65278b3ff31b9e016c90a664d422c4a1fe8d4811
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Aug 7 19:19:14 2013 -0300

    Updated from global requirements
    
    Change-Id: Ibf423f14a5c37aa298b2115bfd4936f660c6f530

commit c84b2802a93df25d4fd058e006c648c2da2e99ba
Merge: bae9c57 7601916
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 20:00:11 2013 +0000

    Merge "Refactor useful nova functions for re-use."

commit faf984cbb5e62980e025191450a02d30aae8e02d
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Thu Aug 1 12:37:29 2013 -0500

    Implement an "Action in progress" error.
    
    Raises an "Action in progress" error if an action is in progress when
    another action is issued.
    
    Fixes bug #1207032
    
    Change-Id: I2b6fd92cfa4b93ac2531dd3d76bf2dfc01e58c50

commit bae9c57cb1a75c0e592a2356ee3d19a95888d938
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Fri Aug 2 15:19:30 2013 -0500

    Don't cache data from the API that could change.
    
    The Cloud Server resource caches Nova server objects, which could change
    between Heat calls.  Heat should get new data from the Nova API on each
    run.
    
    Fixes bug #1208559
    
    Change-Id: I7dd8a99745cf8a3aab974468acae8dc1f85369ee

commit 05e421b03ae388cebccd6dbb2480455f5e3c230b
Merge: 35d16b0 ed0fb7e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 13:00:38 2013 +0000

    Merge "Rename Quantum to Neutron"

commit 35d16b09559914f65fb95bf2e28cb3648874f940
Merge: 84ed46b 62fe312
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 13:00:32 2013 +0000

    Merge "Add help option to Config Settings"

commit 84ed46bddb28864d2735e95ae38c3bc7a8195365
Merge: b33cab8 4368dcc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 13:00:30 2013 +0000

    Merge "Fix test cases pass dict schema directly as parameter schema object"

commit b33cab8645558916a52d43eb8d8f8a81d8e5dd23
Merge: 8263746 ec5a4ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 13:00:28 2013 +0000

    Merge "DB models and migration scripts for soft delete"

commit 826374681438bf63a4f9eb1c37d59c1ea1f4c7e8
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Aug 7 20:24:17 2013 +1000

    Stop copying UUIDStub, put it into tests.utils
    
    Change-Id: Ice52f4294df5575579795eecfcbae9748f252e2e

commit 46041586891cd900e4c3931643313c8f73039dd3
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Thu Aug 1 11:14:12 2013 +0800

    HOT parameter validator part
    
    Introduce new class ParamSchema to decouple parameter and its schema,
    do validation in schema, for hot template, implement HotParamSchema as
    it subclass.
    
    Implements blueprint hot-parameters
    
    Change-Id: I8720c62e41a1f182584c4518163d422784c23b37

commit 4368dccc087a1669f9cd29b4f5fc0dea937ab2b1
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Thu Aug 1 11:14:12 2013 +0800

    Fix test cases pass dict schema directly as parameter schema object
    
    Filter the parameter schema snippet through a Template object and out
    the other side completely unchanged before passing it to Parameter.
    
    Implements blueprint hot-parameters
    
    Change-Id: I8c3dd99c1a2f460f50a92565d9098c70c9e77a8a

commit ed0fb7e82335ceb97d8ae7226f0789ad3a79d913
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Aug 6 19:41:26 2013 -0700

    Rename Quantum to Neutron
    
    quantumclient is gone upstream and has been replaced by neutronclient.
    
    This patch retains the OS::Quantum::XX namespace
    
    Fixes: bug #1197208
    
    Change-Id: Id48f9598ea1884132d411ad533770ae49494102b

commit 171cf95bb4c7ce5cad484815782d24b8b048e7be
Merge: f05134d 042d6c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 04:54:56 2013 +0000

    Merge "Don't assign "error" variable twice."

commit f05134d3163866bfede5a8a6aeb2d1aaee50d0fc
Merge: 9b53378 428230d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 03:06:12 2013 +0000

    Merge "Add the enabled property to the ceilometer alarm."

commit 9b53378e27c4a09f08d2e23d62fa725862949489
Merge: 5270ec8 8c4e0be
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 02:14:41 2013 +0000

    Merge "Returns text error when instance validation fails"

commit 428230d828b6df4124c4d33afa932baf612d1f43
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Aug 5 22:46:40 2013 +1000

    Add the enabled property to the ceilometer alarm.
    
    Change-Id: Ic0f96be74f36884868dad52b0bfe494406e031d9

commit 7601916b0c7df97ebbc2506176c587315a9d7f4c
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Tue Aug 6 17:07:26 2013 -0500

    Refactor useful nova functions for re-use.
    
    Refactor handy nova functions out of Instance and into a helper
    module. This allows alternate compute implementations to use
    this functionality without having to subclass.
    
    Change-Id: I529e2d1324981de7336264b5c697f1944668d013

commit c6e82c4a38d04ce257a1e10fada34f89c04d527f
Author: Christopher Armstrong <chris.armstrong@rackspace.com>
Date:   Mon Jul 22 16:35:13 2013 -0500

    Refactor InstanceGroup to use a nested stack
    
    Much of the code of InstanceGroup was able to be deleted in
    preference for using the native functionality of StackResource.
    InstanceGroup now generates a template and updates the nested
    stack when it needs to be created or resized.
    
    blueprint instance-group-nested-stack
    
    Fixes bug 1189278
    
    Change-Id: Ic08a55cad1ac34d69080c0ef2dae4877f1fefd29

commit ec5a4ad28419ca39acee656d79dadb694208921f
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Thu Jul 25 17:45:45 2013 +0800

    DB models and migration scripts for soft delete
    
    Only apply soft-delete on stack table for now. event, user_creds
    and raw_template records will remain unchanged after stack
    deletion, and those 'deleted' data can be cleaned up by the
    purge_delete command provided in follow patch.
    
    blueprint event-persistence
    
    Change-Id: I173cc6037615ff252968297981c36e51cb9d3fd3

commit 8c4e0be50cb001cdbeef25e49657c38a37afa43c
Author: Jianing YANG <jianingy@unitedstack.com>
Date:   Thu Jul 25 20:47:31 2013 +0800

    Returns text error when instance validation fails
    
    Since heat now is able to return parsable errors by middleware, we
    don't need to return jsonfied error strings here.
    
    Fixes Bug 1204582
    
    Change-Id: Id3d68b9996ad67df0e25c6db5754f73bfa1e8830

commit 5270ec8d9f95b2bf7e91ef7e169f67988db1a54e
Merge: d1b0f14 e4d6387
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 6 08:51:20 2013 +0000

    Merge "Fix test cases pass dict as template object directly."

commit d1b0f146d29fb8a7b0d9ce6ca6031bab4f660e6e
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon Aug 5 19:58:29 2013 -0700

    Add Babel missing requirement
    
    Babel is required by heat.openstack.common.gettextutils but was only in
    test-requirements.txt.
    
    Fixes bug #1208673
    
    Change-Id: Iaffcbc861e64caa37d64335f0fb6e568672ffc52

commit e4d6387eeecd24934384046147177261a956e666
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Mon Aug 5 11:34:17 2013 +0800

    Fix test cases pass dict as template object directly.
    
    Pass an actual Template object instead of a dictionary to Parameters
    
    Implements blueprint hot-parameters
    
    Change-Id: I2c101ca3eaeb918b093b49069842c0d5c349ffc8

commit a2a4b9775a19eebc7cbb144b8d06391a01f05f4e
Merge: 179b2ad 58702cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 6 00:23:34 2013 +0000

    Merge "Rename: VALUES to ALLOWED_VALUES, PATTERN to ALLOWED_PATTERN"

commit 179b2ad906b2ddc34183d5501aa8ec3fa978b3d0
Merge: 6a4f8a5 a4f6f9e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 6 00:23:33 2013 +0000

    Merge "Change token name from context."

commit 6a4f8a5ee97fc4d2eb7e167831906f3ee25a8dde
Merge: c1342fc d0765af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 5 21:52:13 2013 +0000

    Merge "Small tweaks to recreation of remote errors"

commit c1342fc4a8cb956b51d080545fd4e8e892359522
Merge: a45885a 715e5d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 5 19:47:09 2013 +0000

    Merge "Revert "Replace part_handler.py with write-files cloudinit mechanism""

commit 042d6c17d92432acf8325612dd173b896034a127
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Mon Aug 5 13:56:42 2013 -0500

    Don't assign "error" variable twice.
    
    Fixes bug #1208567
    
    Change-Id: Iaf22f68935d833d749615f998f402fe997e8e029

commit a45885a8acac31181c16c62d9eccecdf1b441338
Merge: 069f6e2 7320374
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 5 18:37:37 2013 +0000

    Merge "Include the resource and action in ResourceFailure exceptions"

commit 069f6e2d56b7ef81fccd20f35d8db55ec1553676
Merge: a0ada72 1aabe66
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 5 18:37:30 2013 +0000

    Merge "Unit tests: Don't raise ResourceFailure directly"

commit a0ada7226cc5619ba271b87e0f539f43bcb19e8f
Merge: 255d65e 1f6680c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 5 18:37:23 2013 +0000

    Merge "unit tests: Add a handle_delete method to GenericResource"

commit a4f6f9ea066613fd4b907dcd50baa2c27f971cf4
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Thu Jul 25 14:04:06 2013 -0500

    Change token name from context.
    
    Remove password auth from pyrax to conform with
    the changes going through the engine regarding
    not using a password. Previous commit was an
    incorrect branch with a bug.
    
    blueprint pyrax-token-auth
    
    Change-Id: I47cd00199133b88a2343b12c847635c726452629

commit 715e5d4f51a3dc38f08c0c3ce65d6a2e2247981a
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Aug 1 18:05:05 2013 -0700

    Revert "Replace part_handler.py with write-files cloudinit mechanism"
    
    Ubuntu has 0.6 of cloudinit, and write-files doesn't work on that
    distro.  Ubuntu does not intend to update cloudinit in their LTS release
    to 0.7.
    
    This reverts commit 621f5bfdbab46498b37cdc4865afa57e0f0498e0.
    Fixes: Bug #1207088
    
    Change-Id: If80863883afee28bdde6dd506826ec5710cc0308

commit 255d65ebd0be1fdf3e40b41f4f916a43de354e6a
Merge: 56fff5f 6df4cf8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 5 16:48:34 2013 +0000

    Merge "Rackspace: Don't raise ResourceFailure exceptions"

commit 56fff5fcd4dca0c9fc2632a3785a18084a39b157
Merge: 3be60e4 9f58796
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 5 16:39:46 2013 +0000

    Merge "Resource: Clean up exception handling and error messages"

commit 58702cfb01b2b73dad52103f0d00ae69865e974f
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Thu Aug 1 11:38:34 2013 +0800

    Rename: VALUES to ALLOWED_VALUES, PATTERN to ALLOWED_PATTERN
    
    Rename VALUES to ALLOWED_VALUES, PATTERN to ALLOWED_PATTERN in
    parameters and modify related references in other modules
    
    Implements blueprint hot-parameters
    
    Change-Id: Iad018f6a9fc1166aa2c5d94720faf997dc7e98a3

commit 3be60e4e8779a4f48932a27cfe8cf0fda017ef84
Merge: c0122aa c5900a4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 5 09:58:33 2013 +0000

    Merge "Remove support for eventlet 0.9.16"

commit c0122aabd3ab03cec533fd98410016610362b08e
Merge: 9004239 8ede761
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 5 01:27:32 2013 +0000

    Merge "Make Volumes work with the default AvailabilityZone"

commit c5900a42358c3361b19eb5995532964f1963787b
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Sun Aug 4 17:49:40 2013 +0200

    Remove support for eventlet 0.9.16
    
    We require 0.12.0 or newer, so 0.9.16 compatibility code
    is no longer needed.
    
    Change-Id: Idda955b64ce625ea30cc18366df01cc024cf26d1

commit d0765af7c8b17d48b2fe3c70e87383af4bd0c5c9
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Tue Jul 23 23:59:32 2013 +0000

    Small tweaks to recreation of remote errors
    
    The patch adds heat common exceptions to the list of trusted exceptions
    that can be re-spawned across RPC calls (this is the default behavior
    for all OS components). The patch adds the corresponding package to the
    declaration of the allowed_rpc_exception_modules as well as to the conf
    sample.
    
    Change-Id: Ib89d0bd4dd8f5240a9f3e973b8a04d0a5bfe2193

commit 9004239b9ffc7d1ef6ae3393a8d500e1d822af4a
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Thu Jul 18 00:49:49 2013 +0000

    Enable localizable REST API responses via the Accept-Language header
    
    Add support for doing language resolution for a request, based on the
    Accept-Language HTTP header. Using the lazy gettext functionality, from
    oslo gettextutils, it is possible to use the resolved language to
    translate exception messages to the user requested language and
    return that translation from the API.
    
    The patch removes individually imported _() so they don't replace the
    one installed service-wide.
    
    Also, it adds the ability to fully re-create a remote error
    with the same kwargs with which it was originally created, so that we
    can translate it and show it to the user.
    
    Partially implements bp user-locale-api.
    
    Change-Id: I63edc8463836bfff257daa8a2c66ed5d3a444254

commit 7320374a1971f33586e01b8761f78fa1820bce7b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 2 14:48:54 2013 +0200

    Include the resource and action in ResourceFailure exceptions
    
    An update operation performs 3 different kinds of actions on resources
    (update, create and delete), and we may want to handle failures differently
    depending on the action.
    
    Change-Id: Icf60a1aea882251150a1507183cf2d23da92675f

commit 1aabe666f55501e8867d4aaf4118d151e57c1658
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 2 18:58:00 2013 +0200

    Unit tests: Don't raise ResourceFailure directly
    
    It's meant to be a wrapper around other exceptions that's invoked by
    top-level resource operations; don't use it as an all-purpose exception.
    
    Change-Id: I1e0376a4a00fc3f1114b9bc76bbb1d5d0d98b166

commit 1f6680c13c6a651211b0ccea2caae0bcd134f5dc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Aug 1 15:26:38 2013 +0200

    unit tests: Add a handle_delete method to GenericResource
    
    This allows us to stub it in unit tests.
    
    Change-Id: I9f8ec45e080efb481676be24541a75c16422a765

commit 6df4cf826b008b4d074dc80987934023ce445bae
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 2 18:55:30 2013 +0200

    Rackspace: Don't raise ResourceFailure exceptions
    
    ResourceFailure is meant to be a wrapper around other exceptions that's
    invoked by top-level resource operations; don't use it as an all-purpose
    exception.
    
    Change-Id: Ie15cad32ee31beca9b0f7e9a9473ced9956a2e3b

commit 0af1565a5eefc2f040e955c1654518c3367758c1
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Tue Jul 23 20:32:51 2013 +0000

    Sync gettextutils from oslo
    
    The oslo changes necessary for delayed translation were refactored in
    oslo. This patch set brings in the refactored changes, implemented
    under the same change-id mentioned below.
    
    Partially implements bp user-locale-api
    
    Change-Id: I27640a3c8b255be51bc6396d238098bd25af61ec

commit 9f58796ae6abe525ef71fd28e06a95d8e4528c60
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 2 15:33:07 2013 +0200

    Resource: Clean up exception handling and error messages
    
    Change-Id: Ibd93e8b22bca708ced8ed8c29760fef73a649255

commit bd380aa2969c0ed6361c72a2687d955066df3dd2
Merge: d5cb9f8 4d3f671
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 2 09:22:36 2013 +0000

    Merge "Rename rackspace server ImageName, Flavor, UserData."

commit 62fe3126cf5927d4e4744835fbc273189cde6d0d
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Fri Jul 19 23:04:14 2013 +0200

    Add help option to Config Settings
    
    This way it is possible to generate the config
    files from the used config values automatically
    (like done e.g. in other OpenStack modules)
    
    Change-Id: I2683743330a8d3589637d967e16b5ba130bd45e1

commit d5cb9f8561ca93b7d7cbe9c21a813d002676cbf0
Merge: 5ebdb85 af68b61
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 2 03:26:34 2013 +0000

    Merge "Allow the Ceilometer Alarm to be used with cfn-push-stats"

commit 5ebdb852365dc7290fe3ddae1cea53ed54c7ac6a
Merge: bd62c51 31e53d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 2 03:26:27 2013 +0000

    Merge "Add the AutoScalingGroupName to the server Tags"

commit 4d3f6713301a3885cc4daf8c7a8b52672f3842cc
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Jul 29 09:23:54 2013 +1200

    Rename rackspace server ImageName, Flavor, UserData.
    
    Justifications for each rename are as follows:
    - ImageName -> image: the Nova API uses imageRef, however heat does
      a lookup from image name to id, so 'image' covers either name or id.
    - Flavor -> flavor: the Nova API uses flavorRef, but in the future heat
      should be able to do a lookup on the flavor name as well, so calling the
      attribute 'flavor' will API future-proof that change.
    - UserData -> user_data: maps directly to Nova API
    
    Change-Id: I1327f7b33d744908714dfb7a4caeb6ec306196e7

commit bd62c511629fd16a7b3b5b8428c3830916ba7719
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Jul 29 10:51:23 2013 +1200

    Call cfn-create-aws-symlinks in rackspace servers.
    
    This will also be required for arch, gentoo and opensuse
    when the pip install prefix is known.
    
    Change-Id: If789c603c3677c88d30e018cf6ca71925bad9511

commit 89f9fd81584c96da19e0ef0cee227f6950f93bab
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Jul 30 10:56:52 2013 +1200

    Stop delete polling after status == DELETED.
    
    A rackspace server can be in status DELETED for some minutes
    until a 404 is raised. This change speeds the deletion of a stack
    by considering the resource deleted as soon as the status changes
    to DELETED.
    
    Change-Id: Id81d3099ef6b41b374973074b065b20c2acc9667

commit 8ede7612a0fcf56fbce2ac392812de51f2ccb878
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Aug 1 17:22:18 2013 +0200

    Make Volumes work with the default AvailabilityZone
    
    The most common way to specify an AvailabiltyZone for a volume is to grab
    it from the Instance it is going to be attached to:
    
        "AvailabilityZone" : {"Fn::GetAtt": ["WikiDatabase",
                                             "AvailabilityZone"]},
    
    But the first unit tests to check the value passed to Cinder for the AZ,
    introduced in 134b11ccd145f982b7173bc9a5d0f1bc3e8eef8c, just forced the
    value instead of obtaining it from the Instance.
    
    Add a unit test to check the common case, and fix the resulting error (an
    empty string is returned instead of None).
    
    Fixes bug #1207416
    
    Change-Id: I83ea2f3f0c417eb9e97abdf27a9eaffd441cb070

commit af68b6168c2748bb3ec8104aee84c12a4684162e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jul 31 21:24:26 2013 +1000

    Allow the Ceilometer Alarm to be used with cfn-push-stats
    
    This is for when:
    - Ceilometer does not support the desired custom metric
    - Easier migration to Ceilometer Alarms (reuse most of old templates)
    
    A watchrule is create within the Ceilometer alarm, but it is marked
    as belonging to Ceilometer. This is used in the follow situation:
    - So we can figure out that we don't need to run the watch periodic task
    - when we receive new sample data we can forward the data to Ceilometer
    
    blueprint watch-ceilometer
    Change-Id: I0d672e69a522a23158805d75378f4bfe631b4bf3

commit 31e53d4fe785825d389368a039bd78d14eb72bf6
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jul 31 21:28:46 2013 +1000

    Add the AutoScalingGroupName to the server Tags
    
    Then use that to find the correct watch rule.
    
    blueprint watch-ceilometer
    Change-Id: I11f1556c1a55a06e1bf47e0baa156e0765f711ce

commit e6ec146fcfe4623269a952bb7ec532c9ab79329d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jul 31 16:11:15 2013 +1000

    Don't use a static uuid for the stack_id in ceilometer_alarm
    
    This just not necessary and is evil.
    
    Change-Id: Ib0fbaba7f709a7aaaac987913d44e9c8481c2795

commit 1e496dd7106467888e7307e6bbe3a793e1dfa91a
Merge: 52729d2 d5ca1c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 1 07:11:34 2013 +0000

    Merge "Rackspace database resource output is null"

commit 52729d2d0ca03e19cb0c96fd21e56238d4eb4348
Merge: cd238d4 fa4f538
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 1 07:11:27 2013 +0000

    Merge "Use dummy_context() for rackspace server test"

commit cd238d4bd96acf1b68f914ee3bb0da260a533c8f
Merge: d9392ac adee53a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 1 00:34:15 2013 +0000

    Merge "Use subsections in resource doc generation."

commit d9392ac9fd17702baa4b4c5c1c6fcac7ff6ae802
Merge: c85d0fd 2dba517
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 1 00:23:11 2013 +0000

    Merge "Remove password auth from pyrax"

commit c85d0fd44e9b1c494f3e8ae8c377e3c294982f53
Merge: 193db59 11c6c3b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 17:42:22 2013 +0000

    Merge "Fix for bad content inside Resources element"

commit 193db59fd87deb152de4e5201f5fa9c66e9c5d3e
Merge: f42b387 fba9a32
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 16:57:22 2013 +0000

    Merge "Clean up the attributes module"

commit 2dba51717a096313ae7b4be770a4301d7770fad0
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Thu Jul 25 14:04:06 2013 -0500

    Remove password auth from pyrax
    
    Remove password auth from pyrax to conform with
    the changes going through the engine regarding
    not using a password.
    
    blueprint pyrax-token-auth
    Change-Id: I4ecc43d138f7cd71d41a7a3cd8ee29a821065383

commit f42b3873ae0d9cb45de9c20875d693be528cb4c5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jul 31 15:42:21 2013 +1000

    Move the random_name() function from loadbalancer to utils
    
    (handy to make a random stack_name)
    
    Change-Id: I79055e2eba7aa2dd9ebcc09fbe4de87fe4483df5

commit fba9a329a62d28ee8696847500387d318cad45bb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 31 13:04:47 2013 +0200

    Clean up the attributes module
    
    Get rid of a lot of boilerplate and dead code.
    
    Change-Id: I3d7c1b0fc1e3754335d05bfc2e1a8e3e6c88ca8c

commit 0c366c692962aeecf826d58149d93caaa07e1c56
Merge: a2be265 161cb2e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 09:45:12 2013 +0000

    Merge "Assign rackspace server name from physical_resource_name."

commit a2be265894289bd711a99d099e2a95940fb6da70
Merge: 1c2dfee f28df6a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 09:43:31 2013 +0000

    Merge "Support any distribution without UserData/MetaData"

commit 1c2dfee691125492a0433ec045a6232ce4983434
Merge: 8fbcef2 ae38d45
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 07:39:16 2013 +0000

    Merge "Replace rackspace PublicKey property with key_name."

commit 8fbcef2475929d212ae3b83de9703f512a636a97
Merge: a16862b 621f5bf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 06:14:59 2013 +0000

    Merge "Replace part_handler.py with write-files cloudinit mechanism"

commit a16862b3ccdeb8eb7861431f006da41a4e387f6b
Merge: 27fc54b 8d354e6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 02:03:44 2013 +0000

    Merge "Tolerate an actual boolean for NoEcho."

commit fa4f53800e3ef58ebec731d872748aeb005b0f46
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Jul 29 09:00:48 2013 +1200

    Use dummy_context() for rackspace server test
    
    Change-Id: I0576b345b85cf9ef7558f84a7df16c8d187453c1

commit 161cb2e6940e5a05b99a7e836bca2debc71da2a9
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Jul 29 08:43:17 2013 +1200

    Assign rackspace server name from physical_resource_name.
    
    The default implementation of physical_resource_name() assigns a name
    which includes some context and randomness.
    
    physical_resource_name() is overridden to optionally allow the 'name'
    property to specify the physical name. The same technique is used in
    OS::Swift::Container, and 'name' matches the property in the underlying
    Nova API.
    
    Change-Id: I5769513a4461d5067dca516d0f03e02bb444f379

commit ae38d4583a4ba5e2f509a10e4e403e433e10a17e
Author: Steve Baker <sbaker@redhat.com>
Date:   Sat Jul 27 16:06:44 2013 +1200

    Replace rackspace PublicKey property with key_name.
    
    This fetches a keypair that is registered with nova and
    uses the public key, instead of having to specify the entire
    public key as a launch parameter.
    
    Tested to work on instances launched in DFW.
    
    This shares the keypair lookup method with AWS::EC2::Instance but
    adopts the property name of the underlying nova API. This property name
    will align with the yet-to-be-written OS::Nova::Server.
    
    Change-Id: I2dceb93a4544e5f99d246233f240fe99667efadf

commit 8d354e6c02b44720d185ed4d16d86b73fb649c33
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Jul 29 12:54:24 2013 +1200

    Tolerate an actual boolean for NoEcho.
    
    Change-Id: Icb0242b6e3e926f6ba27946c8491eacf204d70a8

commit 621f5bfdbab46498b37cdc4865afa57e0f0498e0
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Jul 29 18:18:19 2013 -0700

    Replace part_handler.py with write-files cloudinit mechanism
    
    part-handler.py was acting as a write-files mechanism.  Instead just
    use the write-files mechanism directly to avoid the complexities of
    the part-handler.
    
    blueprint: use-cloudinit-write
    Change-Id: I6e80c344743d6fd2fa9a49507de6d50e3d9eea73

commit 27fc54b8cebdaf19bbdadca125e4c98404970664
Merge: 2ffb44e 54c0626
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 30 18:59:36 2013 +0000

    Merge "Initialize resources to DELETE-COMPLETE if missing during stack delete"

commit d5ca1c7195ff66c54ba83c0b37fe51ae4a2cbcc5
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Tue Jul 30 13:52:17 2013 -0500

    Rackspace database resource output is null
    
    This change is a small correction to my previous change that was
    already merged(bug #1204601). Below given code snippets show the
    one line code change
    (Please note the change in return statement in below code)
    
    code before this change:
            for link in dbinstance.links:
                if link['rel'] == 'self':
                    return dbinstance.links[0]['href']
    
    code with this change:
            for link in dbinstance.links:
                if link['rel'] == 'self':
                    return link['href']
    
    Fixes Bug #1204601
    
    Change-Id: Ia81722eb3877e15e1c472e94ed845f3425949b68

commit 11c6c3b7d77fb5bef6cdefb3b21dc966314c3692
Author: Davanum Srinivas <dims@linux.vnet.ibm.com>
Date:   Tue Jul 23 23:14:16 2013 -0400

    Fix for bad content inside Resources element
    
    In validate_template check if we have a dict before we try to
    get 'Type'. We also need to check the response back from
    validate_template to see if there are any 'Error'(s) and present
    that back to the user.
    
    Fixes LP# 1204157
    
    Change-Id: I0f636a6a84f6afc9a0aff3089e2bd13a8f88a470

commit 54c0626f388497bed4342a26e728f1e34dffeca0
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Fri Jul 26 11:18:23 2013 -0500

    Initialize resources to DELETE-COMPLETE if missing during stack delete
    
    If the parent stack is being deleted and a given resource cannot be found in
    the data store, initialize its state to DELETE:COMPLETE instead of
    INIT:COMPLETE.
    
    fixes bug 1204268
    
    Change-Id: I5074d63928c3b39fe6ad85dc6af1d02db777acc8

commit 2ffb44e0aaffe876deaabed408c2a823151c8641
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Mon Jul 29 17:19:50 2013 -0500

    Rackspace database resource output is null
    
    current implementation of rackspace database resource
    _resolve_attribute method assumes that clouddatabase object's
    hostname and href are set to correct values and just returns
    them, but that assumption is not correct. With this change,
    hostname/href is retrived if it was not set already.
    
    Fixes Bug #1204601
    
    Change-Id: Ifca44237e20210b5ff1fc1b28f1f8408f5672ae4

commit 58f829039e3a15fa70636a0257f090cf227ac57b
Merge: 0d1b557 c1be126
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 29 12:41:10 2013 +0000

    Merge "Functions documentation cleanup."

commit 0d1b557458d9b33a180239227f458afb87cf1847
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon Jul 15 11:13:16 2013 -0700

    Clarify text in heat/tests/templates/README
    
    Fixing punctuation and re-wording to make the meaning of some sentences
    more clear.
    
    Change-Id: I3fad879e4d3c60bc0a04bc67d86d4d9866bbdaaf

commit 61b0ac47546c00218d6b0bd33f863401fdd72b08
Merge: 7e3ab63 48fe2f0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 29 00:23:20 2013 +0000

    Merge "Add rest endpoints for resource template generation."

commit 7e3ab63062e4d6a62a439e11b08beee9ade1b98c
Merge: 37f67d7 ae371a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 29 00:23:13 2013 +0000

    Merge "Add Cloud Server support for RHEL and CentOS."

commit 37f67d73c28e441b8996a5ee57aa2f9cc4e538b8
Merge: 16d1111 06807cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 29 00:13:10 2013 +0000

    Merge "Print before exiting"

commit 16d111150143c430bbd400338cbd95f71f24b9f6
Merge: 862a43e 69715eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 29 00:04:41 2013 +0000

    Merge "Allow template resource use outside of Environment"

commit 862a43e7c7cb1e1252b027774efaacda10411cb9
Merge: 87e02d7 7a88d68
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 29 00:04:39 2013 +0000

    Merge "Add a Ceilometer alarm resource"

commit adee53a2ee041381511b31163b4a53e7665e1420
Author: Steve Baker <sbaker@redhat.com>
Date:   Sat Jul 27 11:40:50 2013 +1200

    Use subsections in resource doc generation.
    
    This allows any part of the resource type documentation
    to be hyperlinked to.
    
    Properties and attributes have also been moved above the syntax
    examples.
    
    Change-Id: Ie0fa2a1134be283a6c99ac2effcc869304d28f09

commit c1be1264b9e84b64147ebc6da3e3fdc0b92acc30
Author: Steve Baker <sbaker@redhat.com>
Date:   Sat Jul 27 11:37:32 2013 +1200

    Functions documentation cleanup.
    
    - Switched to definition lists for parameters to be consistent
      with generated resource docs
    - Make consistent the layout of literal blocks and returns
    - Other minor grammatical and layout fixes
    
    Change-Id: I62eb179ce2a20024d2195cc7eb88e2e79bd4ae68

commit 06807cb5b8bfd8be9ed0b6617042b62f2d93840a
Author: Davanum Srinivas <dims@linux.vnet.ibm.com>
Date:   Fri Jul 26 07:53:54 2013 -0400

    Print before exiting
    
    Remove "break" as it is unreachable. Move the logging statement
    to before we exit as well.
    
    Change-Id: I8a5c3e8fd2cf0532e15cc7eb9920a2ca7428b28f

commit ae371a32720758ddbb8cd7b3dc663ea2985a25d4
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Fri Jul 26 14:31:12 2013 -0500

    Add Cloud Server support for RHEL and CentOS.
    
    Fixes bug #1205465
    
    Change-Id: Iebe182680a3504eb6c918421d1433475bb3da8c5

commit f28df6ad16bea796bea5713fa3368961f9a1749d
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Wed Jul 24 15:07:41 2013 -0500

    Support any distribution without UserData/MetaData
    
    A template without UserData or MetaData sections should work with any
    distribution, regardless of whether or not a setup script exists for
    it in the Cloud Servers resource. The setup script only exists so that
    the UserData and MetaData sections will configure the server.
    
    Bug 1204650
    
    Change-Id: Ie795ff63a5a15916c67d96782ea01d604d4768b0

commit 69715eb930814270c75e608dae4d3d1d010a41b0
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Wed Jul 10 13:19:32 2013 -0500

    Allow template resource use outside of Environment
    
    In addition to using TemplateResource as a means to override another Resource
    implementation, this allows template authors to specify a template url
    as the Type of resource directly. This allows a user to define new Resource
    implementations in addition to overriding existing ones via Environments.
    
    implements blueprint provider-resource
    
    Change-Id: I11cf94dc062fcce0e4ff08765696447fc2411a7f

commit 48fe2f04baba57c0e6856c30f050eb83cacc6f2b
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Fri Jul 12 09:56:07 2013 -0500

    Add rest endpoints for resource template generation.
    
    Add api endpoints for generating a template based
    on a resource implementation.
    
    blueprint resource-template
    
    Change-Id: Iebebad70befd1df6cd8989538cbb61350a17bc23

commit 7a88d687e86b0afe9ef0065edc363884b115a75b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jul 26 16:13:25 2013 +1000

    Add a Ceilometer alarm resource
    
    Note: this gets the signed url from the resources capable of getting
    signals by calling Fn::GetAtt('AlarmUrl')
    
    blueprint watch-ceilometer
    Change-Id: If8822f7c9bfc2113b6ee57e1faff2ab4f8ff3b16

commit 87e02d79b8023334407b26dc725607c52fc613d0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jul 26 12:34:09 2013 +1000

    Fix a timing sensive cloudwatch testcase
    
    This was leaving a watchrule in the db and causing
    a test case in test_engine_service.py to fail.
    Also cleanup the created stacks.
    
    Change-Id: If8451291b4f17c797b72fd3ab51793d51c2c97ad

commit e1d250d183df52e6abb223a8d2d71de210420e29
Merge: 55dd760 4af4c71
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 26 02:13:33 2013 +0000

    Merge "Auto-document all resource types."

commit 55dd7605f43674728f7a07872d723fa1aca3b4e9
Merge: bb1302e ad94507
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 26 02:00:25 2013 +0000

    Merge "Sphinx extension to generate resource documentation."

commit bb1302e3400bd6a2020364f846981dd06165d9e2
Merge: 07793f1 28c93ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 26 01:18:47 2013 +0000

    Merge "Enable service validate-template for hot template"

commit 07793f13a6f2e2a8941921fe8ac6737e8ce28435
Merge: cd999a9 394f847
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 25 23:05:13 2013 +0000

    Merge "Fix cloud_watch delete when the watchrule is not found."

commit cd999a9856ff1d358407a210c4d0db38542c908f
Merge: e6e0dc5 850a41e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 25 23:05:06 2013 +0000

    Merge "Skip RSA generation during tests"

commit 4af4c719a87731c61757adee8a28e83f8aee95f8
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Jul 26 09:04:12 2013 +1200

    Auto-document all resource types.
    
    There are separate pages for OpenStack, AWS and Rackspace resources.
    
    Currently the following sources are used for resource type documentation:
    - the docstring for the resource class
    - properties_schema
    - attributes_schema
    
    Change-Id: I901d227e8bc2a7209f216b57653da77a4f500e47

commit ad945070a257cde669e5542ecbb48d9fbd0ff32a
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Jul 26 08:52:13 2013 +1200

    Sphinx extension to generate resource documentation.
    
    Implements a resourcepages directive which generates resource type
    documentation for any type that matches the specified type prefix.
    
    For example:
    .. resourcepages:: OS::
    
    Implements blueprint generate-resource-docs
    
    Change-Id: I3b2c94a766686e17e2bdbe8be27657decd65bb3e

commit e6e0dc5b61162531d8e4f8bcb21fc2dfa3d7e24e
Merge: 91f013a 096c08c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 25 15:49:51 2013 +0000

    Merge "Always convert AllowedValues to a list"

commit 28c93efda596ca1dd5ab407f7cbb0675dc47f2ef
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Wed Jul 24 13:48:02 2013 +0800

    Enable service validate-template for hot template
    
    Get `Resources' and `Description' for hot or cfn template instead of
    the raw one.
    
    Change-Id: I54ac8a9905634529b641fe322eee4c10e587bac3
    Fixes: bug #1204061

commit 91f013a003b02e8ae022c17bc3087d2a33ec39ed
Merge: 4e6f4cc c89c96f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 25 12:36:58 2013 +0000

    Merge "Teach ScalingPolicy and Restarter to create signed urls"

commit 850a41ec05b1bbc4adcdb90edaa1501d76d403ef
Author: Thomas Herve <th@rackspace.com>
Date:   Thu Jul 25 13:19:46 2013 +0200

    Skip RSA generation during tests
    
    Use a static key in Rackspace cloud server tests, to remove the overhead
    of the SSH keys generation.
    
    Change-Id: Ief14f034fb86e42ecbb801b9d4f82ff27fb35588

commit 4e6f4cc146730c78180a5e1506d5e5502f6cfa41
Merge: eba7ee7 13a3d7c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 25 11:03:44 2013 +0000

    Merge "Generate a template from a resource implementation."

commit eba7ee7f981360dcad87ab886f6bd2dba333a2f3
Merge: c19537f 3907572
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 25 10:29:02 2013 +0000

    Merge "Make the current alarms use the signal action"

commit c19537fb2d95a9d6d83c9832ea47dfdcf93326d2
Merge: 08e04e6 c8dae55
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 25 10:28:55 2013 +0000

    Merge "Add an API for passing a signal through to a resource"

commit 096c08cdc05f925aa995e424cd0b1ca8f5d18b77
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jul 25 11:33:41 2013 +0200

    Always convert AllowedValues to a list
    
    Passing e.g. a string as the AllowedValues list can appear to work, since
    str.__contains__() performs a substring match. It's better to fail fast, so
    convert AllowedValues to a list regardless of its initial type.
    
    Change-Id: I74783e6a7c1743ead3f086116dd3850afeb7a028

commit 08e04e6733e69080743521c1673c53a96ae42907
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 25 14:53:51 2013 +1000

    Add some docs for intrinsic functions.
    
    And start the template guide.
    
    DocImpact
    Change-Id: I4dc32dfc20b464e09b78f192b6f4931ce812fd4b

commit 394f847cf62af191bbda7e3505e402b680d059de
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 25 14:30:39 2013 +1000

    Fix cloud_watch delete when the watchrule is not found.
    
    Also start using mock instead of mox.
    
    Change-Id: Ia3baf510ffeafc73c42da7e2830819055c244c51

commit 49e2aa6e43c06dafb239c7044ece4a81048c7446
Merge: eade86a 50e177e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 25 00:59:13 2013 +0000

    Merge "Replace urllib2 with requests in urlfetch module"

commit c89c96fcf8d810d240cd99739f6fff3171011b39
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 23 22:55:43 2013 +1000

    Teach ScalingPolicy and Restarter to create signed urls
    
    This is so they will be able to support ceilometer webhooks
    
    blueprint watch-ceilometer
    Change-Id: I18b0dc22f95957a66f2287a7bd70613c8c8db3d6

commit 390757280c61fe0a6dfda4037ce4589838eea4cf
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jul 5 10:35:36 2013 +1000

    Make the current alarms use the signal action
    
    blueprint watch-ceilometer
    Change-Id: I7560650f207411ffaf14242bb74cdaf8acd0cf4b

commit c8dae557b3915cb1bd9dd108e99e984479cef4f3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 25 10:36:50 2013 +1000

    Add an API for passing a signal through to a resource
    
    Reuse the /waitcondition functionality to provide a
    /signal pathway.
    a signal could be a waitcondition or an alarm.
    
    blueprint watch-ceilometer
    Change-Id: Ia9da222b8072ee0dc65bf137e7d3eb7fa4d944f5

commit 13a3d7c5ce90af622e6f7dac49991308ca1fa1e2
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Fri Jul 12 09:56:07 2013 -0500

    Generate a template from a resource implementation.
    
    Using the properties and attributes schema in a
    specified resource, generate a template where
    all properties have been mapped as parameters,
    and all attributes have beeen mapped as outputs.
    
    blueprint resource-template
    
    Change-Id: I0f494f039e91daf482385f225f8551826cace485

commit eade86a674c49eb309c00f34f67bd62928ba0876
Merge: 7b4cf89 dc41655
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 24 18:15:16 2013 +0000

    Merge "Fix loguserdata output to file issue"

commit 7b4cf8980102d841ee446f526f6e752c39548941
Merge: 6ab8e1b 929c9ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 24 07:58:28 2013 +0000

    Merge "HOT parameter validation model translation"

commit 6ab8e1b6b619230c7c59130ae3beb24ba9aefb6d
Author: Jianing YANG <jianingy@unitedstack.com>
Date:   Fri Jul 19 22:08:41 2013 +0800

    remove remote_error and corresponding try...catches.
    
    Implements blueprint exception-formatting
    
    Change-Id: I94306e2b70c7fa77d1b5a1177fede88262f8bbc9

commit 50e177e3c9c207ff832aac6adcafcf81a181a145
Author: Davanum Srinivas <dims@linux.vnet.ibm.com>
Date:   Tue Jul 23 22:08:20 2013 -0400

    Replace urllib2 with requests in urlfetch module
    
    simple replacement of urllib2.urlopen with requests.get
    
    Fixes LP# 1201534
    
    Change-Id: Ia0a2ed3b092e22246339a42f432086dd05f788fa

commit 929c9edd5c46f2c9cb7c48bc8b2b9b0ee64df594
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Tue Jul 23 08:47:38 2013 +0800

    HOT parameter validation model translation
    
    Translate hot parameters into heat parameter model.
    
    Change-Id: I6733be7c13e2e9fdbed27d5c21044fb5f457ed17
    Implements: blueprint hot-parameters

commit 07a284058551d99348893eeec2d50aea4b8f453b
Merge: c5ab336 f77195c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 24 00:40:28 2013 +0000

    Merge "Only use a token for openstack client operations."

commit c5ab33614b465be28d823072ab1fc897313ae6f3
Author: Jianing YANG <jianingy@unitedstack.com>
Date:   Thu Jul 11 23:17:52 2013 +0800

    make heat-api return a parsable error
    
    add a wsgi middleware (faultwrap) that catches exceptions
    and transform those exceptions into a parsable format
    according to 'Content-Type' of the request.
    
    Fixes bug 1158598
    Implements blueprint exception-formatting
    
    Change-Id: Iacdb8cc119b250ff1e39c99b7a7f66fd4c35e7d9

commit fe1557d60d5cf97c0e035b056e40cba773a0eca1
Merge: 044128b 5056908
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 23 12:35:33 2013 +0000

    Merge "api : Implement OnFailure option to cfn API CreateStack call"

commit dc416551760b042ede6f844537c394316743073d
Author: guohliu <guohliu@cn.ibm.com>
Date:   Tue Jul 23 18:08:03 2013 +0800

    Fix loguserdata output to file issue
    
    Fixes bug #1191685
    
    Change-Id: I2a02b490e45c3cb838243b9dad62cc52b609b336

commit 044128b64fcdcb6a7f9cc8ea8de9218c9a7ded46
Merge: 13fa9bf e3caef4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 23 09:43:19 2013 +0000

    Merge "Use new style classes"

commit 13fa9bfa9fecbfc9ed2f69b8348d1a91f5dce5e3
Merge: 5224fcd 2684f2b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 23 05:00:29 2013 +0000

    Merge "Add resource for Rackspace Cloud Servers."

commit e3caef4452ba85214abe3ac5c1fff7992cbc2ef1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 23 11:26:05 2013 +1000

    Use new style classes
    
    Change a couple of old style classes into the newer styled ones.
    
    Change-Id: Ide3bbcd2d24f949a2a550fcc2210617f34c8cd0b

commit 5224fcd934582ab403dcbbe67c22878b66118403
Merge: 3d44c11 239c383
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 18:27:40 2013 +0000

    Merge "Add `default` attribute in hot parameter definition"

commit 3d44c11f45246c3d28ff8b9aaafae97ed4da96e0
Merge: 1bf9014 234a1f0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 18:20:58 2013 +0000

    Merge "Add missing Aapche 2.0 license headers (H102)"

commit 2684f2bb4cda1b1a23ce596fcdb476bb961ea3f8
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Mon Jul 22 11:00:51 2013 -0500

    Add resource for Rackspace Cloud Servers.
    
    Blueprint rackspace-cloud-servers-provider
    
    Change-Id: Ie6659e0e8b519180ce5973cc798c914b56a95426

commit 5056908945edb721b04713347b780dfa8e28a21a
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jul 5 12:25:50 2013 +0100

    api : Implement OnFailure option to cfn API CreateStack call
    
    blueprint createstack-onfailure
    
    Change-Id: I8466493fbeba2023916f2d92814c1cc8f2827e51

commit 1bf9014cffb17fc4a91845eb4da98715bbb41aa3
Merge: 6dbb8cd 44a1017
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 13:39:37 2013 +0000

    Merge "Migrate all tests to use dummy_context."

commit 6dbb8cdc654ce273aa15d3509ec7e76a6fb80005
Merge: 9f71ba3 07d1a9c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 09:30:12 2013 +0000

    Merge "Reset the the watch_rule.last_evaluated on start up"

commit 9f71ba3ab59c5a6a630b4ff85e6d67406511b6d3
Merge: 6abc70f d12ebfa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 09:28:05 2013 +0000

    Merge "Refactor the code in heat/tests/test_volume.py"

commit 6abc70fd1c2d58e93c64cc78ba616a6f5e01428c
Merge: ef32cfc cd7acb5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 09:21:14 2013 +0000

    Merge "Handle 'detaching' state of Volume"

commit ef32cfc83eab386f1619f0efb45d7647d8681cb3
Merge: b965380 919b377
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 06:54:50 2013 +0000

    Merge "Update openstack.common.config"

commit b965380be19d1d994563b86377b7ab01a61c6aba
Merge: f0b6b55 6bfd774
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 06:53:21 2013 +0000

    Merge "add docs from the heat wiki"

commit 239c38307b75d601c71cb676340c61aa2c43f1de
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Mon Jul 22 12:22:12 2013 +0800

    Add `default` attribute in hot parameter definition
    
    So `default' in hot is translated to `Default' in cfn
    
    Change-Id: Ifd50dbb993dd0cb177b0e16652c6ef17d12cd2e5
    Fixes: bug #1199311

commit d12ebfa7b2e8d9ca93c94574cdfbe94ba5ad603a
Author: Zhang Lei (Sneeze) <sneezezhang@cienet.com.cn>
Date:   Mon Jul 22 10:25:53 2013 +0800

    Refactor the code in heat/tests/test_volume.py
    
    The test code in heat/tests/test_volume.py has lots of
    duplicated code and logic.
    Extract them into common method and reuse the methods.
    
    Change-Id: I5053c53a3eebf5f43cddfb96ee63a1f4f8615e76

commit cd7acb5027e6e0c2e2bac80669f468ef95a1187b
Author: Zhang Lei (Sneeze) <sneezezhang@cienet.com.cn>
Date:   Mon Jul 22 10:08:06 2013 +0800

    Handle 'detaching' state of Volume
    
    When detaching volume, the state of volume changed from 'in-use'
    to 'detaching', and then from 'detaching' to 'available'.
    The code used to ignore 'detaching' state by assuming the volume
    has been detached when its state is not 'in-use' any more.
    Now we take care 'detaching' state and raise error if detaching
    failed.
    
    Fixes bug #1197747
    
    Change-Id: I555eea19409142ccb306c0cceaf7c55e71385bc6

commit f0b6b550d97464a6de2c15838475132dbbe022cd
Author: JUN JIE NAN <nanjj@cn.ibm.com>
Date:   Thu Jul 18 15:39:10 2013 +0800

    Reset state before resource recreation
    
    So the destroyed resource can be recreated, and HARestarted main logic
    resource destory and create can work.
    
    Change-Id: Id79988560e105c254d304e30d598427a2bbc5b26
    Fixes: bug #1202492

commit 4a95c06a16053f389605643d370b56c6ee9fbe3f
Merge: d108354 a26b1df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 00:52:44 2013 +0000

    Merge "Add a py33 tox environment"

commit f77195cb6876227b456920cd917a688409c11fdf
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Jul 5 16:08:13 2013 +1200

    Only use a token for openstack client operations.
    
    This uses the same techniques as horizon for getting client
    instances with an existing token.
    
    This change also fetches a new auth_token if the context has none,
    as will happen when the context is created from saved user_creds
    rather than a real request.
    
    While it appears that some code paths will result in an extra call to the
    keystone client, the actual calls to keystone will be less. This is
    because each client was making its own calls to keystone when
    authenticating with a username and password.
    
    Implements blueprint auth-token-only
    
    Change-Id: If6a63a5079464758f42d5d5e83dfffb196f4a7f6

commit 44a101737fec6e2a9648d35593a091cf8ce3b243
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Jul 17 11:18:39 2013 +1200

    Migrate all tests to use dummy_context.
    
    Change-Id: Idc00ccbd254aca2c64c1bcb376fe7a3aab4d1cb4

commit d108354e33ee7149b4cefef152779944bfb00c56
Merge: 46fd46e ce07ddb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 00:29:36 2013 +0000

    Merge "Configure standalone pipelines for cfn and cloudwatch."

commit 46fd46e3fa1ec110e5f0a7193bb3adb3921101f6
Merge: 5cafbd6 674dbb7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 00:28:24 2013 +0000

    Merge "Set role headers from ec2 authentication."

commit 5cafbd6d7c7a02a7bd825c917aa29fec9f9844d1
Merge: b3f4660 c8af819
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 00:28:18 2013 +0000

    Merge "Set tenant headers from ec2 authentication."

commit b3f466011a93e5871d124908c38a318b52b8d286
Merge: 4d7ab4c c3ecb29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 00:12:20 2013 +0000

    Merge "Only create the period watch task if there is a watch in the stack"

commit 4d7ab4cea040e8b3517a61b7744c015b38ee65a2
Merge: a19d3bc ef051aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 00:02:28 2013 +0000

    Merge "Wrap the watch rule start in a method"

commit 234a1f0f2e9133d610848da4e226dde7ae794388
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Fri Jul 19 23:09:14 2013 +0200

    Add missing Aapche 2.0 license headers (H102)
    
    Satisfy Hacking check of Hacking 0.6 or newer.
    
    Change-Id: I01d9b44c1681142ef91fd91f678e173239ae6c98

commit a26b1df477142a66097613859ad620d7c500ed9f
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Fri Jul 19 23:02:11 2013 +0200

    Add a py33 tox environment
    
    This way one can optionally run tests against Python 3.x
    
    Change-Id: I578cc6f2e933fbdc469dd14d23e9cf5b9f1d246f

commit a19d3bc7513e54114fa0b237d4ed7fcbb8ee4a67
Merge: 268a949 b02b826
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 19 08:32:34 2013 +0000

    Merge "Move url_for into heat_keystoneclient."

commit 268a949e3b893e8f1eb27fb26c45ff232ca4da36
Merge: 60a1f0c 808e34e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 19 08:24:10 2013 +0000

    Merge "Test utils dummy_context for tests that need one."

commit 07d1a9c90b2c96f231f9bd8fe6d59bfec8c1d22d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jul 19 16:06:20 2013 +1000

    Reset the the watch_rule.last_evaluated on start up
    
    This is so we don't fire off alarms when the engine has not been running.
    
    bug 1202552
    
    Change-Id: Ief258fd601b48e2495ac69091a942f23a019e92c

commit c3ecb29841629d03cc4a3c0242bfd229da598b56
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jul 17 12:46:59 2013 +1000

    Only create the period watch task if there is a watch in the stack
    
    This prevents unneccessary greentheads polling the db.
    
    bug 1202031
    Change-Id: I065955d03df543df40af285f87a7fd3dfa779413

commit ef051aa291d202bed7f778070fa6df12cb4188db
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jul 19 14:58:37 2013 +1000

    Wrap the watch rule start in a method
    
    This is the first step in making the watch task dependant on:
    1) whether we even have an alarm in the stack
    2) whether the alarm is a ceilometer alarm
    
    The test confirms the current behaviour, which is a periodic task
    is created whether or not a watch is in the stack.
    
    bug 1202031
    Change-Id: Iebb948f788270fca0dbef61a2e122fe3900d84b2

commit ce07ddb75982fdf48e62fb17f6b43ba13b2bae0f
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Jul 19 14:38:13 2013 +1200

    Configure standalone pipelines for cfn and cloudwatch.
    
    This allows waitconditions and cloud watch data to authenticate
    using just the ec2token middleware. Stacks have been successfully launched
    with a standalone heat onto an external grizzly openstack, including working
    waitconditions and watch data.
    
    This means that currently when in standalone mode, heat-cfn cannot
    authenticate since it defaults to auth strategy keystone (and it appears
    that auth strategy ec2 signing has not been implemented yet). This case
    is sufficiently obscure that it most likely won't affect anyone at this
    stage.
    
    Implements blueprint heat-standalone
    
    Change-Id: I7d096b11e70c234d0b2322c93bf5f4d4e6b01b4f

commit 674dbb70ee5f3dd3b0ba59e82aef45bd6a2d0b0f
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Jul 19 14:34:42 2013 +1200

    Set role headers from ec2 authentication.
    
    Without this roles are not available in the context when
    ec2token middleware is used on its own.
    
    Change-Id: I1214e44c588f547ee6f90f0f71a085f786e7ea7f

commit c8af819c7fc55c98c4b4871a44fa8b4d4964668e
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Jul 19 09:48:40 2013 +1200

    Set tenant headers from ec2 authentication.
    
    Without this, ec2token middleware on its own doesn't set enough
    headers to perform heat requests.
    
    Change-Id: I7a0867196741c0df222d491fb1bfbe203158032c

commit 919b3778084ddbae9db4902d5a01129f72c44bfc
Author: Émilien Macchi <emilien.macchi@enovance.com>
Date:   Wed Jul 10 16:01:00 2013 +0200

    Update openstack.common.config
    
    - Add generator.py from Oslo
    - Add notifier from Oslo
    - Add generator bash script used by other projects to generate configuration
    files
    - Update openstack-common.conf file
    
    The patch https://review.openstack.org/#/c/36493/ needs
    to be merged before this one. I'll rebase this patch and
    generate the heat configuration.
    
    Fix bug #1183275
    
    Change-Id: Id7f24874b7e3e07d06dcf14bc381b9d630f67fc8

commit 60a1f0c47122cec0601885095ccffbdc13e77f5b
Author: Thomas Herve <th@rackspace.com>
Date:   Tue Jul 16 11:12:04 2013 +0200

    Handle InstanceType change in Instance.handle_update
    
    Make a resize API call against Nova if the InstanceType of an Instance
    resource is change via a resource update.
    
    Implements: blueprint instance-resize-update-stack
    Change-Id: Ic4ee82edec842ee756b104a36dfef28bf3f89717

commit a37d2b44bf1196091b0558b270c134e68919bc12
Merge: 3e4e007 c148cbc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 18 09:44:41 2013 +0000

    Merge "Put pre-created resources in state INIT COMPLETE."

commit b02b8260831ee2ab8fed1ba22ab947a499e1a003
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Jul 17 14:30:58 2013 +1200

    Move url_for into heat_keystoneclient.
    
    This allows faking of this call, and removes one instance of
    accessing the encapsulated keystone client.
    
    Change-Id: Iad2a9aaad2e9f1dc3cbeb509c822a61427f12817

commit 808e34ee152a0ecb4c9c946fe1383986304cf59e
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Jul 17 11:09:02 2013 +1200

    Test utils dummy_context for tests that need one.
    
    Change-Id: I3c54ec76a4d2bfd03cf60b70c422bc6269af01c9

commit 3e4e007685177d803d5eb56bb321f5fe74516fe1
Merge: feeae7f f2ef092
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 18 01:06:15 2013 +0000

    Merge "Update oslo.notifier and always register options"

commit c148cbc8d85aa29d85f40925a3da840e216d0fb9
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Jul 10 15:05:53 2013 +1200

    Put pre-created resources in state INIT COMPLETE.
    
    Defines an INIT action, and make the resourse state
    INIT COMPLETE before they are first created.
    
    Calls to list resources will now include resource that have
    not been created yet. This change allows resource topologies
    to be displayed throughout the creation of the stack.
    
    Implements blueprint build-heat-graph
    
    Change-Id: I1d98ac21d44ff05183db38d49cbb3599e2812511

commit 6bfd774df842195969814201f6bf5dc8a1ec4797
Author: Jeff Sloyer <jbsloyer@us.ibm.com>
Date:   Tue Jul 16 14:36:06 2013 -0400

    add docs from the heat wiki
    
    updated index.rst to mimic the layout of the keystone docs
    updated the structure for troubleshooting
    ported howto guides from the heat wiki
    ported the troubleshooting page from the heat wiki
    updated the nav for the man pages and getting started
    added docs for a cfn template and hot template
    
    Change-Id: I14c1b0b6aa6ea3529c4de994851f7a798a3061bf

commit feeae7ff4fed7fe9c98c47752e1f01023b37d88f
Merge: d72b139 76e3cbe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 14:17:39 2013 +0000

    Merge "Make sure that Tags on the InstanceGroup get passed to nova"

commit d72b139b2f6b39b4d6173ff56175dda6ff533671
Merge: 48701ed c7f3135
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 14:05:53 2013 +0000

    Merge "Fix version and location of heat doc build"

commit 48701edea18675c1f284196769d079ed98ca63ec
Merge: ab07e06 1f1b66c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 10:06:37 2013 +0000

    Merge "Add a test for customizing AWS::EC2::Instance"

commit ab07e06fe6267503c70cb4d292e9a41377bf90b2
Merge: 30ddad1 89a648d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 06:00:30 2013 +0000

    Merge "Check missing parameters during stack create"

commit 30ddad1ddc2545f8ac5f3d991892d3ac12828cda
Merge: a1b919e 5b9d98f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 03:52:48 2013 +0000

    Merge "Add tests for resource-data delete bug."

commit a1b919e994deaa4e0418bd26cc69c69561e1c05c
Merge: d2dbee8 319d3e1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 03:52:40 2013 +0000

    Merge "Fix resource-data delete bug."

commit 1f1b66cbaeb1bb3d871cb8cb1ebbc3aa0487f2c8
Author: Christopher Armstrong <chris.armstrong@rackspace.com>
Date:   Tue Jul 16 19:57:55 2013 +0000

    Add a test for customizing AWS::EC2::Instance
    
    InstanceGroup explicitly supports "custom" versions of AWS::EC2::Instance
    (instead of directly using heat.engine.resources.instance.Instance)
    but there was no unit test for that feature. Here we add one.
    
    Change-Id: I490675c18734a61d27625ed3c76fb228e3fd1a9d

commit 5b9d98fb6fd1a0459474dad196b9f63c72ef6ee7
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Tue Jul 16 19:31:25 2013 -0500

    Add tests for resource-data delete bug.
    
    Fixes bug 1201974
    
    Change-Id: Id5fdfcde8541e83f68406c67250b815b35fbbf54

commit 319d3e158f0d92c0f3d1e20095db8db6f056365c
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Tue Jul 16 16:13:24 2013 -0500

    Fix resource-data delete bug.
    
    Bug 1201974.
    
    Change-Id: I6c4692df71dc7188c0a9caf0ca6c26b67b4e168f

commit c7f313551e52e0bf8d79c774c4831ed3973d843f
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jul 16 11:01:47 2013 -0400

    Fix version and location of heat doc build
    
    pbr injects version information as part of the build_sphinx command,
    so having it here is overkill.
    
    Change-Id: I1f89e068da3e47b94434cb71db87704f9665dea2

commit 89a648d7ad9d10634c93e3f1ff8a9a8c72dba572
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Tue Jul 16 23:24:16 2013 +0800

    Check missing parameters during stack create
    
    Add missing parameters checking logic to Parameter validation. It
    has to be optional, since template validation makes use of the same
    Parameter validation code.
    
    Fixes bug #1198670
    
    Change-Id: I4c85ebf496b19999e47cf3838e6ca160aa194f20

commit d2dbee8d850da830ac634de70bb540f2719ccc41
Merge: acdd5ee 637ff6e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 02:31:32 2013 +0000

    Merge "Test that Tags get converted into nova metadata"

commit acdd5eee2ccb723eefbc4558d0d5f5011624e65b
Merge: 560693f b3e3c16
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 02:24:34 2013 +0000

    Merge "Let git ignore pydev project description files"

commit 560693f295a6c77d2b4ebb1b1fef661acb1f7ad2
Merge: 95191f0 cae2ac2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 02:15:23 2013 +0000

    Merge "Don't reload haproxy and use ensureRunning=true"

commit cae2ac26e2652d4521614236285a550e3f115483
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 16 09:08:13 2013 +1000

    Don't reload haproxy and use ensureRunning=true
    
    the ensureRunning option results in cfn-hup doing a restart and the
    hook does a reload. these two options result in the failed state
    of haproxy.
    
    This patch rolls the two into "reload-or-restart", which is run from
    cron.
    
    bug 1201621
    Change-Id: Idb42b3915cb86c613876b67abf1c6999972e19e2

commit 95191f07f5a060f66b640bd3e7b5622c0a0db1b7
Merge: 73d07e2 be17d12
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 15 13:01:38 2013 +0000

    Merge "Align OpenStack client versions with project requirements."

commit 73d07e248f8635f4c3e180be1f192082382dec9e
Merge: d77d5a2 e85a80a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 15 12:58:53 2013 +0000

    Merge "Add resource_data table for free-form key/value data."

commit 76e3cbe79da9511c632716a69356c797c342a2dd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 15 11:10:03 2013 +1000

    Make sure that Tags on the InstanceGroup get passed to nova
    
    This is needed by the ceilometer alarmer.
    
    Change-Id: Ia6e744b7dfa9fab518050174bcff0dae50c95040

commit 637ff6ebed0042082a51e466b7a7fe3a4a2efe68
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 15 15:57:12 2013 +1000

    Test that Tags get converted into nova metadata
    
    Change-Id: Iac464174d3e9b71ce01d9d7ee05d64e790b2f398

commit be17d129a3cf3820032a42a84dbc636752030920
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Jul 15 16:15:57 2013 +1200

    Align OpenStack client versions with project requirements.
    
    This brings heat into line with the consensus on how to specify
    version range caps.
    
    Fixes bug: #1200214
    
    Change-Id: I14affc96c44f865fdd0516c1eb4eb59f1a808b82

commit d77d5a2efc1ea03eeed599b3eecc2e0d0646ea0b
Merge: 034d054 3b6e8d6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 15 00:16:46 2013 +0000

    Merge "Cleanup and make HACKING.rst DRYer"

commit 034d054ab90d635a7d1211a687890244b843b671
Merge: c6ace94 3bac114
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jul 14 23:22:24 2013 +0000

    Merge "Suggest the use of tripelO images"

commit 3b6e8d63e206fcc03da26efec9444558adb28d73
Author: Joe Gordon <joe.gordon0@gmail.com>
Date:   Fri Jul 12 17:08:32 2013 +0100

    Cleanup and make HACKING.rst DRYer
    
    Reference the OpenStack hacking guide in HACKING.rst and remove
    duplicate entries.  Add placeholder section for heat specific
    rules.  heat specific rules can be created using hacking's local check
    support.
    
    Change-Id: Ib6967ae769bd73857abb7ef89368c407c8b22053

commit c6ace9431aa1c59b316b6992d0e2cac32c270994
Merge: 446a8f8 7056f62
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jul 13 05:11:57 2013 +0000

    Merge "Create implicit depends from gateway to public subnet."

commit 446a8f85427ea9c2974c6b73afdcad8f8f411f5f
Merge: c2317f7 324475b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 12 18:30:33 2013 +0000

    Merge "Wait until quantum resources are deleted."

commit c2317f79673767a78fca5e46ab579e5d05d16c30
Merge: bfd82ea 3fa39dd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 12 05:42:31 2013 +0000

    Merge "avoid excessive database calls while loading events"

commit bfd82ea74251ac14b30271342d1dd962a34f6259
Merge: 58004ea db4bbad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 12 05:31:20 2013 +0000

    Merge "Rename part-handler.py to part_handler.py so it can be imported"

commit 58004ea75a3650f781fe88ee577e95d87abd480c
Merge: ed8819f d22b2dd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 12 04:40:29 2013 +0000

    Merge "engine : Allow loadbalancer resource to work with no key"

commit ed8819f6676ef0b15fd6230832e55d28fa64a18c
Merge: c1f57b4 5dc8e37
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 12 04:38:54 2013 +0000

    Merge "Add Rackspace cloud loadbalancer resource."

commit c1f57b437afa868baf7a49493109915f4134d8cc
Merge: 1a6e107 7c74d88
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 12 04:34:55 2013 +0000

    Merge "provide test for nested stack error path"

commit 1a6e107301569c0d7388e6535d067819f4e66272
Merge: 59c08ae fe4f2cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 12 04:13:25 2013 +0000

    Merge "Do not override FnGetAtt"

commit d22b2ddefd2740852664a65da986f4174fd66ead
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jul 5 19:56:10 2013 +0100

    engine : Allow loadbalancer resource to work with no key
    
    Fixes bug #1137526
    
    Change-Id: Ieff9c0b52633d45ac5164d966a362e50d5f499df

commit 7056f6216075726083a97ea6658b14e8c228aac7
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Jul 12 15:02:17 2013 +1200

    Create implicit depends from gateway to public subnet.
    
    Depend on any subnet in this template with the same network_id
    as this network_id, as the gateway implicitly creates a port
    on that subnet.
    
    Fixes bug: #1195599
    
    Change-Id: Ie850a82dce551d46341b1eef7f0208074b72453f

commit 324475bd2a63d9d36914fddfed6ad672d13f8ebf
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Jul 12 13:31:09 2013 +1200

    Wait until quantum resources are deleted.
    
    Races on delete have occured where a quantum resource cannot
    be deleted due to an associated resource delete being incomplete.
    
    Fixes bug: #1195596
    
    Change-Id: I52a358d05d30b9c50a771864d036156f00df67ab

commit 59c08aec20e373a32f4f4a2af6c4e75bfe1ae962
Merge: ca0437d d6b9e3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 11 23:30:33 2013 +0000

    Merge "Global disable scheduler _sleep instead of mocking."

commit ca0437d66533f2d09379b08d74e065eef74f26cc
Merge: ebaf02f fc47b7f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 11 23:26:11 2013 +0000

    Merge "Add length validation to properties of type LIST and MAP."

commit ebaf02f4871cce923cabaccdbe20471bc8f0023f
Merge: e8d186f 2e8513d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 11 22:14:03 2013 +0000

    Merge "Use new environment and parameters on stack update."

commit e8d186f20cf4e8cc9490e47e56f2abe146826a63
Merge: 535c441 4a42f6f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 11 22:14:01 2013 +0000

    Merge "Handle conversion of MAP properties to JSON params"

commit fe4f2cf3c492ad56e5bf0a5296285842a3b269c3
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Tue Jul 9 13:56:16 2013 -0500

    Do not override FnGetAtt
    
    FnGetAtt is handled by the parent classes so no need to override
    
    contributes to blueprint provider-resource
    
    Change-Id: I3cb1bfc353fedf33336151f3ebc4d283330336a0

commit e85a80a8ad8b333cdf51965a92764dcd29323d1d
Author: Jason Dunsmore <jasondunsmore@gmail.com>
Date:   Thu Jul 11 16:26:06 2013 -0500

    Add resource_data table for free-form key/value data.
    
    This can be used to store arbitrary resource-specific data, such as
    SSH keys.
    
    Blueprint resource-data.
    
    Change-Id: Ic148bd131f528a676904c8f37fd6deb936917152

commit 7c74d880a68eca8a29eaf397cf873b8c2201b1b6
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Fri Jul 5 00:45:01 2013 +0800

    provide test for nested stack error path
    
    Fixes bug #1195310
    
    Change-Id: I3c77287c92068b305f61fa4cbe4846aa56ab50e0

commit 5dc8e37ade2d4d732526d243d576df105632bc46
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Wed Jul 3 16:41:26 2013 -0500

    Add Rackspace cloud loadbalancer resource.
    
    Add a resource implementation of the Rackspace Cloud
    Loadbalancer.
    
    Change-Id: Ie62471424af3170c71e84bed69c603d243572fdb

commit f2ef092d8ca73ee4cae8745f5985d5c0f108dac8
Author: Julien Danjou <julien@danjou.info>
Date:   Wed Jul 10 17:27:52 2013 +0200

    Update oslo.notifier and always register options
    
    This avoids registering multiple times the option if the registering
    functions are called multiple path by different code paths. It's
    necessary for the default configuration sample generator to have options
    only registered once.
    
    The update of oslo.notifier is needed to avoid it using the inexistant
    $host option.
    
    Change-Id: If31974d7ef7fdbf85a88e950ff06c60ccbd6c31d
    Signed-off-by: Julien Danjou <julien@danjou.info>

commit 3fa39dd2ccc9013cfba4ec8bd5fb79caeba0350e
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Sun Jul 7 14:43:45 2013 +0800

    avoid excessive database calls while loading events
    
    list_events constructs Event objects through Event.load, which causes
    every event record previously loaded into memory to be reloaded again.
    Furthermore, Event.load will also reload the associated stack, thus
    all its resources and template. Another bad thing with that is
    reloading a stack will lead to many extra stack static resolution
    (including calls to nova to resovle Fn::GetAZs if it's referenced in
    the template).
    
    Fixes bug #1195793
    
    Change-Id: I4f14c9a2a4f990b753a6e1405e27eb44c53537c9

commit d6b9e3e6340ee6f426c6e5c63bd459f75e890b52
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Jul 11 16:08:54 2013 +1200

    Global disable scheduler _sleep instead of mocking.
    
    It is becoming increasingly difficult to predict when
    a call to TaskRunner._sleep needs to be scripted, and is probably an
    implementation detail which shouldn't be exposed to unit tests anyway.
    
    This change defines a global which prevents sleeping in calls to _sleep
    and toggles that global in HeatTestCase setUp.
    
    Change-Id: I98dc88c9d120c409d5720895bb4fb625a1f12991

commit db4bbad6a0a67dab185376bc6732980aa98c705a
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Jul 10 14:35:07 2013 -0700

    Rename part-handler.py to part_handler.py so it can be imported
    
    Change-Id: I9e7e3be2f3155f3e35b2defdb89e9d84a02ae7cb

commit 4a42f6f0f424eba1e923ff8ff319cb08481d070c
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Tue Jul 9 13:11:22 2013 -0500

    Handle conversion of MAP properties to JSON params
    
    Since JsonParameter takes either a string or a Mapping, just pass the property
    value directly as is done with strings and numbers
    
    contributes to blueprint provider-resource
    
    Change-Id: I71d5c0d9e3fcf3ffea9a89d2c37888faec35cd4a

commit 535c44108ba78592982fd2dec3334a97fbf0da9b
Merge: 10abdc4 27092a8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 10 13:47:12 2013 +0000

    Merge "Tolerate an empty environment properties."

commit 10abdc480c8b6bd205fc5b6199f3fe24692c40f7
Merge: 64edc76 5d1f45b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 10 11:06:44 2013 +0000

    Merge "Make the waitcondition signed url more generic"

commit 27092a8b7b523e524c53bfd4790412a8cb3013ce
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Jul 9 16:01:58 2013 +1200

    Tolerate an empty environment properties.
    
    An environment file containing the following:
    properties:
    
    Results in the following error:
     File "/home/steveb/dev/localstack/heat/heat/api/openstack/v1/stacks.py",
    line 132, in environment
        env[self.PARAM_USER_PARAMS].update(parameters)
    AttributeError: 'NoneType' object has no attribute 'update'
    
    Change-Id: I7b36d797383cc3c74d4d0c77c283564b01aa6a6b

commit 64edc76c102584281c9aeff1861f0c559ca0a69b
Merge: 9d27d0b 8a3efd0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 9 14:23:12 2013 +0000

    Merge "Sync install_venv_common from oslo."

commit fc47b7f670dfd85276eaef2ba51020bb5de5ec44
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Tue Jul 9 09:12:43 2013 -0500

    Add length validation to properties of type LIST and MAP.
    
    Fixing bug #1194981
    
    Change-Id: I0537f105a61bba82e85b6b67d2354b77d8096eb1

commit 9d27d0be9f306ffe0cbe0eaa03590be2c877f9e5
Merge: a7c53ec 15bdfe0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 9 13:01:54 2013 +0000

    Merge "Define behaviour for properties with None values."

commit a7c53ec186800a2a0eb8406757bb624b9a8e01dc
Merge: ff5791d ef41b50
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 9 13:01:31 2013 +0000

    Merge "Check duplicate names between params and resources"

commit ff5791df2f5f09854754e269408c62104c3b981f
Merge: 0a530a8 9cdf7d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 9 13:01:29 2013 +0000

    Merge "Enforce credentials requirement on stack create/update."

commit 2e8513dbf1612d5f59df7292f77c5064fe07d4f5
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Jul 9 11:45:07 2013 +1200

    Use new environment and parameters on stack update.
    
    Without this, changes in parameters specified in the update
    will not propagate to resources.
    
    Fixes bug: #1199189
    Change-Id: Ic19b907e9dd12c121757cb7c6b3d0342415d0482

commit 15bdfe029eb9274fd37ad2d6e8ec3001ec6eaf8e
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Jul 3 15:21:23 2013 +1200

    Define behaviour for properties with None values.
    
    Now that Ref and Fn::GetAtt might return None values, behaviour for
    properties with None values needs definition.
    
    This change will treat a None value in the following way:
    - if there is a default in the schema, that value will be used
    - otherwise a default is used depending on the type ('', False, 0, [] {})
    
    Fixes bug: #1192142
    
    Change-Id: I59ae32c1c32b1bfede7d775aa845cd14246040e1

commit b3e3c16e0224e309ed5cffe33b7058bcbff15242
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Mon Jul 8 15:23:17 2013 +0800

    Let git ignore pydev project description files
    
    Change-Id: Ice68ef444ae92c94a2f883a6db41359d0bcb9e71

commit 0a530a864513bb2407a317418ae03274fb0accbf
Merge: 9910aff a4a24aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 8 03:27:33 2013 +0000

    Merge "engine : add suspend/resume support to User resource"

commit 9910aff411d900ea94f208289f98c9a15e6018b1
Merge: 78d38ab dfe6092
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 8 03:27:26 2013 +0000

    Merge "engine : add suspend/resume support to watch resource"

commit 3bac114e8f18b38b5cf7687d9160d852eec0905c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 8 13:03:45 2013 +1000

    Suggest the use of tripelO images
    
    Change-Id: I8dfb18fe3f52baea99ed34cc271241b8e24c8104

commit 5d1f45b0ea0c6880b02b4ff0c150e38f5e0befba
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 4 13:14:42 2013 +1000

    Make the waitcondition signed url more generic
    
    This will be used in a later patch, for alarms as well.
    
    blueprint watch-ceilometer
    Change-Id: I4b3a6be0effb975ddd8214741cfca6f40c493dbe

commit ef41b50ae46d842f85545fead58afa3ad7f12d40
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Sun Jul 7 11:17:44 2013 +0800

    Check duplicate names between params and resources
    
    make sure there are no duplicate logical names across parameter
    and resource definitions
    
    Fixes bug #1196491
    
    Change-Id: I353b84dd8b9bfe77b214e93cc9f1a080ebe2248b

commit 78d38ab038b3fa1d3dfa2f22f0952f37be07dde2
Merge: c03efe6 11f4046
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jul 7 06:49:30 2013 +0000

    Merge "Stop patching the GenericResource's property_schema"

commit a4a24aaabab78cd1327fa09321e3631a582865e8
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 4 13:49:50 2013 +0100

    engine : add suspend/resume support to User resource
    
    When a User resource is in suspended state, disable the keystone
    user owned by the resource
    
    blueprint stack-suspend-resume
    
    Change-Id: Iee8dddcfbc0fc9bd132ddfadd2a17eb1b0894f51

commit dfe60926c96139680804bfe0e84dd6b4e75d282a
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jul 3 18:03:57 2013 +0100

    engine : add suspend/resume support to watch resource
    
    Add suspend/resume support to CloudWatchAlarm resource and
    underlying watchrule - this means that when in suspended
    state watches will not allow new metric data to be added
    or for alarm evaluation/actions to happen
    
    blueprint stack-suspend-resume
    
    Change-Id: Ic9a1c1bd86ac8156f260791089a38889eabc6528

commit 8a3efd0c5955cafb3e5c1b540b6c91623e28e013
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri Jul 5 22:05:47 2013 -0400

    Sync install_venv_common from oslo.
    
    Change-Id: Ic7d71c90d39370810e95efa592f00e936c5204f0

commit c03efe6bb14ff5817c3390de5ed4a7e358b7ad18
Merge: ba649cb 52dc303
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 5 13:37:20 2013 +0000

    Merge "cleanup watchrule delete logic/tests"

commit 11f4046b69c969920c8593251f5dc716940454be
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jul 5 21:42:31 2013 +1000

    Stop patching the GenericResource's property_schema
    
    This is causing test failures if you add a new test
    and don't reset the scema to {}, this seems to be timing
    related. Just add Resource types that we need prevents the
    need for this patching.
    
    Change-Id: If7ddd2b1ffa8b54025c0369fe8c4f7440f0e3cdc

commit ba649cbd34d0e4086282fbc6247d7c257fc281a5
Merge: cfb4a60 6c8fdd0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 5 03:24:10 2013 +0000

    Merge "Tolerate 404 on user delete."

commit 9cdf7d52bf07cb528b669cc104d1a9a3b800d985
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Jul 4 11:50:49 2013 +1200

    Enforce credentials requirement on stack create/update.
    
    Credentials need to be supplied whenever they are stored with the stack,
    which is during stack create and update.
    
    Some users have been relying on their auth token to perform all heat
    operations (as all other openstack services support) however this has
    led them to experience obscure errors when wait handles or alarms are
    triggered.
    
    Failing early with a clear error message will stop this class of errors.
    
    Fixes bug: #1194303
    
    Change-Id: I3edef3dee843bb06760be6294b798761eba30cb8

commit 52dc30305521321333fc9f07206fdf84eb94cefd
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 4 10:26:31 2013 +0100

    cleanup watchrule delete logic/tests
    
    Rework watchrule delete interface so we delete by ID, rather than
    by name (where we only delete the first rule in the event of multiple
    watcherule rows with the same name, which is allowed although not likely
    in normal heat operation - it can cause weird behavior in the tests)
    
    Encapsulating the delete in a WatchRule.destroy() is cleaner and more
    consistent with the rest of the codebase, and reworking the tests to
    ensure proper cleanup reduces the chances of odd errors and cascading
    failures between tests on failure.
    
    fixes bug #1197718
    
    Change-Id: I94e9eb610519bb7321a2be7718312fd50f308a8b

commit cfb4a605fefd1407a7ee66a80b70fe09bb21818c
Merge: 1d8e205 9d13c2c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 4 03:19:22 2013 +0000

    Merge "engine : autoscaling pass instance id's not names to loadbalancer"

commit 1d8e205634468854feed46447d389a2c870d7fee
Merge: d47fb8e eb0dafb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 3 23:33:24 2013 +0000

    Merge "Fix command name display issue in heat-manage usage"

commit eb0dafb44b90bc628e3c7c4775c3af201cf85cb0
Author: guohliu <guohliu@cn.ibm.com>
Date:   Tue Jul 2 22:49:23 2013 +0800

    Fix command name display issue in heat-manage usage
    
    Fixed bug #1194840
    
    Change-Id: Ibe43d0a025f0aed6bec7e414f7e80d0a0f652308

commit 9d13c2cbd31e5416bb6b9aa86aeefe862eef9e2f
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jul 3 14:40:32 2013 +0100

    engine : autoscaling pass instance id's not names to loadbalancer
    
    Regression caused by 4bc1bcb608379cc396113a03f2ae37ce78f9049c
    
    We need to pass the id_list to the loadbalancer, otherwise it
    can't lookup the instance IP adresses with nova and the loadbalancer
    config ends up with 0.0.0.0 for every instance
    
    Fixes bug #1192128
    
    Change-Id: I73bab70e897c0fb0b317793fa31ff8d07720a6c4

commit d47fb8e4133dff2aed2c91869f83753a09d7ebfa
Merge: 82ec331 4c1adb4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 3 07:55:21 2013 +0000

    Merge "Rework associations from vpc to quantum resources."

commit 82ec3315ccae530c7af085f3e46a99e015ca1eea
Merge: 08330d0 f4c6ef0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 3 07:51:12 2013 +0000

    Merge "Fixup assert_has_keys."

commit 08330d09b0f465175a1f99d51eb4b3d499c10589
Merge: f50cbe4 206fb65
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 3 07:51:10 2013 +0000

    Merge "engine : perform periodic tasks with stored stack_context"

commit f50cbe4ac24894eea8e2dc9775e159c1fa093d0e
Merge: 3c17227 ac1b51a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 3 07:51:07 2013 +0000

    Merge "implement stack metadata"

commit 3c17227ed6423ee36fc9e23a0db6093fa02dcc2c
Merge: 42f4c2c c882bbe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 2 17:23:47 2013 +0000

    Merge "Rackspace cloud database resource provider"

commit 42f4c2ce2c6fec6ea3a5eeb3c4113ba07b6a9751
Merge: 98a3085 f2ecb7f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 2 16:19:49 2013 +0000

    Merge "Ports depend on the subnets in the same network."

commit 98a30858fa715e5334a57e6b8b66f5f57d24ad62
Merge: d4fe600 5432d07
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 2 16:19:41 2013 +0000

    Merge "tests : remove duplicate suspend tests"

commit d4fe600c12e268cdd6d4a52838585701afc3727a
Merge: d2267d0 ec40a9e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 2 16:08:44 2013 +0000

    Merge "add missing gettextutils imports"

commit d2267d02221576da26f83228db1a7aa04b703f60
Merge: 4be55d4 5c5519a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 2 15:57:23 2013 +0000

    Merge "Expose resource dependency required_by to REST API."

commit c882bbe1e6bcca3a70ae5c147c011b77caa9abde
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Mon Jul 1 12:48:47 2013 -0500

    Rackspace cloud database resource provider
    
    Change-Id: I0bdacb844d5e5999e70918352e58856c1b21692c

commit 4be55d4df7cba642476f466cd698faf781846bcc
Merge: 17a1832 a917604
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 2 14:21:37 2013 +0000

    Merge "Add resume support to InstanceGroup"

commit ec40a9ebe7e9fe1129a2509b80de52ca7b2854ca
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jul 2 14:22:24 2013 +0100

    add missing gettextutils imports
    
    Several files use the "_" function, but don't import it from
    gettextutils - this leads to a "NameError: name '_' is not
    defined" error if you try to import/use the modules from an
    interactive python shell or standalone test-code.
    
    Change-Id: Id28b45d71eeda64fbfaa6234b12cff45fcd2ce40

commit 206fb652b87478f06de3028f312aa0410bd1ce7e
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jul 2 14:17:30 2013 +0100

    engine : perform periodic tasks with stored stack_context
    
    The metadata update needs to be performed with the stored stack_context,
    not the admin_context, which contains no credentials to e.g authenticate
    with nova
    
    Fixes bug #1196618
    
    Change-Id: I0451604535a731de5ad57d2d52cdf183e58cf7b0

commit 17a18326d3e43d9b43dd42887c3055d6f9540980
Merge: bdbaf10 1508186
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 2 09:46:09 2013 +0000

    Merge "engine : resume support for nested stacks"

commit bdbaf108571c7e1b5074740646d0650460f860f5
Merge: 2b0a53a ba74d7a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 2 09:46:01 2013 +0000

    Merge "api : Add actions resume support"

commit 2b0a53a831b62d89eb1eebf787befcdc4ae027d5
Merge: ec3bcc4 762605f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 2 09:15:20 2013 +0000

    Merge "Add resume support to Instance"

commit ac1b51a2d19e7108d7c74a4022a6e33a50ffb826
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Sun Jun 23 23:17:18 2013 +0800

    implement stack metadata
    
    make metadata and delete/update policy accessible to stack resource
    
    Blueprint stack-metadata
    
    Change-Id: I2251b730ce7fb70b8b28f065479b9b6a7e8a1f33

commit ec3bcc414563a7b6a5d6094566f19949ecc09d4e
Merge: 3994b14 30fbc1e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 2 05:16:07 2013 +0000

    Merge "Get rid of template caching in resources"

commit 3994b1453fa302b1e9f3144db4b7b52656401880
Merge: 4b355a7 c22d7e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 2 05:14:40 2013 +0000

    Merge "Explicitly pass old json snippet to update"

commit 4c1adb4c83f2f393dfb6a0460a8ecc3f14cd9b50
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue May 21 10:01:16 2013 +1200

    Rework associations from vpc to quantum resources.
    
    Metadata cannot be used to store the relationships between VPC
    resources and the underlying quantum resources, since this prevents
    VPC or Subnet refs from being passed in as parameters.
    
    This rework results in no state being stored in metadata. Route table
    relationships are inferred from the template. An assumption is made that
    the quantum router associatiated with the VPC will have the same name
    as the quantum net. The easiest way of ensuring that is to creat the VPC
    in a different Heat stack.
    
    Fixes bug: #1165050
    Fixes bug: #1165056
    Fixes bug: #1166779
    Fixes bug: #1166787
    
    Change-Id: I6fb087bfc63ed13703089a16ed57858e6911b7d8

commit 6c8fdd072379880dc04720d4caa0d961b5b9b1cb
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Jul 2 15:17:34 2013 +1200

    Tolerate 404 on user delete.
    
    Fixes bug: #1196707
    
    Change-Id: I70f43f2f789b2c36983d0cecf41604e89268c09e

commit 4b355a732a4beebc91c6232ec0dcfadde386037b
Merge: 9fea9a7 84d71d6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 1 22:36:45 2013 +0000

    Merge "Add initial resume logic to engine"

commit 9fea9a734a3fbcc8efdf717ba473ee2471fd8d50
Merge: 99d8492 2970a3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 1 22:14:43 2013 +0000

    Merge "check content type in JSONRequestDeserializer"

commit 99d849228b34fbe2501bed790adb592caf036b6c
Merge: aef9899 4a5ddb6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 1 11:45:46 2013 +0000

    Merge "destroy failed instances created by auto scaling"

commit 30fbc1ec985cda13c64ee812c665b8a361b7156a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jun 13 20:03:28 2013 +0200

    Get rid of template caching in resources
    
    This is no longer used anywhere.
    
    Change-Id: I3b320a1668f5ba532b01b289222a56126c19c8aa

commit c22d7e317af9fbc1140fed0fa496cdb791dd76f1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jun 13 20:03:28 2013 +0200

    Explicitly pass old json snippet to update
    
    Don't use state cached in the resource.
    
    Change-Id: Ib6c7830ce40b72c9cd388c054fcb41ff93963b4d

commit 5432d07d43ac31abdf32c0bed8fbb15a64bf44e6
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jul 1 11:27:26 2013 +0100

    tests : remove duplicate suspend tests
    
    A previous patch erroneously introduced two copies of the same
    tests, remove the stackServiceTest duplicates as they already
    exist in the stackServiceSuspendResumeTest testcase.
    
    Change-Id: Iec00fd8dbe0d0bc6b2718b03cc4fe40b9ba481c3

commit a9176042e549c522de9166d593c8c6e5529b963d
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 28 16:53:44 2013 +0100

    Add resume support to InstanceGroup
    
    Change-Id: I491bfd3475e12c2e5b8675d92d93f855b590423b
    blueprint: stack-suspend-resume

commit 1508186c709089a571430c95bade3e93828f6a61
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 28 14:51:54 2013 +0100

    engine : resume support for nested stacks
    
    Change-Id: I82da46c6f18c035927c6305968470db613d7229c
    blueprint: stack-suspend-resume

commit ba74d7a18c4ba70605fd923794054304504c5b1c
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 28 11:15:40 2013 +0100

    api : Add actions resume support
    
    Add support for resume action using a similar interface to that provided
    by nova for the admin actions extension.  So a body of {'resume': None}
    will suspend the stack, see http://api.openstack.org/api-ref.html
    
    Change-Id: I89bbafbe2f8b2503f241659a36b83ceab605e763
    blueprint: stack-suspend-resume

commit 762605f572ff4dff00b3666f0648761182752c2f
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 28 14:43:04 2013 +0100

    Add resume support to Instance
    
    Change-Id: Id02c74243ff5fcd67ec8f6200ee7969b34f2faa1
    blueprint: stack-suspend-resume

commit 84d71d63422b5eae8ef1cc7b7806f8b13b05e6dd
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 28 11:10:32 2013 +0100

    Add initial resume logic to engine
    
    Change-Id: I08e08bb3edbc83ecce831c8fe7ad718ad7476634
    blueprint: stack-suspend-resume

commit aef9899002037da2b8ba3f3975ecc5f6b40af158
Merge: d0eee03 40c07c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 1 09:58:33 2013 +0000

    Merge "Fixup handle_create backup restore."

commit d0eee03f4e464a66896ebd6b01a57ed91120a01b
Merge: 2cc9845 48b243b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 1 09:22:32 2013 +0000

    Merge "install "_" via gettextutils"

commit 2cc984528dfb41b30302951955ae0c50b9e2cade
Merge: 42243ec 016133f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 1 07:26:08 2013 +0000

    Merge "add GET /{tenant_id}/stacks/detail to Heat API"

commit 4a5ddb64f4095d0af8a2c7e87862486a8e34d0a2
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Sat Jun 29 21:45:43 2013 +0800

    destroy failed instances created by auto scaling
    
    The ResourceFailure exception was silently eaten when raise_on_error
    set to False. This patch handles the ResourceFailure exception locally
    when raise_on_error set to False - called from ScalingPolicy alarm
    (i.e. runtime adjustment). So users will not be charged for orphaned
    instances. But they can still see what happened through event list.
    
    Fixes bug #1192554
    
    Change-Id: I01106d2e443dbc37af066b04ef7064bfa5656675

commit 5c5519af266c56777c826dda3aca55c0e720bd02
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Jun 20 14:17:20 2013 +1200

    Expose resource dependency required_by to REST API.
    
    Each resource can generate a list of names of resources which
    require this resource as a direct (non transitive) dependency.
    
    This information is returned in the list as well as the show REST calls
    so that a diagram of the running stack can be built with a single
    request.
    
    Other uses of exposing this information is:
    - template authors debugging their own template dependency issues
    - integration tests validating template dependencies
    
    Change-Id: Ibe62345afa87e49c4e2152a5fcb74e5ee003124e

commit 48b243b35e020bee2d850389b059961a296f4dc2
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Sun Jun 30 14:42:41 2013 +0800

    install "_" via gettextutils
    
    avoid using two separate sets of translation messages when
    HEAT_LOCALEDIR environment variable presents.
    
    Fixes bug #1196184
    
    Change-Id: Ief773b9f2674909de461e2b07f1b07d3c66521cc

commit 42243ec2a5368c420629f8bea4c9c2d8c8692444
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 28 16:43:41 2013 +0100

    engine : simplify resource state check
    
    Simplify the test to check the resource is in a COMPLETE state
    (other than DELETE_COMPLETE), so we don't have to update this for
    every new action state which gets added
    
    Change-Id: I91286d3d0464b1a71dafd01ac209ea7ded259875

commit 1755b9db53150f006e8d9c12983e0438875a3a8b
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 28 10:22:29 2013 +0100

    engine : remove unnecessary default check_*_complete functions
    
    The default behavior in _do_action is to declare COMPLETE if the
    check_$action_complete is not implemented, so these default
    functions returning True are not needed.
    
    Change-Id: I2fd1b7da1d39d23abc81e1b9171b053e547b2ec6

commit 40c07c160a857a6800de0d2fade777a322c82612
Author: Patrick Woods <woodspa@us.ibm.com>
Date:   Thu Jun 27 14:44:54 2013 -0500

    Fixup handle_create backup restore.
    
    The handle_create did not retrieve the volume_id
    correctly and the check_create_complete
    needs to handle the restoring-backup status.
    
    Also modify and add support for restoring-backup
    status test cases for success and error.
    The additional FakeVolumeFromBackup will force
    the inital status to be checked by the method
    check_create_complete in volume.py.
    
    Fix bug 1195403.
    
    Change-Id: I60bf4f9f90be1058d0fb400aa3778d0448b1a898

commit da3b5ecfdd0c64805b40ecb535c077f9f0044988
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 28 15:50:01 2013 +0100

    Remove comments from requirements.txt (workaround pbr bug)
    
    Workaround for pbr bug #1191923
    
    Change-Id: I4960216834cf624d8bcf88e7a3e7485cf5ace85f

commit 016133f538fd4136006e996d8a9da9130a29c85c
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Fri Jun 28 22:27:59 2013 +0800

    add GET /{tenant_id}/stacks/detail to Heat API
    
    Enables the building of a useful dashboard interface for Heat stacks
    without looping through stacks returned from "/{tenant_id}/stacks/"
    to fetch the detailed data.
    
    Fixes bug #1191117
    
    Change-Id: I06b1100873de462c69302e43259df13104cad79f

commit 3260e6025c21d26deacf554571361c9c697e0235
Merge: 4a6bba9 c1b4b98
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 28 13:59:59 2013 +0000

    Merge "Add suspend support to InstanceGroup"

commit c1b4b98a40113378115d6897a37cc67b4fe52e00
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jun 26 17:39:46 2013 +0100

    Add suspend support to InstanceGroup
    
    Change-Id: I46baf7fd17e6701e2ce07f823fff4c8fb4dd3dfe
    blueprint: stack-suspend-resume

commit 4a6bba91ad7c65c2d78860b098bb77d21e5529ab
Merge: 8543a7a e1aa8e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 28 10:41:06 2013 +0000

    Merge "autoscaling : Fix issue when scaling to zero instances"

commit 8543a7a1016b78aebb56e07cc1edf187e740f319
Merge: e8b893b d3736ac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 28 02:14:46 2013 +0000

    Merge "Add editor backup files to .gitignore."

commit f4c6ef0ad659d414cad38e4cf5bf8321d7e05374
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Jun 27 22:10:51 2013 +1200

    Fixup assert_has_keys.
    
    This test helper had awkward code that didn't support users in
    debugging tests, as it didn't report enough information. Additionally
    some style issues were present, which I fixed up at the same time.
    
    Fix bug 1195239.
    
    Change-Id: If07e54ae0f2db1152dfea2012ff39b0291955dd7

commit e1aa8e791be34a144a404fe87d869ad9f9a3311e
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jun 27 16:20:56 2013 +0100

    autoscaling : Fix issue when scaling to zero instances
    
    As noted in https://review.openstack.org/#/c/34564, we lack
    coverage of the scenario when MinSize is 0 and we scale down
    to zero instances then try to do a delete.  We do the wrong
    thing here, by creating a GroupedInstance object with name '',
    and this would also result in an incorrect update to the
    LoadBalancer.  Fix is to reset the resource_id to None.
    
    Fixes bug #1195364
    Change-Id: Ie3a52badf35f7e660de9a8f38635d2a09463123a

commit e8b893b7735b1912cbfe30f610780f13b5576f68
Merge: d3dc1df 0c4a741
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 27 14:41:28 2013 +0000

    Merge "engine : autoscaling refactor Instance list->object logic"

commit d3dc1dff2292b97d3aeccd9c42198e989a24d4b0
Merge: e767c75 243813f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 27 14:06:57 2013 +0000

    Merge "api : Add ReST actions POST method"

commit e767c752f8e3b9b82214d913aa096e6eb064b547
Merge: 1810a6b b2d4535
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 27 14:06:50 2013 +0000

    Merge "engine : parser.Stack create general stack_task"

commit 1810a6b8ce784ba57c321b0a7cd113169c46d3e3
Merge: 080794f b022786
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 27 14:06:43 2013 +0000

    Merge "engine : suspend support for nested stacks"

commit 080794f92b53cf89688c909db609204d8b20fda7
Merge: 9c9d7d9 f1ea0f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 27 13:02:46 2013 +0000

    Merge "Raise suitable exception when stack validation fails"

commit 9c9d7d9f56a8171d2f6d55182866337ed52b2f6c
Merge: eb0edf8 d6c2820
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 27 11:15:01 2013 +0000

    Merge "Add suspend support to Instance"

commit eb0edf8368f7874d82b843ce113af28665141ada
Merge: fa7de16 66fe8f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 27 10:50:06 2013 +0000

    Merge "Add MinLength, MaxLength to properties schema"

commit d3736ac62d49d02cbac5ccabc0db85a3efdb2e94
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Jun 27 22:12:23 2013 +1200

    Add editor backup files to .gitignore.
    
    Change-Id: I004d10e61c8e192c058a5d1ba5a09f7c676d278b

commit fa7de16db15d47f17f3a5e3fc7419e95dbe345f8
Merge: a1b0827 718c195
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 27 04:20:08 2013 +0000

    Merge "Add dependency between RouterGateway and RouterInterface"

commit a1b0827db877e74aac2c9c5f8f123030daebc567
Merge: 84e0ed4 351830d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 27 03:33:47 2013 +0000

    Merge "Initial provider templates"

commit f2ecb7fb6ec05e2040e36f9b015ae5684f06c14f
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Jun 27 13:39:30 2013 +1200

    Ports depend on the subnets in the same network.
    
    Without establishing this implicit dependency, the following
    sometimes occurs:
    - Ports get assigned to instances without any IP address
    - Stack delete fails as ports still exist in subnets.
    
    Fixes bug: #1192371
    
    Change-Id: Ifd892cef4c2eebaea5568afbd320c8865c845d70

commit 718c195a1be18470e9d5cb5a7a199f62548b937b
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue May 21 13:21:11 2013 +1200

    Add dependency between RouterGateway and RouterInterface
    
    When a template has a RouterGateway and a RouterInterface with the
    same router_id, there is an implicit dependency on delete where
    the gateway must be deleted before the interface.
    
    This is implemented by overiding add_dependencies in RouterGateway
    and looking in the stack for RouterInterface resource to depend on.
    
    Fixed bug: #1182266
    
    Change-Id: I90ebe987c1d6e81f8936ceb81b81376c7e0d497a

commit 66fe8f10ee382686488af055ee9f202754638ce8
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Wed Jun 26 12:39:49 2013 -0500

    Add MinLength, MaxLength to properties schema
    
    Change-Id: Ib0970e76e32f6e6d3c7f79b60c5fb3b7384fdb5d

commit 84e0ed42a5bd13bee446f45bc13352b047988ae9
Merge: df20c75 054185d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 26 19:24:58 2013 +0000

    Merge "Pass before and after snippets to template diff"

commit df20c7527b4d939d1c836e939e535a4007cc4abd
Merge: b48463c d4ae2bc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 26 19:15:53 2013 +0000

    Merge "Changes for HOT hello world template processing"

commit 0c4a741224a8ceaeae604fea03c40c299992fdfe
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jun 26 14:59:29 2013 +0100

    engine : autoscaling refactor Instance list->object logic
    
    Refactor the conversion from instance list to GroupedInstance
    objects, so it's not contained by the handle_delete and can be
    reused (e.g for suspend)
    
    Change-Id: Iaaf8b7568e06fa50b03348ad3bb61a7da91be127

commit 243813f8fbbad084f6c07bdc423cf3631c846576
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri May 10 18:29:04 2013 +0100

    api : Add ReST actions POST method
    
    Initial support for an actions subpath, which will be the access-point
    for non-lifecycle operations on stacks, e.g suspend/resume
    
    This adds support for a  POST method for /actions subpath, so that requests for
    specific actions may be made, using a similar interface to that provided by
    nova for the admin actions extension.  So a body of {'suspend': None}
    will suspend the stack, see http://api.openstack.org/api-ref.html
    
    blueprint: stack-suspend-resume
    Change-Id: I180345c818cbfa38ac8c17caba2c0f64adabf6be

commit b2d4535064d1ec1231c4b226d806b1d7fe6f24d6
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jun 26 12:44:58 2013 +0100

    engine : parser.Stack create general stack_task
    
    Remove duplication between create_task and suspend_task
    by refactoring to provide a more general stack_task
    
    Change-Id: I81a1a94d70475b0c13c881dea5c6ce7b2c5d7ce1

commit b0227869544ad63c22972cbfb3fd2b9255126bb2
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 7 14:19:28 2013 +0100

    engine : suspend support for nested stacks
    
    blueprint: stack-suspend-resume
    Change-Id: I5d1909065c94d85fb28e4c50475c6ea74baff27c

commit d6c2820e30a70a628aa07e2e0cb04c12506ebe3a
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu May 16 13:46:16 2013 +0100

    Add suspend support to Instance
    
    blueprint: stack-suspend-resume
    Change-Id: I863e6e04507110805048bb31d95944b9bdedb0fe

commit b48463c9ae6677292c63f575165e19c4f12469e0
Merge: c082285 942d3c9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 26 12:49:41 2013 +0000

    Merge "engine : stack_resource change state_description to status_reason"

commit c082285ca4e34cff2ee9bf3508a92dd6f12f911e
Merge: 481f84a 6a7a735
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 26 12:05:56 2013 +0000

    Merge "Cache snippets in StackUpdate"

commit 942d3c94e29ea548d22f8a41f5201f5042ea13db
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jun 26 12:27:05 2013 +0100

    engine : stack_resource change state_description to status_reason
    
    The internal API changed this name recently, but this got missed
    due to lack of test coverage for this exception.  Turns out adding
    that test coverage is really hard due to all the coroutine magic,
    so we'll have to fix that at some later time.
    
    Change-Id: I98a0c5bb8f3f001a7d215bcdf64cad841e42ef85

commit f1ea0f2d9be21e1a013ed9990f0f86adabb2ecbd
Author: Zhang Lei (Sneeze) <sneezezhang@cienet.com.cn>
Date:   Wed Jun 26 13:39:42 2013 +0800

    Raise suitable exception when stack validation fails
    
    fixed Bug#1191009
    
    If nova returns an error looking up images during stack validation, we
    return a StackValidationFailed, but we should probably catch
    this and return ServerError instead, since this is really an internal
    error not a validation failure.
    
    Change-Id: Id509b2fa9f78e197cacfe44bae6c3db37cfd6179

commit 481f84af73e61e8d1935997643553f3c96474d40
Merge: 4713c48 64bd0c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 26 05:29:20 2013 +0000

    Merge "Store created nova client in OpenStackClients."

commit 4713c4807b08ae891f663b9c3a17eafdfa32d6f6
Merge: 9512090 0bc1b24
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 26 04:45:22 2013 +0000

    Merge "Allow a resource delete to be re-attempted."

commit 9512090f47a02dd5283ca993eef8cb5e3b398801
Merge: ca9465b 62e173e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 26 03:50:03 2013 +0000

    Merge "Handle YAML parser error as well"

commit ca9465b0c2003c0068a2ea7b6576a639885a03d0
Merge: 39a3f0e 0cb5424
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 26 02:51:53 2013 +0000

    Merge "Simplify a stack update unit test"

commit 39a3f0e905ae20f84669f668ff1c67464fd85912
Merge: 00c5beb 46edefa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 26 02:42:16 2013 +0000

    Merge "Refactor and partly parallelise stack update code"

commit 00c5beb8fb9ff0f2e045692b51ec9a042d1d1d00
Merge: e5e1616 5e5affc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 26 01:52:02 2013 +0000

    Merge "Allow JSON values for parameters"

commit e5e1616cdc43efaeb9eddb523bad5e0cd39c1ac6
Merge: c4dc226 120a3cd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 25 16:26:52 2013 +0000

    Merge "OS::Quantum::Subnet resource, add enable_dhcp"

commit 62e173ef863d03234d05e748368446dcdf3f3daa
Author: Jianing YANG <jianingy@unitedstack.com>
Date:   Tue Jun 25 23:55:40 2013 +0800

    Handle YAML parser error as well
    
    Fixes bug: #1185590
    Change-Id: Id561e2769d1f0192dd831450f10e05e8213bffa8

commit c4dc226ae285aa1d5e04d7af528d31bdd42d493e
Merge: cdb2799 422360e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 25 15:10:59 2013 +0000

    Merge "Add initial suspend logic to engine"

commit d4ae2bccfdf3c05e1a7e1feecdda58084c529081
Author: Thomas Spatzier <thomas.spatzier@de.ibm.com>
Date:   Mon Jun 17 13:50:52 2013 +0200

    Changes for HOT hello world template processing
    
    This patch contains the base enabling code required for processing a most
    simple HOT template ("hot hello world"), so that the template can be
    parsed and a stack with a single instance can be deployed.
    
    Contributes to blueprint hot-hello-world
    
    Change-Id: I4f0a04a06fab2f5472cb4481dcdf10d5239d5def

commit 120a3cd0c93eedcdb4b63148e9590b0c74a71cca
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jun 25 09:49:34 2013 +0100

    OS::Quantum::Subnet resource, add enable_dhcp
    
    Add enable_dhcp to the properties schema, since quantumclient
    code indicates this is allowed in the body (not only expected
    in the response as currently indicated by the docs)
    
    Fixes bug #1194394
    
    Change-Id: I19770b033696ea9a27b6e985a52bf2cfadb16f52

commit 2970a3ecd9124b41e09df900000e72057ebff26d
Author: Zhang Lei (Sneeze) <sneezezhang@cienet.com.cn>
Date:   Tue Jun 25 13:27:00 2013 +0800

    check content type in JSONRequestDeserializer
    
    Fixed Bug #1187882
    
    Change-Id: I5e8922690af1cb497366c5f09183bbccbc68f5a2

commit cdb27991a38902f134ac6825d2a3d3bc3eab3171
Merge: 9c2f56e e6f6890
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 25 01:57:54 2013 +0000

    Merge "Use print_function compatible syntax"

commit 9c2f56eb36c861091f6bed35422f0bd385a2e135
Merge: 123b386 5f969d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 25 00:20:42 2013 +0000

    Merge "Adding common base class for Rackspace Resource providers"

commit 64bd0c2699f550c4fd6acb48ba5b73ab289be315
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Jun 24 15:21:43 2013 +1200

    Store created nova client in OpenStackClients.
    
    All created clients are stored in the instance of OpenStackClients
    which is associated with a stack - this prevents clients from
    being repeatedly created throughout the request.
    
    Commit f3fc5c5 introduced a regression which stopped storing the
    nova client. This change addresses that regression.
    
    Change-Id: I60088b60f623aac11e473d185f2924d4f4bd1cfe

commit 5e5affc10b785ae37d8109f810ed57423c60aec8
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Tue Jun 18 20:38:27 2013 -0500

    Allow JSON values for parameters
    
    Adds a paramter type that accepts JSON objects or strings representing JSON
    objects as values.
    
    Implements: blueprint json-parameters
    Change-Id: I1ad62df28832a2e07249452133fd9f14995f8e23

commit 422360e75531efb008cf58d3d3dea13ee7c3e2e7
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed May 15 19:01:39 2013 +0100

    Add initial suspend logic to engine
    
    blueprint: stack-suspend-resume
    Change-Id: Icf81672534de6b07d938785e659b7f6c733eacc4

commit e6f6890ac087d7218040e5b77a5a803c427cd395
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Mon Jun 24 15:41:51 2013 +0200

    Use print_function compatible syntax
    
    This changes the code to use a python 3.x compatible
    print function syntax (or import from __future__ where
    necessary)
    
    Change-Id: Ia1f19d0ac082853d25c7c9b754b440469c0526eb

commit 123b386a1b63e0da7bf6fac854099b6525e4881d
Merge: 786779f 266551f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 24 10:44:06 2013 +0000

    Merge "Fixup some trivial license header mismatches"

commit 786779f3de9ce329bd3c9f882fb3c681b3c34d33
Merge: eb4a033 bdeb33a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 24 10:42:12 2013 +0000

    Merge "Emit alarm actions if a rule remains in ALARM state."

commit eb4a033a08e9bcde74ad9614d6fb3a9781dce88e
Merge: 47f9f54 8dca1f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 24 09:16:25 2013 +0000

    Merge "make stack creation return json response"

commit 0bc1b24b4f423a5af305dfd6641d5a60b0d93df7
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Jun 24 14:30:23 2013 +1200

    Allow a resource delete to be re-attempted.
    
    If a resource is in a DELETE IN_PROGRESS state, and the resource
    is deleted again, another attempt will be made to delete the resource.
    
    Fixes bug: #1193975
    
    Change-Id: I615612b4e5f21f2a2cb168f47c33a8f9db7e9e81

commit bdeb33afdc52f37c2270a72c2221b051024f3f3f
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Jun 24 14:19:36 2013 +1200

    Emit alarm actions if a rule remains in ALARM state.
    
    It looks like the original intent of this edge-triggering was to
    prevent actions being emitted too frequently, causing overshoot of
    scaling resources.
    
    However this causes an issue when one scaling resource change is not
    enough to bring the alarm state under the threshold.
    
    Proper use of Period, EvaluationPeriods and Threshold should be sufficient
    to prevent scaling resource overshoot.
    
    Fixes bug: #1193970
    
    Change-Id: I5b38eb82cd1ad568fe4af77999e9d52f9eb99328

commit 351830d10247f52457a157e05d461efb17238592
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jun 24 11:18:09 2013 +1000

    Initial provider templates
    
    this is the "lite" version of blueprint provider-resource
    Change-Id: Ife706c932b6b9f0bcf57fb907b369231c226c7c4

commit 266551f0d43e13fae894948ccbd569414a10a4c0
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Sun Jun 23 20:57:04 2013 +0200

    Fixup some trivial license header mismatches
    
    Newer Hacking releases are pedantic about the
    license header. Fix up the trivial mismatch.
    
    Change-Id: I418222734303b8578ab0b34b8eb044d9543fc888

commit 5f969d28f35437f972dab3da2e40508a9d75fe32
Author: Vijendar Komalla <vijendar.komalla@RACKSPACE.COM>
Date:   Thu Jun 20 12:09:02 2013 -0500

    Adding common base class for Rackspace Resource providers
    
    Change-Id: If7d15e01c53fb6db4bdee5759b0ef4f087640c58

commit 054185d79580fb05d9278dddfe76eb0a270e6818
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jun 13 20:03:28 2013 +0200

    Pass before and after snippets to template diff
    
    The before template should be passed explicitly, rather than relying on
    some state stored in the object.
    
    Change-Id: I5b0af8da2e1df3f6ad3291554cbbc243b51e3fe5

commit 6a7a735ec1cae214b317254d1c4cb04cad230c82
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jun 13 20:03:28 2013 +0200

    Cache snippets in StackUpdate
    
    Change-Id: I1720a7c14edaf1d70b0894c2a4655f101d1c38eb

commit 0cb542463c0bc25a518d34252deecc3681d33cb6
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jun 13 20:03:27 2013 +0200

    Simplify a stack update unit test
    
    Separate out the two resources into separate classes that can be mocked (or
    not) independently.
    
    Change-Id: I0d8fc73262256330c0f3e7fd50cc655a12332dc4

commit 46edefa36cfd3ff6d31a54c7e8eccd059887badb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 21 18:01:32 2013 +0200

    Refactor and partly parallelise stack update code
    
    Make this easier to read, and also use co-routines to make it run in
    parallel where possible.
    
    Change-Id: Ib37f4c04bd250cb15604ba9adb4cca8a97a2c4fb

commit 47f9f54d851ea8d810774d9ca26f4b50162a84d3
Merge: 7eb109a d1673f0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 21 11:27:01 2013 +0000

    Merge "Unrestricted username length causing error."

commit 7eb109adb43afeddfc86f01c74f43bf068a4643b
Merge: 2c7e4fd 0782eb1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 21 07:35:27 2013 +0000

    Merge "Add VerifyAll to test methods using mox."

commit 8dca1f53170bceecb6f14b1b12a4911439dfce6b
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Mon Jun 17 18:19:15 2013 +0800

    make stack creation return json response
    
    added a serializer to handle create response serialization
    
    fixes bug #1187883
    
    Change-Id: Ibdeb8b810d759901979becb8b29bdc337f2f5bec

commit 2c7e4fd15466696844b53fbbad67bbd183dd38a2
Merge: e683c2d 3204dea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 21 01:37:56 2013 +0000

    Merge "Give alarm a physical_resource_name which need no id."

commit e683c2dc3238837ef0609a7dd07f5b1e4b9fb702
Merge: 90203b8 fd94427
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 21 01:37:49 2013 +0000

    Merge "Fix BaseException.message DeprecationWarning"

commit 3204dea9f7a6cb0e88955ace0a6a014db546e89c
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Jun 21 12:21:51 2013 +1200

    Give alarm a physical_resource_name which need no id.
    
    This restores previous behaviour, including workarounds for
    circular dependencies.
    
    Fixes bug: #1192814
    
    Change-Id: I33e8e4d7806fb397553944dbd6ebb85b575b9cb5

commit 90203b89d582b1e8ff673ba1a555683307678fb9
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Jun 21 10:18:37 2013 +1200

    Do not refresh timestamp from database on read.
    
    Doing a database refresh on timestamp read is causing errors
    such as:
    heat.openstack.common.rpc.amqp InvalidRequestError:
      Could not refresh instance '<Stack at 0x2c95a90>'
    
    This has only been seen using postgres, possibly because the problem is
    being masked on mysql due to the driver's lack of concurrency.
    
    The database refresh seems to be unnecessary, as there appears to be
    no logic which depends on timestamps being accurate (nor is there
    any timestamp comparison logic at all)
    
    Fixes bug: #1193132
    Change-Id: I22c3c4546a0f44b76a95e473b68b6fbb2e423b90

commit d1673f0c88e33fcefddcdd52ab83c911b89d272e
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Thu Jun 20 10:02:37 2013 -0500

    Unrestricted username length causing error.
    
    When we tried to create a username in keystone with
    a length > 64 characters, an error was being raised.
    Only use the first 64 characters of the dynamically
    generated name in this case.
    
    Change-Id: I5a5f863d721da8d187facb48230aeab251c7d240

commit 0782eb1ba668f63e0a9795c0ca428da70adc32d1
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Wed Jun 19 20:38:38 2013 -0500

    Add VerifyAll to test methods using mox.
    
    Missed this comment in an earlier review.
    
    Change-Id: If9737a03ba003331d0e20288e3bbc09002c6dbdb

commit f236917c45638ff25219dd2832d466059ccfe9d2
Merge: 9c8de87 3415564
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 20 14:13:14 2013 +0000

    Merge "Fix and enable H303 and F403  No wildcard (*) import."

commit fd94427398457601364409f4456c9c093aae78c1
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jun 19 14:27:00 2013 +0100

    Fix BaseException.message DeprecationWarning
    
    https://review.openstack.org/#/c/32154/ introduces a deprecated
    TypeError.message reference, which won't work in python3 and
    causes a DeprecationWarning to be output on >= python 2.6
    
    Change-Id: Ibd11d4ad6b82e96ede8f38fe76112bd71e98c5c9

commit 9c8de875d6c0bca3cb0dce5b441553f727603a8b
Merge: a864766 fee94d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 20 10:30:48 2013 +0000

    Merge "Updated common module from oslo"

commit a864766d78d9b78c10aad6a8537884ec0dcbc886
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 20 16:56:04 2013 +1000

    Fix one of the last stack.state's -> status
    
    Change-Id: I3a246c472371ef6ca4c34f358ebecfe79b9eaa88
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit e0db33b515b4ca59d09ce9a01a87a855127e9b79
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Jun 20 14:47:01 2013 +1200

    Revert "check content type in JSONRequestDeserializer"
    
    For details of the regression this caused see
    bug: #1187882
    
    This reverts commit 2f35c942e34b6c6538a2ae2da3d01b690af3a47f.
    
    Change-Id: Ib739d271f5caf0e8ce26c3b27a3436a20e9e311d

commit d4fababf552b33319828a6bb4a4c2c8443d21b66
Merge: 6d7c84d cf9c45a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 20 01:58:52 2013 +0000

    Merge "Implement attribute schema for resources"

commit 3415564deb83794a94f31989cba8dc195863ab1b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 20 11:52:53 2013 +1000

    Fix and enable H303 and F403  No wildcard (*) import.
    
    F403 is related the message is:
    F403 'from bla import *' used; unable to detect undefined names
    
    Change-Id: I486c0b2fc15a616e3fdf1e7e2eaeae1e45075537

commit cf9c45a40e68d8422290731676aff892afe63bb2
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Thu Jun 13 12:58:29 2013 -0500

    Implement attribute schema for resources
    
    Similar to properties, adds attribute_schema and attributes members to
    Resources in order to facilitate document generation and template
    provider stubs for resources.
    
    Change-Id: Ie858fc71a91078e14af552d8cafe0f2448f5d2b8
    Implements: blueprint attributes-schema

commit 6d7c84dbff57fd39dbb307d676f5b6ccf04a7812
Merge: 2ef73ad 42de0c9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 23:46:15 2013 +0000

    Merge "Introduce a schema for attributes"

commit 2ef73ad6316d716936cc76b14a9fbf0fc243918b
Merge: 8805221 e850789
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 23:46:08 2013 +0000

    Merge "Convert Stack to separate action/status"

commit 42de0c9a3cec897161c145c3d0ae8e10e3b19d5b
Author: Randall Burt <randall.burt@rackspace.com>
Date:   Thu Jun 13 12:41:50 2013 -0500

    Introduce a schema for attributes
    
    Similar to properties, adds attribute_schema and attributes members to
    Resources in order to facilitate document generation and template
    provider stubs for resources.
    
    Change-Id: I5e207360816fbc685c66db68a7fab8afad11bf10
    Implements: blueprint attributes-schema

commit 8805221195a3f6b9e33a791512da9bff27e658f1
Author: Matt Riedemann <mriedem@us.ibm.com>
Date:   Wed Jun 19 12:35:14 2013 -0700

    Restore babel setup config options
    
    Restore the babel configuration values from setup.cfg before the pbr
    change so that you can compile the message catalog using "python
    setup.py compile_catalog" again.
    
    Fixes bug 1192685
    
    Change-Id: I6db624940b7b8017700e8d2bc7ba56ba4295f091

commit 665d2023063d84d734963d70a19eb7fcb633348e
Merge: fe8458b ccba71e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 17:46:43 2013 +0000

    Merge "Add dependency between FloatingIP and RouterGateway"

commit fe8458bbb1cee3ea80c689e0f2cfabe09e4a5659
Merge: a61e390 7a307ca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 17:46:18 2013 +0000

    Merge "Initial provider template uploading"

commit a61e390d6096a3e5ce99fad145324da8deddf475
Merge: ce4e39d 2f35c94
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 17:44:22 2013 +0000

    Merge "check content type in JSONRequestDeserializer"

commit e85078924d6af9f6c7813fb466728113305f809a
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jun 18 18:07:57 2013 +0100

    Convert Stack to separate action/status
    
    Next and hopefully final step in decoupling action/status
    
    This adjusts the Stack DB columns, model and class to be consistent with
    Event/Resource, and split action/status.  This also modifies the both
    APIs to join the action/status to avoid changing the API
    
    Change-Id: Ifbdf254c62cad271b775b88de5b873f4e0b6d736

commit fee94d28e780eb63be2bed608ecaab5750c07267
Author: guohliu <guohliu@cn.ibm.com>
Date:   Wed Jun 19 20:18:39 2013 +0800

    Updated common module from oslo
    
    This patch updated common module from oslo for known issue.
    
    Fixed bug: #1175808
    Fixed bug: #1072917
    
    Change-Id: Ic1de6b786a9d67b39d186e31a37049729d367464

commit ce4e39d615def9f1181242a168445e8958321c27
Merge: 324df1f cb5dfdf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 11:44:56 2013 +0000

    Merge "Detect failed instance creation in autoscaling"

commit 324df1fc17a67a7e922d63ef56e731b3a9d8aef5
Merge: 2d673e5 f226919
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 09:49:45 2013 +0000

    Merge "scheduler: Simplify DependencyTaskGroup interface"

commit 7a307caa7d06d1daef0de043c3426e3b2af8efdb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 19 18:54:51 2013 +1000

    Initial provider template uploading
    
    blueprint provider-upload
    Change-Id: Iee475c6cccaa7ab87c630036cff120f46ab42103

commit 2f35c942e34b6c6538a2ae2da3d01b690af3a47f
Author: Zhang Lei (Sneeze) <sneezezhang@cienet.com.cn>
Date:   Wed Jun 19 16:26:45 2013 +0800

    check content type in JSONRequestDeserializer
    
    Fixed Bug #1187882
    
    Change-Id: I67dc20bddff570e7b9cf43093e06509a20aa9b60

commit cb5dfdf786619ea1d04467774e07c0c4b231ed4d
Author: Thomas Herve <th@rackspace.com>
Date:   Wed Jun 19 09:17:48 2013 +0200

    Detect failed instance creation in autoscaling
    
    Wait for instances to be created sucessfully before adding them to the
    list in the Autoscaling resource.
    
    Fixes: bug #1192125
    Change-Id: Ie8676c23de5a62d3b8b2b4088b67d249ae90ceef

commit 2d673e51473ab9b0771cadb5099ab92a7f8b20ba
Merge: 7d10e72 b0701f6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 18 23:22:17 2013 +0000

    Merge "Support cloud-specific suffixes to server status."

commit 7d10e72f80b21d00cd52fab73a5c9fbf37d234db
Merge: fc588e9 9769750
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 18 23:05:34 2013 +0000

    Merge "Cleanup the doc strings in heat/rpc/client.py"

commit fc588e901aebd8b8b99b8cab4299af739aa8c084
Merge: 9398c5e 95ac80a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 18 23:05:27 2013 +0000

    Merge "API support for Environments"

commit 9398c5e31e57893b6821769abd0a8c68c75f7d84
Merge: e8ea3d1 c28f12d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 18 23:05:19 2013 +0000

    Merge "Make template_format.parse usable by environments"

commit e8ea3d1e25c585971e0b6c7a7e81794dbe57b571
Merge: 95753bc ac315ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 18 23:05:12 2013 +0000

    Merge "Remove unused parameter.user_parameters()"

commit 95753bcdf266c8d036910415a1988c21953c970e
Merge: 3a980a0 ab47610
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 18 23:05:10 2013 +0000

    Merge "Use the Environment from within the engine"

commit 3a980a0ca083a0c6aca5aa1e03b2f299446e2358
Merge: ed2e19f d8b024b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 18 21:03:56 2013 +0000

    Merge "Add a Fn::Split function to aid provider templates"

commit ed2e19f76b544a53b6ecad4c80a8b1baac9ded5c
Merge: d3e71b1 2630356
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 18 20:18:19 2013 +0000

    Merge "suppress and log API internal exceptions"

commit b0701f6c22e3bda1e588893f015572c0379d0c87
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Jun 17 17:34:33 2013 -0400

    Support cloud-specific suffixes to server status.
    
    Some clouds, *cough*HP*cough* append extra data to their
    status strings. Such as: BUILD(scheduling) or BUILD(networking).
    We don't really want to be on the hook for keeping a list of those,
    but if we just grab the bit in front of the parenthetical, we should
    be able to tell state sensibly, even when people are being weird.
    
    Change-Id: Idaf079d6090db50c9041f398a257b427d63ff48d

commit d3e71b1528dc3a8f45e112e92d7c08b1e8c11d19
Merge: a780bef 26812e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 18 18:12:46 2013 +0000

    Merge "scheduler: Improve task descriptions in debug logs"

commit a780bef9c396ffa6cd0a6e433bac5447a320c9fb
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 17 15:54:51 2013 +0100

    autoscaling fix LoadBalancer reload static resolve
    
    Since https://review.openstack.org/#/c/31083/ we're using the
    Resource.update() method to update the LoadBalancer, which requires
    the resource snippet to be statically resolved (as is done in
    parser.Stack for stack updates)
    
    Fixes bug #1191705
    
    Change-Id: Id2017a912472ddb48245682c5b6392cbcb9e4c60

commit 40c4b44d02717b2aa8f420ca516ce662d2a1b978
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jun 18 10:41:40 2013 +0200

    Return None for physical resource name during validation
    
    During template validation, the resources have not been stored in the
    database. Therefore any resources that return self.physical_resource_name()
    in either FnGetRef() or FnGetAtt() would cause assertions whenever either
    of those functions were called during validation. Instead, return None from
    physical_resource_name() in this phase, as we do for other data that is not
    available yet during validation.
    
    Fixes bug #1191931
    
    Change-Id: I1a5b17557ae1ca2600fb930e74eb5248c82e0326

commit 388fc1bbca8112667948010600f372af095071a7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jun 18 10:25:52 2013 +0200

    Standardise resource names in Invalid Attribute errors
    
    These should always refer to the resource name in the template (i.e.
    logical resource name), and never the physcial resource name (since these
    errors necessarily occur during validation, before any physical resource is
    created).
    
    Change-Id: I6cf6625cf32a90acb27adc6348695c086dc5e119

commit ef5b44f083c4b127e64d7cf51a76c3c22a471ff4
Merge: ac4cf2b 2e9b9b9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 18 03:11:00 2013 +0000

    Merge "Add InstanceId property to EIP resource"

commit 2630356a56860ab38026a46aef9622009fc9e4cf
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Fri Jun 7 23:01:02 2013 +0800

    suppress and log API internal exceptions
    
    add a context manager to handle exceptions generated by API
    implementation methods or their decorators
    
    Fixes bug #1187881
    
    Change-Id: I4bd75e1e13f8327aaf2283380bf165a57a11ed8c

commit ac4cf2b7a4ba1268c49783270c47c45a33f0e5b1
Merge: 017f35b 6d7c59a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 18 01:05:13 2013 +0000

    Merge "engine : abstract state-transition logic"

commit 017f35babfad41d2757ed0efd47c1f460e0ad338
Merge: d25c1e9 7ef1344
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 18 01:05:09 2013 +0000

    Merge "Convert Resource to separate action/status"

commit d8b024b370cd91e62c43000f0184898ce0c07904
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 18 10:15:41 2013 +1000

    Add a Fn::Split function to aid provider templates
    
    This needed to convert a parameter in CommaDelimedList into
    a property of type List.
    
    part of blueprint provider-resource
    Change-Id: Id77a2c6be47427360a2be89ca1fea3c097807bac

commit ccba71e38adff7a57ba2e471378cadd0421793f3
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue May 21 13:21:22 2013 +1200

    Add dependency between FloatingIP and RouterGateway
    
    When a template has a FloatingIP and a RouterGateway on the same
    external network, there is an implicit dependency on create where
    the gateway must be created before the floating ip.
    
    This is implemented by overiding add_dependencies in FloatingIP
    and looking in the stack for RouterGateway resource to depend on.
    
    Fixed bug: #1182266
    
    Change-Id: I40f281e5bf2a27280d328fe11d32e6404f412a79

commit d25c1e94edff5ce0350b73037a7b3da3dfc70eec
Merge: afbd6c9 b0585a6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 17 17:01:50 2013 +0000

    Merge "Initial Environment class and test"

commit 2e9b9b90316e1459da81d182b1ddad0edf7f1f63
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Jun 17 12:19:49 2013 -0400

    Add InstanceId property to EIP resource
    
    This also changes the InstanceId property for an EIPAssociation
    to not be required, which was necessary for testing and is inline
    with AWS documentation.
    
    Change-Id: I49dd506309fe6a38df6727bca7f6bbebd45fba3f
    Fixes: bug #1164864

commit f22691904ff4459629daf842390fd6fea94b049e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jun 13 20:03:27 2013 +0200

    scheduler: Simplify DependencyTaskGroup interface
    
    Instead of passing a function that takes one argument and returns a task
    that takes no arguments, simply pass a task that takes one argument.
    
    Change-Id: I73d5f137d5db492c09e6887f80e7e759734c211f

commit 26812e34bd9460a63aebdcbdc1ca27b243f91660
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jun 17 17:42:04 2013 +0200

    scheduler: Improve task descriptions in debug logs
    
    Tasks that were simply defined as ordinary functions (not methods) were
    identified by their repr() in the logs, which is only really desirable as a
    last resort and for objects (where the __call__() method is the task). Use
    the function name instead.
    
    Change-Id: Ie34a3602deb968979118b0961bcddf226cf5983f

commit 9769750ac0aab3dfa91dddd52332405c8830d475
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jun 3 13:05:27 2013 +1000

    Cleanup the doc strings in heat/rpc/client.py
    
    Change-Id: Ia760937f729a1aa17d84c48054cb143bf6891bfd

commit 95ac80a0d5e30c068795a7f08fadc8800df73b33
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jun 17 14:39:19 2013 +1000

    API support for Environments
    
    Support "Environment" section in the create/update body.
    We the roll up the parameters and the environment and send
    that as json using the rpc "params" argument. So no changes
    to the rpc layer are needed. The engine knows how to deal
    with both formats in the Environments class.
    
    blueprint envirnonments
    Change-Id: I6d6085d5c052a5f9115ecd46891b00d2fad4d1db

commit c28f12d94ffd15886910357539a4d9b7bc52cd07
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 13 12:24:02 2013 +1000

    Make template_format.parse usable by environments
    
    (environments don't want template sections)
    
    blueprint environments
    Change-Id: I68ac0b8fb0889d245ace4d0ea8d298460c4c1b1a

commit afbd6c9d999b79f9641ab886e284e720128f1dfb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jun 17 12:24:50 2013 +0200

    Use PhysName for testing Swift container names
    
    Change-Id: Icc000a9235fcd9ee810581b932ded73319decfee

commit a38a8e73dd9aed35d2ddd2ddff6505e4bb791699
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jun 17 12:24:50 2013 +0200

    Fix bizarre Swift DeletionPolicy unit tests
    
    If something shouldn't be called... don't tell the mocks to expect it to be
    called. We will get UnexpectedMethodCallError if it is.
    
    Change-Id: I61a7b77cb273b42177a37efa98fc62fd69770545

commit 560804e42852eb8fb9dd2958243135545f6b4d0d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jun 17 12:24:50 2013 +0200

    Use physical_resource_name() for Swift containers
    
    This returns names which are of the same form, but which are based on the
    resource id (and hence are stable).
    
    Change-Id: Id091bdef74e07fc0df0e6e4914dae8af8b29384c

commit ac315ce361c3537af1b5fa399df221803e63147b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 30 11:51:17 2013 +1000

    Remove unused parameter.user_parameters()
    
    blueprint environments
    Change-Id: I21246a62f82064120d6ebd4c5e1c607f43df55bc

commit ab4761046854f5aa97754a18025c8b1194a3decf
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 14 20:56:02 2013 +1000

    Use the Environment from within the engine
    
    at this point the concept only exists in the engine, the
    api and client changes will come in later patches.
    
    blueprint environments
    Change-Id: I3e208bb72a04bf275bead2aec89006cf680b501b

commit 9e2ecf756815d69e5b7fe851f4c38fa4a23e9661
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jun 17 12:24:49 2013 +0200

    Use physical resource names with a short_id
    
    The short_id is a random, but stable, 12-character alphanumeric ID.
    
    This will allow two resources of the same name to exist concurrently. That
    is necessary for resources to be replaced during an update without
    interruption.
    
    Change-Id: If32904a47c6f8fb651e317ce91f2a04f6eadcc0b

commit b0585a6dadbeb8de76a8440d4b4d70eb17fd05d4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 13 13:59:08 2013 +1000

    Initial Environment class and test
    
    This implements the "resource-registry" and "parameters" section
    I am holding off on the "properties" section until we really
    know we need it.
    
    blueprint environments
    Change-Id: Ib6e9e5cd1c68c255dc048bdde21a6b3e1dc54243

commit d0cdccace0240ce116a3900fe45cb60c5374e38a
Merge: 157223c 8f6f397
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 17 00:39:34 2013 +0000

    Merge "Remove unused python-memcached from requirements."

commit 6d7c59af00c05c157728d22d20fde3f540295d63
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 10 16:27:18 2013 +0100

    engine : abstract state-transition logic
    
    Refactor to abstract the handle_create/check_create_complete
    logic, so it can be reused without lots of duplication for
    other action transitions
    
    Prompted by review comments from:
    https://review.openstack.org/#/c/31982/2/heat/engine/resource.py
    related to blueprint: stack-suspend-resume
    
    Change-Id: Idb18913ef6ff700b63d5ec6d340d2353fc2294b7

commit 7ef1344d0a978950035a17ec3fd8746dd57a2392
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 14 11:02:09 2013 +0100

    Convert Resource to separate action/status
    
    Next step in decoupling action/status
    
    This adjusts the Resource DB columns, model and class to be consistent
    with Event, and split action/status.  This also modifies the both APIs
    to join the action/status to avoid changing the API (we can't change
    the CFN one anyway and it's desirable to avoid breaking compatibility
    with the ReST API, or needing a version bump for this simple change)
    
    Change-Id: I02b56eb14045a058e67b9764d386530d555c339e

commit 157223c4e9ed12f4137a7e05c1f493e35f6a59fa
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 14 12:31:23 2013 +0200

    Store stacks in the database when running unit tests
    
    If stacks are not stored in the database before they are create()'d,
    anything that refers to a stack (e.g. Resources and Events) cannot be added
    to the database either, and we get numerous errors in any output logs.
    
    Change-Id: Icd1012455d413aad617486c138fd4507e391bc7b

commit 84accc898c4415bec32567c5b72186cf44a0506f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 14 12:31:22 2013 +0200

    Unit tests: Create User for testing AccessKey
    
    An AccessKey resource is not independent of its associated User resource,
    which must be present in the same stack. Consequently, we need to create a
    real User resource that is a member of the same stack in order to test the
    AccessKey in a realistic environment.
    
    Change-Id: I4b732c93fe9823552baf65c3f9c87c8ebab061a4

commit f207ad06b82c470054ae3cb72f965921f65f09d2
Merge: 440ada0 3628353
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 14 09:59:13 2013 +0000

    Merge "Make resource ids UUIDs in the database"

commit 440ada0c613b058a0098426058af80878c86f267
Merge: 28528ba 6e0807c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 14 08:53:26 2013 +0000

    Merge "Gate on H703"

commit 28528bab5d3e4f8d0faec31fa27d6241f3f94bfa
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jun 13 20:03:26 2013 +0200

    Unit tests: Don't use mox to stub uuid.uuid4()
    
    The wait condition unit tests require a fixed stack ID, but we don't want
    to permanently stub out uuid4, since there are other potential uses of
    uuids. Instead, just do it for that one operation.
    
    Change-Id: Ib8b7107a5750caf67aa8905377c2755bf405fa3f

commit 36283537e00d7561278f78b467b98832903f2d08
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jun 13 20:03:26 2013 +0200

    Make resource ids UUIDs in the database
    
    Change-Id: I3068e9e818f19994cc3aaecc34845d0d6aac0dfb

commit 7eeb0b4882cec6bcccc4353a7da3ba59adbafca2
Merge: 739e719 88f8b83
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 13 14:52:15 2013 +0000

    Merge "allow using image uuid for instance resource"

commit 739e71913ae11b08c90711b8d633b339d5d7ea6e
Merge: 5206990 7b9c231
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 13 12:50:52 2013 +0000

    Merge "fix an CFN API and AWS error mapping"

commit 5206990f9a4c921b0b1d3924cd5295f948d93b47
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jun 13 11:19:32 2013 +0100

    Convert Events to separate action/status
    
    First step in decoupling action/status in Resource
    
    This adjusts the Event DB columns, model and class to split
    action/status, but in order to be backwards compatible we set the action
    to None, which means we can do the right thing in the CFN API, and
    resource_status still maps correctly to what is expected in
    python-heatclient (which will need to change after the Resource
    action/status split happens)
    
    Change-Id: I261d47d2a3fdb3cdc2a8aaf6c159763f4636f633

commit a234b3a3d065acb245636510eaab0e1b1cbffd72
Merge: 42de764 9db6e14
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 13 05:32:43 2013 +0000

    Merge "Use Python 3.x compatible except construct"

commit 88f8b83004c49c1fdb042d35e2907b7798648bdd
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Fri Jun 7 10:12:30 2013 +0800

    allow using image uuid for instance resource
    
    make the instance resource accept image uuid for its ImageId
    properties in addition to unique image name.
    
    Fixes bug #1186410
    
    Change-Id: Iae7705e73fe223d80e85d261a04f88f8c5207487

commit 7b9c2312cd323c0cfc80f86c0385ff2c9f8e5daf
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Jun 12 21:47:05 2013 +0800

    fix an CFN API and AWS error mapping
    
    StackExists should return AlreadyExists, not InvalidParameterValue
    
    Fixes bug #1188473
    
    Change-Id: Ia969cddc1b61caa13f4f70bcc29f3160595a779b

commit 8f6f397505afceeb18fa5d6b14b53719d8e2983a
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Jun 12 13:58:27 2013 +1200

    Remove unused python-memcached from requirements.
    
    Change-Id: I6da8607203d15275a05faa7f7ccc570c31f86762

commit 9db6e14a4597b54a90b79abf7fae4af40d214433
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Wed Jun 12 22:55:03 2013 +0200

    Use Python 3.x compatible except construct
    
    Python 3.x deprecated excecpt x,y. Use except x as y,
    which works with any Python version >= 2.6
    
    Change-Id: I264049ee41e75bcedea86adf7c2011c343f47ddb

commit 42de764f9a9300f54af145332af13229e8be121f
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Wed Jun 12 22:54:05 2013 +0200

    Add bin/heat-manage to flake8 checks
    
    Change-Id: I917e5b0aa571f2fced7df6a4818f32ce4b5f1561

commit 6e0807c225f93fac31f1f8599fa58f52527a6c66
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Tue Jun 11 20:17:18 2013 +0200

    Gate on H703
    
    Fix fallout by avoiding multiple positional arguments.
    
    Change-Id: Ie25f7b9041fa5df85a244cb237124440bb7d8e32

commit 580c554c19eaa001e432458aa6037def127718ca
Merge: 4d58e84 28a0e8c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 12 14:10:23 2013 +0000

    Merge "scheduler: Fix an issue with wrappertasks and exceptions"

commit 4d58e84ab3be5ba99967f8a2c1c223cf23dc6aa5
Merge: 843d127 f4df0b1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 12 10:56:52 2013 +0000

    Merge "Fix various Sphinx errors/warnings"

commit 28a0e8c900096354b2fa8ff1ed9b4008e088c3d3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jun 12 12:48:25 2013 +0200

    scheduler: Fix an issue with wrappertasks and exceptions
    
    Using a 'for' loop on a generator is incompatible with calling throw() on
    it, because the latter causes the generator to advance to the next yield.
    Consequently, ignoring an exception from a subtask in the parent task would
    cause the next subtask to be skipped.
    
    This issue does not affect any existing code to date.
    
    The inner and outer loops should each be equivalent to the definition of
    "yield from" (http://www.python.org/dev/peps/pep-0380/#formal-semantics) in
    PEP 380, with the following simplifications:
     - Assume that the throw() and close() methods exist
     - Don't support send()
     - Don't support return values (these are Python 3-only feature)
    
    Change-Id: Ie29e68d4505f667f408b67b365c37511f73372fe

commit 843d127d0b6402539ed6cd654a59ef111482cee6
Merge: 7740c6c 74e2966
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 12 09:15:47 2013 +0000

    Merge "Remove explicit distribute depend."

commit 7740c6c4a821719311f8e675f2dfa164b510c446
Merge: 66a0856 8305f72
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 12 08:37:25 2013 +0000

    Merge "Fix H702 errors and enable them"

commit 66a08568010bd05de39fd087bbdc20fc1c5fbfcf
Merge: 615ed34 70990d3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 12 07:54:30 2013 +0000

    Merge "Key error when auth in standalone mode"

commit 8305f72ef2aee2d94267dd2f0268245fc6a3eb64
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 12 08:43:37 2013 +1000

    Fix H702 errors and enable them
    
     - Formatting operation should be outside of localization method call
    
    Change-Id: Icedbb98e46a52b53db7143a4111da13466a26847

commit 615ed34e4fc56534110d93b88799ec970857b50f
Merge: 56d5fb9 ba40d0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 11 22:46:59 2013 +0000

    Merge "Add descriptions of the pep8 checks"

commit 74e29662ab4a4948be3dc099fab2ab34ddbf7f83
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jun 11 11:39:32 2013 -0700

    Remove explicit distribute depend.
    
    Causes issues with the recent re-merge with setuptools. Advice from
    upstream is to stop doing explicit depends.
    
    Change-Id: If390cdf328b361d0f76315083f3e6da97bbe4b2f

commit 70990d3106808cf9f73a35815687b073500e21e8
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Tue Jun 11 10:18:10 2013 -0500

    Key error when auth in standalone mode
    
    Fix a key error caused from the response of authing
    in stand alone mode. The keystone docs indicate that
    the schema for a response user name is ['user']['name']
    rather than ['user']['username'].
    
    Change-Id: I9ac94feeef8f9f2dedaa3842f64a3491e701e199

commit 56d5fb9f83b647d27a00d56cb4dad8aad9e1169f
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 10 13:34:57 2013 +0100

    engine : remove GreenletExit workaround
    
    Both heat and oslo now require the version of greenlet containing
    the fix (greenlet>=0.3.2) so we no longer need this workaround
    
    Change-Id: I42af8e020f08480dda08f4b4879c2840e741ea59

commit 9db6e2a77fbcc2614d46ba2e883668a8ad144794
Merge: c77d4d1 3af83c9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 11 11:40:42 2013 +0000

    Merge "Adds possible topdir to python search path"

commit ba40d0efb4149b39282e502991fd44cb96b6f486
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 11 13:05:51 2013 +1000

    Add descriptions of the pep8 checks
    
    Change-Id: Ida2be020b8ed7ea047e11c4b8fa2f5154a444977

commit c77d4d1c15cf1ab99644e97f10d30f437d9846c8
Merge: 0a04286 fb24608
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 11 00:30:14 2013 +0000

    Merge "Return empty string when Fn::Select target is None."

commit 0a04286b7c752c75cb91534fc7da06e8e604f4b7
Merge: 9f40fa3 83cd934
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 11 00:30:11 2013 +0000

    Merge "Add Fn::Replace template function."

commit f4df0b186aa0dd95e23d721251e30a08d4dc156b
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Mon Jun 10 23:49:40 2013 +0200

    Fix various Sphinx errors/warnings
    
    Change-Id: If34202291b5605302baf47c210b07ffc4ffad094

commit 9f40fa3e618c4e20c6b3240b437df787f1b7aa24
Merge: 309e3fb 4fed4a0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 10 10:24:01 2013 +0000

    Merge "Initial mariadb support"

commit 309e3fb670d03281b3aad7d8e56bfe870c6eeca7
Merge: a2df351 ede21a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 10 10:23:02 2013 +0000

    Merge "Use Python 3.x compatible octal literals"

commit a2df351aeece2006c851230818902b9d6ac1d1b3
Merge: e83dbc1 ea6e951
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 10 09:21:17 2013 +0000

    Merge "raise an UnknownUserParameter exception when receiving an unknown param"

commit ede21a2688241db05a48b0c7e6f810cd8969b7e4
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Mon Jun 10 09:46:34 2013 +0200

    Use Python 3.x compatible octal literals
    
    Python 3.x deprecated the 0700 construct. 0o700
    works with any version of Python (>= 2.6 tested)
    
    Change-Id: I47fcb79804b75437e6cf4ce966fbfdc05fce26cd

commit 3af83c94299a8222a3ecc61aeffdd0b845d05504
Author: Jianing YANG <jianingy@unitedstack.com>
Date:   Mon Jun 10 15:45:43 2013 +0800

    Adds possible topdir to python search path
    
    Change-Id: Ide47656071c6d17482b1e4ec0727ce316033e702
    Fixes: bug #1189354

commit fb246087fd660241f5d5095b4a456f7a1b76a9ba
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Jun 10 11:44:45 2013 +1200

    Return empty string when Fn::Select target is None.
    
    This can happen when a resource is not in the required state
    to resolve its FnGetAtt.
    
    Change-Id: I4d104b3577fbd94b920ff172c00d60914d7acd45

commit 83cd934beb2f8657f59d2e7219b71f8b8df5a657
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Jun 5 13:41:36 2013 +1200

    Add Fn::Replace template function.
    
    This is implemented with python str.replace
    
    For yaml templates, this should be used as a better alternative to
    Fn::Join: ['', [...]]
    
    For json templates, the following common pattern:
    "Fn::Join": ["", ["line 1\n", ... "line 2\n"]]
    could now become more maintainable as:
    "Fn::Replace": [{...}, "Fn::Join": ["\n", ["line 1", ... "line 2"]]]
    
    Implements blueprint template-string-function
    Implements blueprint bash-environment-function
    
    Change-Id: Ie4817b1d98dd6d6390e086da9b582d33415a0d9f

commit 4fed4a028aa7c897972bcf44a0f447b7a7e450b8
Author: Attila Fazekas <afazekas@redhat.com>
Date:   Sat Jun 8 22:38:04 2013 +0200

    Initial mariadb support
    
    mariadb only differs in the package name from the mysql,
    an already installed mariadb should not cause hangup in a
    devstack installation.
    
    Fixing Bug 1184722
    
    Change-Id: I3b9d02b703e49044999ff1b9f1195ffcaf1d0cec

commit ea6e95189f623911ed63c613055ad5b2baa647f8
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Wed Jun 5 16:41:14 2013 +0800

    raise an UnknownUserParameter exception when receiving an unknown param
    
    add some validation logic to Parameters, so that when an invalid param
    is passed in an exception will be raised.
    
    Fixes bug #1186790
    
    Change-Id: I8aece556d8fc5cd5533f4baf041e345bdc5722ec

commit e83dbc1117b1c2b282907ec04c046b0d15efdf8f
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Fri Jun 7 15:44:23 2013 +0200

    Enable H403
    
    Fix the only two places where it triggered alongway.
    
    Change-Id: Ib76e0e072c2d51a9c782f37d5f5df964f2db968f

commit 760e1b151ae24e4609124f5fbb17dd54adea3c2f
Author: Christopher Armstrong <chris.armstrong@rackspace.com>
Date:   Thu May 30 20:54:25 2013 +0000

    get rid of no-op __init__ methods
    
    There were a lot of __init__ methods that simply called their super()
    with nothing else.
    
    Change-Id: I6771912adf81f145d09f950c57d219bd77789822

commit 23768d8080d24352639a3d396b828b79ccaafdf0
Merge: ea3d648 4bc1bcb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 6 12:59:22 2013 +0000

    Merge "Make autoscale not dependent on loadbalancer impl."

commit ea3d6483818af8d7a32900fb11762831178f349d
Merge: f5c8fb5 c65c25c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 6 09:37:18 2013 +0000

    Merge "Rename functions which should not be run as tests."

commit f5c8fb535fb3fbe02a37db4b91dabb582fcb96ae
Merge: eb52195 6ba1916
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 6 09:07:04 2013 +0000

    Merge "Fix instance creation when a network with no subnet is used"

commit eb52195858ac75d6eea02c88169add6243c161b4
Merge: c19a3de fd1f212
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 6 08:46:56 2013 +0000

    Merge "flake8 F812 list comprehension redefines fix."

commit c65c25c73d8e0749d5171bbc76a15598d008dbf9
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Jun 6 15:34:45 2013 +1200

    Rename functions which should not be run as tests.
    
    These function names confuse some test runners which results in them
    incorrectly being run as tests.
    
    Change-Id: I0780c7d6dcea5019771b42fa5ffb2ebe215c1e20

commit fd1f2120474992447c8092c7b725636cce16073b
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Jun 6 15:30:40 2013 +1200

    flake8 F812 list comprehension redefines fix.
    
    This warning is given from the following version of flake8
    2.0 (pep8: 1.4.5, mccabe: 0.2.1, pyflakes: 0.6.1)
    
    Change-Id: Ic2ac3be2b76aa2d9e8d0f306d1579b195a998b68

commit c19a3deb649b6e4c5ea933e7c0ad157f4049d185
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Jun 4 16:40:12 2013 +1200

    Only call FnGetAtt if resource is in acceptable state.
    
    This will give resource type authors some certainty on what error
    checking their FnGetAtt methods will require.
    
    Fixes bug: #1184794
    
    Change-Id: Iec456075c14cd609cf9607f07bce23e4c6b33c0c

commit 4c556ae9334ab3edda1c57c022d75ec7013c4b7d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 31 12:52:30 2013 +0200

    Make Fn::GetAtt add a dependency
    
    This will ensure that resources which get attributes from other resources
    are not created until the latter resources are available.
    
    An audit of all the templates in the heat-templates repo revealed that in
    only one case did this cause a circular reference, and it was the template
    that appeared to be incorrect (it has since been fixed).
    
    Change-Id: Ibd51acdda55c24f665c5ca887040f3564d952c0e

commit bc6915260e50dab4e879d953c1ef5c38a2d95e54
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Jun 6 09:41:44 2013 +1200

    Use - instead of . for physical_resource_name delim.
    
    Avoiding using . means that instance hostnames are unique within the stack
    (and within the tenant).
    
    This solves 2 real-world use cases:
    - tripleo issue, as described in bug: #1184713
    - OpenShift template resorts to setting the hostname to ec2_instance_id
    
    This may have an impact on users who are scripting to assume . delimiting,
    however this will only affect newly created stacks after this change is
    deployed.
    
    Fixes bug: #1184713
    
    Change-Id: I5a8eb358ea9c52162eb9263b9f9e6dcf750d787b

commit 4bc1bcb608379cc396113a03f2ae37ce78f9049c
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Wed Jun 5 14:54:41 2013 -0500

    Make autoscale not dependent on loadbalancer impl.
    
    Autoscale was calling reload on a resource, which is not part of the
    resource interface. Autoscale has been modified to use update.
    
    Change-Id: Ifb17c9def7e560d96e26308db67b4ee3f93a2b9f

commit 1c29e67c299b3e53d339b2d2426007847917579a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jun 5 10:15:56 2013 +0200

    Use a physical name matching class in unit tests
    
    This gives us the flexibility to change the format of the physical resource
    name.
    
    Change-Id: Ie36453345149291fe04d89b52d7966816e03cda6

commit 25cf26b587a1ad9cec14ec415b479f32193416c3
Merge: 7ae81b1 9b785de
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 5 04:20:58 2013 +0000

    Merge "Add Fn::Select template function"

commit 7ae81b10224e1b42ce0c767a7e38524d708742e7
Merge: c981c55 85b3633
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 5 02:20:41 2013 +0000

    Merge "For Fn::Join, replace None items with an empty string."

commit 9b785dee9fa06e6f6efba4d1ae8f34505d0c5c3e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 5 09:37:19 2013 +1000

    Add Fn::Select template function
    
    It also knows how to lookup keys in dict's too.
    The strings can be a serialized json blob too.
    
    blueprint fn-select
    blueprint fn-mapselect
    Change-Id: Ie40afa47c1f0a699abb852bc22388f3f675172e6

commit 6ba1916e31e24d5b28503f527e0a2789c0d617ad
Author: Simon Pasquier <pasquier.simon@gmail.com>
Date:   Tue Jun 4 16:42:50 2013 +0200

    Fix instance creation when a network with no subnet is used
    
    It is possible with OpenStack Networking to create a network with no
    subnet attached to it.
    When creating an instance associated to such a network, the engine would
    raise a 'list index out of range' exception because the instance has no
    IP address on the network.
    The issue would also happen with a loadbalancer referencing the same
    type of instance.
    
    Change-Id: I6122efb90877d8020added44aee8802eb8a80297
    Fixes: bug #1187023

commit c981c55d3216e85c40d2b85518d9158d45825bcb
Merge: 3ad1399 5858b94
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 4 09:35:43 2013 +0000

    Merge "Relax lxml version requirements."

commit 85b363342c0d3a25155c500b42810f9ef9d82a22
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Jun 4 17:25:42 2013 +1200

    For Fn::Join, replace None items with an empty string.
    
    Currently, attempts to join lists with None items results in an error.
    
    This change is required for the next attempt to fix bug: #1184794
    
    Change-Id: Ib599eeb21b7325ff797768100f1556a424a8bde9

commit 5858b94ef254c0b3fa3b7a0ed3e301d53492caae
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Jun 4 14:45:59 2013 +1200

    Relax lxml version requirements.
    
    This was preventing devstack from starting on Fedora 18 due to the
    package python-lxml-3.2.1-1.fc18.x86_64 being too new.
    
    This change is aligns the lxml rule with the requirements project.
    
    Change-Id: Idd3697596dcefb830d60f8e44171b8c50e78178a

commit 3ad139958fcf7e75f24d040bfbfbb83761862bb3
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 3 23:57:33 2013 +0100

    tests : fix cut/paste test name shadowing
    
    Fix test class duplication
    
    Change-Id: I4ff21b60ad6c70d8d4563db54c9afd83f59d6957

commit 73a9d36bb6c8494b58e6c98fd9d7fd198700899a
Merge: 748c42b df2e677
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 3 18:31:11 2013 +0000

    Merge "Handle metadata updates during stack creation"

commit 748c42b9b345409e2d11235173fb23519e19e6b6
Merge: 9d6f8a5 1a41b9a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 3 08:23:51 2013 +0000

    Merge "Log at DEBUG level in unit tests"

commit 9d6f8a5253bfe0c684aaff2816d8054c8473d997
Merge: f4ca218 9b74b08
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 3 01:54:30 2013 +0000

    Merge "Fix Hacking H304 Warnings"

commit f4ca2185744e549bc0960e823d4fb6160fd8863b
Merge: 2135963 8ac2352
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 3 01:54:08 2013 +0000

    Merge "a minor fix to volume.py"

commit 8ac235288bfab4b9311c50599d861fc5df53fe33
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Fri May 31 17:41:30 2013 +0800

    a minor fix to volume.py
    
    There seems a typo with the exception name and the comment.
    
    Change-Id: I5c0abe48c81a69e4b879b080236899031bb40e97

commit 9b74b089a7f8275f58ff8e6e31d3fed81e045c8a
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Sat Jun 1 15:39:46 2013 +0200

    Fix Hacking H304 Warnings
    
    And also enable it permanently.
    
    Change-Id: Iae319ecaee86049bc25330e25c4f672e3b158851

commit 213596360727a83497084981fda015d4dcff666e
Author: Thomas Herve <therve@gmail.com>
Date:   Fri May 31 14:19:56 2013 -0700

    Fix an intermitting failure in test_metadata_refresh
    
    Given that resource creation can happen in parallel, the call to
    check_create_complete may not follow the call to handle_create, so mock
    those without checking the order.
    
    Change-Id: Icf40f7339dc4c6e885c4a42f3a2c3f546f14c08d

commit 1a41b9a7a34547620e4854a6bdf1f6b93fb0041d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 31 22:18:36 2013 +0200

    Log at DEBUG level in unit tests
    
    By default, only INFO and higher severities were logged.
    
    Change-Id: I5791cd163a54224b798bcc2987ac792b3b7b4030

commit 027e91c980eb581ca91cc1366390f68a9527f5eb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 31 21:34:36 2013 +0200

    scheduler: Fix inifinite loop for no-wait tasks
    
    When a task run by a DependencyTaskGroup completed immediately (i.e. it
    was marked as done right after calling start()), the corresponding entry in
    the dependency graph was never removed. As a result the DependencyTaskGroup
    would continue running forever (or until it timed out).
    
    Fixes bug #1186389
    
    Change-Id: I9715b54a61d1c3adc22403bc39f8673306bffead

commit 15fab1b0ed1321d164ea01af572b6cc859438789
Merge: 9c715c9 cbe4cdc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 31 13:34:12 2013 +0000

    Merge "add error flow tests for volume detach"

commit 9c715c9585c71bdad076d1654c0e8a4e09d4c037
Merge: 8843e74 3cf1090
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 31 13:32:58 2013 +0000

    Merge "Clarify a comment which says we require KeyName - which is incorrect"

commit df2e6779bab71da06c00dd78d3732a756ce9c6ad
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 31 12:52:30 2013 +0200

    Handle metadata updates during stack creation
    
    Don't try to recalculate the metadata on an instance that hasn't yet been
    stored in the database.
    
    Fixes bug #1185530
    
    Change-Id: I39f2733e2ba4730ea05a4a50962cb30f044ef752

commit 8843e7490b4ca4da6e5155c730600f44628b3abf
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 31 12:39:08 2013 +0200

    Create nested stacks in parallel
    
    Use check_create_complete() to advance the nested stack creation, so that
    it can occur in parallel with other resources in the parent stack.
    
    Implements blueprint concurrent-resource-scheduling
    
    Change-Id: I841b4c93b257409eecd0d2a43b35d9bee114ab87

commit 03a5707849de32141f89aebb34b464a19e9db246
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 31 12:39:08 2013 +0200

    Create stacks with a co-routine
    
    This will allow nested stacks to be created in parallel with other stack
    resources in the future.
    
    Change-Id: If1817bddcea50fdd7b640dee5b5d12257aada651

commit 17e15a638d877578b26dd59240d53b4e615455df
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 31 12:39:08 2013 +0200

    Implement timeouts for nested stacks
    
    This also means that if no default is specified, nested stacks will not
    time out (previously they used the default timeout of 60 minutes). Of
    course, like other resources, creation of the nested stack will stop if and
    when the parent stack times out.
    
    Change-Id: Ibd55c32d63e971f79319ed40321fa4be52b65419

commit 16c5289841fc716d936df9dc58b93ec941ad0326
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 31 12:39:08 2013 +0200

    Allow stacks to be created without a timeout
    
    This should be the default for nested stacks, rather than the default
    timeout of 60 minutes for stacks created through the API.
    
    Change-Id: Iacee6eaf8f345e506b417e776f696db6b11bbf20

commit cbe4cdcf29e18130e9860e9d4db45d802e51e46b
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Fri May 31 10:56:18 2013 +0800

    add error flow tests for volume detach
    
    engine.resources.volume.VolumeAttachment lacks tests for some
    exception flows
    
    Fixes bug #1183239
    
    Change-Id: I3d84fadb1ff60c622fbfbd634e003aaab382b405

commit 3cf1090c7709a5cb2933ef083ba431f0ffca9ae7
Author: Steven Dake <sdake@redhat.com>
Date:   Thu May 30 17:37:41 2013 -0700

    Clarify a comment which says we require KeyName - which is incorrect
    
    The Nova create API requires a name, image, and flavor.  The key_name
    is not mandatory.  Possibly in AWS InstanceType (flavor) is not
    mandatory but it is with Nova.
    
    blueprint native-nova-instance
    
    Change-Id: I6f5a77d7999ea4d8e91402ae215179b982a947f6

commit bc635e65a5a163245a8366e650a3615e2a600c3c
Merge: 74e8a23 d87f68c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 30 10:23:07 2013 +0000

    Merge "Add a separate Template class for the HOT format"

commit 74e8a238d343da283327a8cc2a7ababcc539e223
Merge: e5cd082 9ebf853
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 30 06:38:40 2013 +0000

    Merge "Clean up DB migrations when running unit tests"

commit e5cd08258a0df1a3cc7f4ada22c9d9ed27b408b1
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 16 09:28:24 2013 -0700

    Add CONTRIBUTING.rst file.
    
    We don't use github pull requests, but we'd like to make that clear
    to people if they show up at github and try to do one. github will
    display the content of this file on the pull request submit form
    if it's there.
    
    Change-Id: I25e5b65b02244e100da4e5717ded09fcc0f33741

commit 9ebf853c5db80e43d94660c37304ef626ea1c69e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 29 09:25:30 2013 +0200

    Clean up DB migrations when running unit tests
    
    When doing development work, all kinds of issue can result when moving
    between versions of the code that have added/removed DB migration scripts
    if the compiled .pyc files are left behind. To save the need to do this
    manually, remove all of the .pyc files when the unit tests are run.
    
    Change-Id: Ia4bc889edeeed499e5fc2172d5f7c1b4e693a27b

commit 2e43c2a3ee85e635df3c122e752d7ab397ad9829
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 29 09:25:30 2013 +0200

    Get rid of extra delays in unit tests
    
    Some resource types will now have at least one sleep during their creation
    where previously they did not, so unit tests need to stub out the sleep if
    they were not already doing so.
    
    Change-Id: I1ae919263c6f12d9219970f226019e53daff052b

commit 53e5e6d83c0ad0abd11c20e898876f52db7fa921
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 28 18:29:37 2013 -0700

    Restore heat.db.sync and add Deprecated message.
    
    This unpythonic deprecation method is used because this module was only
    ever meant to be used from the CLI as 'python -m heat.db.sync'. The
    module should be removable in Havana+1.
    
    Fixes bug #1185220
    
    Change-Id: I9943e5c35d9578f899fae1d11b818a2a5a9167c0

commit d31874188f55db0456f8d3570895b9044f3de0cc
Merge: b3ace0c 281436a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 28 18:12:19 2013 +0000

    Merge "Create resources in parallel where possible"

commit b3ace0c6f5788bb7545d78c02367caff6b521f0c
Merge: 2da66f2 8188d01
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 28 18:12:15 2013 +0000

    Merge "Add a dependency-aware task group"

commit 2da66f28d1ddcce55a3eb35969ae3fa44ce4fc4b
Merge: e3de4d3 1f0a9bc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 28 18:12:09 2013 +0000

    Merge "Move deletion from dependency graph to __delitem__"

commit e3de4d3188655b3025efb471264c1677f994c9b0
Merge: ff53e88 0e31ec7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 28 18:12:06 2013 +0000

    Merge "Make the mutable dependency graph a separate class"

commit ff53e88b6859627f1e1f84763521bbad0cdebd05
Merge: 3f72ad8 e0ab976
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 28 18:12:02 2013 +0000

    Merge "Make dependency graph node class public"

commit 3f72ad87f48fe19c7903ef9f685d2000171abd9d
Author: Derek Higgins <derekh@redhat.com>
Date:   Tue May 28 10:47:43 2013 +0100

    Use heat-engine.conf for heat-manage config
    
    Fixes bug 1184923
    
    because prog was missing the CONF object was looking for
    the config file in /etc/heat/heat.conf  this should have
    been /etc/heat/heat-engine.conf
    
    Change-Id: Ie23b9998df368274d69180e0d619b042dd9dc053

commit 281436ad7b2945d24d0a04c26adfd9fd7be541a9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 28 10:16:37 2013 +0200

    Create resources in parallel where possible
    
    Use the create co-routines with a DependencyTaskGroup to create resources
    in parallel where possible, subject to their dependencies.
    
    This implements blueprint concurrent-resource-scheduling with the exception
    of nested stacks.
    
    Change-Id: I4789ab11617b408622d8fc083e6b80a797d99e3a

commit 8188d017e2532990304263e848bf2757127f6be2
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 28 10:16:37 2013 +0200

    Add a dependency-aware task group
    
    Change-Id: I4524b4b220bdc02bdd7e3f9a5d84b1982cbee99f

commit 1f0a9bc2d1558747f8817d9cd48f0eaaa12a808c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 28 10:16:37 2013 +0200

    Move deletion from dependency graph to __delitem__
    
    Graph objects are mutable, and will in future be used for operations other
    than a topological sort, so abstract out the code for deleting backlinks to
    a node from the other nodes that have dependencies on it when it is
    removed.
    
    Change-Id: I86b81303ed2dffd969a2db10535761f108f4808a

commit 0e31ec7e73a8bf6b1aa70728351e5e668ba151ea
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 28 10:16:37 2013 +0200

    Make the mutable dependency graph a separate class
    
    Rather than copying dictionaries internally, provide a separate Graph class
    that can be copied externally as well.
    
    Change-Id: Id0bd55944369da59d7da1713369fce0d73ffe814

commit e0ab9767cfdbc9b75bc2b4fcf36b4e39d2a920fe
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 28 10:16:37 2013 +0200

    Make dependency graph node class public
    
    We're going to start making more use of it, so there's no point hiding it
    away inside the Dependencies class.
    
    Change-Id: I10c4a05493697f8834623cd798ef35161a0c219b

commit 38f4de94142c80667f70f1f36b7484bdc42e410a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue May 28 12:06:28 2013 +1000

    Fix the handling of non-existing paste file
    
    First only call find_file() by it's self so we can check for None
    (abspath crashes if you pass it None)
    We are already calling abspath at the return, so this
    also prevents a double call to abspath.
    
    If return None from _get_deployment_config_file() load_paste_app() will
    print out a nice error message.
    
    Change-Id: I451e090b7f08266ca824b5da228dafde55726d94

commit 82f5fa098a5e5b18d5e6a768c60422822348ae1a
Merge: 5c348d6 126bf9f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 28 00:37:22 2013 +0000

    Merge "Add a basic heat-manage"

commit 5c348d6aa6e2532e38b2bc84902f9641f8761ce3
Merge: 7affa29 5c5e36d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 27 23:15:26 2013 +0000

    Merge "Fail validation when security groups and interfaces conflict"

commit 7affa296dc8a7d9feb4bc782051dfe9cef0c3242
Author: Liang Chen <cbjchen@cn.ibm.com>
Date:   Sun May 26 16:55:45 2013 +0800

    refactor test_engine_service.py
    
    refactor tests based on stackServiceTestBase to be more like
    the other tests, ie clear mocking, validation, and just
    inherit from HeatTestCase rather than inheriting lots of
    stuff from a base class, which isn't needed for all the tests
    
    Fixes bug #1180375
    
    Change-Id: I78ade1c53113f8f72b4df8ff346c45ec93f19393

commit 5c5e36de3737a85bec5023c94265e6bbaf6ad78e
Author: Simon Pasquier <pasquier.simon@gmail.com>
Date:   Mon May 27 16:20:18 2013 +0200

    Fail validation when security groups and interfaces conflict
    
    The 'SecurityGroups' property of the instance is not taken into account
    by Nova when the 'NetworkInterfaces' property is also defined. Instead the
    security groups should be applied to the network interface resource(s).
    
    This issue has already raised a couple of invalid bugs on Launchpad.
    
    Change-Id: I5ae2ba356518d391893c2a479c5952b13b6e8d55

commit 126bf9f28caf5e9015844b3d8acffb9abf77873c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 27 21:06:31 2013 +1000

    Add a basic heat-manage
    
    The heat/cmd/manage.py structure is copied from glance to give
    us some consistency.
    
    Removing unused cliutils ...
    
    blueprint heat-manage
    Change-Id: If3b69eb4c3672740515fd308ec868af1cd3c9396

commit 60ea25973fe295ad04dd2960068efb8a85441496
Merge: c2c7dd1 65db4ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 27 08:52:30 2013 +0000

    Merge "Bring in oslo.cliutils for heat-manage"

commit c2c7dd13db3fb4f8eccdf2699131b0df38371e0d
Merge: 7658e95 743299b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 27 08:51:59 2013 +0000

    Merge "Update the oslo code before importing a new module"

commit 7658e95d43f0c4811ad6636bd496341876b5a9d4
Merge: a7efafe 77afc90
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 27 08:23:17 2013 +0000

    Merge "Migrate test base class to testtools."

commit a7efafe80d6b6922ae1c1359422b72b47db67253
Merge: b95034e 04d37a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 27 08:22:48 2013 +0000

    Merge "Add CONTRIBUTING file."

commit b95034e0fffadc473d7ab17c2d15d15bf14e6eb6
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 27 10:01:45 2013 +0200

    Remove eventlet dependency from unit tests
    
    Unit tests should not need to know about eventlet. Instead of stubbing
    eventlet.sleep(), stub out the TaskRunner._sleep() method in the scheduler.
    
    Change-Id: I438a5d6978ed228d62a0d28fef30115d205bd2c3

commit 1f5366f3bb45b9590034b0b2c5b17d10b5947989
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 27 10:01:45 2013 +0200

    Use a task to delete Instances
    
    Change-Id: Ic8c5552c52c0c00ef081a87525cd3b0bb011ce20

commit 65db4ba97b71da0d5c7dfca3932f26df49143f99
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 27 12:02:52 2013 +1000

    Bring in oslo.cliutils for heat-manage
    
    part of blueprint heat-manage
    Change-Id: I526de1aacbcf930f3187914403031a1e6f9ff4ae

commit 743299b0d3eb02c67f19febe67f294d503796b54
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 27 16:05:13 2013 +1000

    Update the oslo code before importing a new module
    
    Note:
    - there are some new oslo dependencies pulled in.
    - "six" has been added to the requirements.
    - rpc messages now have a "namespace" that conflicted with
      the metric namespace.
    
    part of blueprint heat-manage
    Change-Id: I92c6b91a28ca0380d13f0a3ba1544b9d517d74a8

commit 067912b4bc776e6d7f4804b5625a1367894d8ce6
Merge: c2af6c0 23fdd3b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun May 26 23:54:56 2013 +0000

    Merge "Detach Volumes from an Instance in parallel"

commit c2af6c031040df4408010bd8b42cac6d032f7f92
Merge: 9aca88b 0d00d02
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun May 26 23:54:52 2013 +0000

    Merge "Handle instance volume attachments with co-routines"

commit 9aca88b0710cf37ff283fbc2f236b241be739230
Merge: 05b97f3 1850cc2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun May 26 23:54:48 2013 +0000

    Merge "Add a convenience method to get instance volumes"

commit 77afc90b5d3a40d3a6e0afebc07b7b8b6b2b260a
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat May 25 09:43:40 2013 +0200

    Migrate test base class to testtools.
    
    This is stricter, but also provides plumbing for more advanced things
    like fixtures and testscenarios.
    
    Change-Id: I607b50390708ca3caa9799ef0b27007df5045a6c

commit 04d37a7ae61c14576b6f1856e603d1ff87e4accb
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat May 25 08:46:32 2013 +0200

    Add CONTRIBUTING file.
    
    Change-Id: Idadfda08c42b40411bb38813bd5996515ea5b491

commit 05b97f368ec20c550f90fdcdc138592af69b7c50
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 16 09:27:55 2013 -0700

    Migrate to pbr.
    
    Fixes bug 1179007
    
    Change-Id: I698d02a2171e43237094c0e5ccc4c2dd47ed722b

commit 3eafb93e6846805b541e9fd5b30bb03d024b0d89
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri May 24 13:41:45 2013 -0400

    Implement SecurityGroupIds property for instances
    
    Currently handling SecurityGroups and SecurityGroupIds the same exact
    way, that is both are passed directly to nova. If one wishes to pass
    a security group by parameter of a group to be created in the template,
    it must be in the format of <stackname>.<security group name> since
    there's no way to determine the ID beforehand.
    
    Fixes bug #1163991
    
    Change-Id: I26bb43ee89806cefc92ba2d0319340c4cd56ed06

commit 32c21dccc017c3c451eea468dda6fb9a889a7070
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon May 20 16:14:57 2013 -0400

    Use UUIDs for Quantum security groups
    
    Quantum security groups are referenced by ID and supports duplicate
    names, so having the ID available helps to avoid searching for it
    when needed.
    
    Change-Id: Idff9245b9848083029dd47fb2253a64b0c5de523

commit 39d5e7f7b1b73e45b7116ca6f175ff2083bf43f3
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed May 22 12:53:24 2013 -0400

    Make IDs for resources unique to ensure tests pass
    
    There were some duplicated IDs being used, specifically with
    security groups.
    
    Change-Id: Icf741e42d9dcca922f8944fad546d9db040612ba

commit 3ea48c23c0251c5bb7f021e219021ea3e31d2339
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue May 21 15:52:41 2013 -0400

    Change SecurityGroups to be passed directly to nova
    
    This changes SecurityGroups to return the complete name
    of a resource (stack.name).
    
    Change-Id: I945f1213b3ddcb5550e7b4ed3d982d4ee7c4e912

commit d87f68c43d4c1556fb0f54d6968c77ba9d2440dd
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 24 15:50:12 2013 +0200

    Add a separate Template class for the HOT format
    
    An alternative to https://review.openstack.org/30405
    
    Change-Id: Iea3422b1219a1ddf1b12ac2d156279165eb28c07

commit 8cc5b6bb725386391c8f2e842c0dabd9c3035f50
Merge: 0eaeeac 2e1d08e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 24 09:44:28 2013 +0000

    Merge "Rename requires files to standard names"

commit 23fdd3b9dfd920f61f4592361bd73e7934337a5c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 24 10:31:27 2013 +0200

    Detach Volumes from an Instance in parallel
    
    Use a PollingTaskGroup to ensure that if there are multiple Volumes
    attached to an Instance they are detached in parallel rather than serially.
    
    Change-Id: Ice399ae495af75558f2f8b1b1dc330d0b556a269

commit 0d00d02c1eaea087adc36e143f646c0af4acb2de
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 24 10:31:27 2013 +0200

    Handle instance volume attachments with co-routines
    
    Don't sit in a loop when attaching volumes to instances, use a task that
    yields control and allows them to run in parallel - and, in future, in
    parallel with other resources being created.
    
    Change-Id: I4653baa87b09a9fb6c2c16b51218f4ea2f2ae6dd

commit 1850cc2da26a7dc4d2c7bab956aae3bb4344293e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 24 10:31:27 2013 +0200

    Add a convenience method to get instance volumes
    
    Change-Id: If22cd9245b043f35386ad3c24d46a41b0b8c2c86

commit 0eaeeac888d008ae9f22f9bce6c7451a088f5fe4
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu May 23 11:21:16 2013 +0100

    engine : move update_template_diff functions into Resource
    
    Move the update_template_diff and update_template_diff_properties
    functions into resource.Resource - since they now raise
    resource.UpdateReplace we can avoid ever calling handle_update if
    the resource update will result in replacement
    
    Note a further cleanup will probably be to combine the two diff
    functions into one recursive diff, which will further simplify this
    
    Change-Id: I839f0c4448a2d869f35e0a4f19d17f31c5c6f9af

commit 369b7faee736119b6ea8107bce0dac381ed9e613
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed May 22 16:34:32 2013 +0100

    Instance resource remove unreachable/redundant Metadata update check
    
    update_template_diff already throws resource.UpdateReplace if the
    json_snippet contains changes other than to Metadata, so the else
    here is unreachable and redundant
    
    Change-Id: I9f0ad88d0b6fa65cafd5b2843a38913fa843a3ac

commit c075060b90d5513860e353a9bd8ca15c76a1e41c
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed May 22 16:28:25 2013 +0100

    heat tests : add coverage for instance UpdateReplace
    
    Add some tests which test the UpdateReplace path for Instance
    
    Change-Id: Ib9c35498c3ab2811fcd73aac8159315cb6251004

commit c35f673e380163e8b440b65dd6ef218da1dbfaaa
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu May 23 15:42:01 2013 +0100

    engine : replace UPDATE_REPLACE with ResourceReplace exception
    
    Replace the handle_update returned value with a new ResourceReplace
    exception, which allows the replacement logic in resource.py and
    parser.py to be cleaner
    
    Change-Id: If652d031e8baeb8f4c6015e5ed2d0e5bb25f0fc6

commit b34c3d359a1a06fb234c5a3069399b82bd827666
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 23 15:37:39 2013 +0200

    Move VolumeAttachment polling to check_create_complete()
    
    Change-Id: I2e2fe3784b8cf79e3ccacd3451e06b75433fdd5b

commit 17b30f1b8dfbdc96798d3ed7bf2a9c179ff23200
Merge: 5fb7659 e0a090f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 13:36:22 2013 +0000

    Merge "Make volume detachment a co-routine"

commit 5fb76598a02b68d9b98ef6d8520511f3f84c1ba9
Merge: efcfc8c 8d549d0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 12:32:08 2013 +0000

    Merge "engine : Fix ResourceFailure exception issues"

commit efcfc8cf7e64f30070a91a7877c371bff961d093
Merge: 71eb123 4c8cad7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 12:24:38 2013 +0000

    Merge "Make volume attachment a co-routine"

commit 71eb123d8e78ebc1d5950587d7f332c0140de0d4
Merge: f58c1c8 d059c29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 22 20:26:08 2013 +0000

    Merge "Verify function calls in cinder_fn_getatt unit test"

commit f58c1c8b075a6b76eab96c790508e00f448bd2be
Merge: 1435487 fb59cbd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 22 20:25:12 2013 +0000

    Merge "Stub out sleeps in quantum unit tests"

commit e0a090f5fdf5a542be067b57916e1d03dc69649b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 22 16:29:33 2013 +0200

    Make volume detachment a co-routine
    
    Change-Id: I799f891010fb75c80afd30ded761aa2b3b632394

commit 4c8cad7402a202e108e16451bf14cebb8ac04d67
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 22 16:29:33 2013 +0200

    Make volume attachment a co-routine
    
    Change-Id: Iad1ac0578470e4c2f997257560d62f8cb2d7ee35

commit d059c2932e3d40b55f255d5d8f4850576446422d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 22 16:29:33 2013 +0200

    Verify function calls in cinder_fn_getatt unit test
    
    Change-Id: I6a7f03a7b91fb9604ea16e5a60bc12f84ebb9657

commit fb59cbd709058f8ed0ad9eabb891c79d31d0b044
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 22 12:40:33 2013 +0200

    Stub out sleeps in quantum unit tests
    
    The patch 5d86e2f2ece51a79102aee2af9a3f306c929aaea
    added wait states into the unit tests for quantum networks, routers and
    ports, but did not stub out the resulting sleep. This caused the tests to
    run for over 1s, which indirectly allowed bug #1182285 to become visible.
    
    Change-Id: Id26daa87e1618533ee92c33827a9d01800b03752

commit 14354874dec15ce148489cdd85420c6334a6e5fc
Author: Thomas Herve <therve@gmail.com>
Date:   Wed May 22 10:23:50 2013 +0200

    Remove unrelated tracebacks from test output
    
    This mocks some calls the ThreadGroup when testing update and delete of
    the stack, resulting in tracebacks when the threads randomly run later
    on in the test suite.
    
    Change-Id: Ia1a376933c2e25b6cf0fe6a26f47e381cbb1a55e
    Fixes: bug #1182285

commit 2e1d08eaa141be5fe33ef0ab63a8eaae330a9421
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 15 21:48:36 2013 -0700

    Rename requires files to standard names
    
    From bug report:
    Rename tools/pip-requires to requirements.txt and tools/test-requires
    to test-requirements.txt. These are standard files and tools in the
    general world are growing intelligence about them.
    
    Change-Id: Ie0bdb4908f45e47db43e84cd0c5fdc5263c035f4
    Fixes: Bug #1179008

commit 7b224c0fe00a1f4dba7ae36d583a5cd3d2123c3a
Merge: 5b17402 65e0706
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 22:21:53 2013 +0000

    Merge "update on_devstack doc"

commit 8d549d0694d37d5ec9ebfde0de3e1182e44429cd
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue May 21 23:06:11 2013 +0100

    engine : Fix ResourceFailure exception issues
    
    Fix some issues spotted in https://review.openstack.org/#/c/29543
    These errors were spotted after the patch was merged, the
    ResourceFailure exception takes an Exception not string argument
    
    Change-Id: I72045ecf147c66a0a1cf1ef5df7fb3be8100384d

commit 5b17402cb5b44f8fcbeeede16cce5a2f211905e2
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 20 16:11:17 2013 +1000

    Fix PEP H101 (Use TODO(NAME))
    
    Change-Id: I77c9caa650462725b7c686fbafd9753d046b138d

commit af6b0b52a06b981ce2b35597c19ed6612ff7dee0
Merge: 7a7774d 5a8f731
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 11:07:30 2013 +0000

    Merge "Implement OS::Cinder::VolumeAttachment"

commit 65e07068743cf8493b8db3d95a96ad3485a946b3
Author: Shengjie Min <shengjie_min@dell.com>
Date:   Tue May 21 10:28:32 2013 +0100

    update on_devstack doc
    
    udpate the prebuilt-jeos-image from F16 to F17
    
    Change-Id: Iae1456e4811c029494a8c2878c9bf0c3221bc43a
    Fixes: bug #1180416

commit 7a7774d8e21bf359e3178664f79a12f0b545a631
Merge: 19dccd7 efe1007
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 09:02:27 2013 +0000

    Merge "Fix PEP H902 (Use the 'not in' operator)"

commit 5a8f731eeb36add10c4fa871bde27e7a9c4cdde0
Author: Thomas Herve <therve@gmail.com>
Date:   Tue May 21 10:27:15 2013 +0200

    Implement OS::Cinder::VolumeAttachment
    
    This creates a new volume attachment resource with Cinder specific
    naming.
    
    Change-Id: Ie73b929925c58e47f3509d57dd385cbd4ea5a4c1

commit 19dccd770c3cc0fd0522c0effdb0c3e1af441913
Merge: a3a40a1 e983f06
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 05:20:27 2013 +0000

    Merge "UpdateStack for AWS::AutoScaling::ScalingPolicy"

commit a3a40a1516d198970c6b90ffb4af156e85212864
Merge: 8492d21 1c8f3bf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 05:18:52 2013 +0000

    Merge "Adds sudo check for privileged operations."

commit 8492d2112c0bd43e7767bbed3a613dfbbad6e4d3
Merge: fe7d5d3 ab60d9b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 05:06:54 2013 +0000

    Merge "engine : remove unused update states/status"

commit fe7d5d34359250644f442072c17947fa4dc4f6fe
Merge: 28c5c49 2a986d8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 05:06:28 2013 +0000

    Merge "engine : cleanup Resource.update error paths"

commit efe10076a224c9ac11e9fc11788fd1a4bd0d9dfc
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue May 21 13:01:54 2013 +1000

    Fix PEP H902 (Use the 'not in' operator)
    
    Change-Id: Ic3dec990d2fe43dd8841aadb7b87e8f26c2d0338

commit e983f0696918382c70ac6f0932b2363f96188d4a
Author: Winson Chan <winson.c.chan@intel.com>
Date:   Fri May 17 11:30:33 2013 -0700

    UpdateStack for AWS::AutoScaling::ScalingPolicy
    
    Implemented update support of the ScalingPolicy resource
    in an existing stack. ScalingAdjustment, AdjustmentType,
    and Cooldown properties are allowed properties for update.
    A handle_update method is added to update differences in
    the template.
    
    Change-Id: Ieeae93560a315a8a35c6fb2d8f1d78a89123bec3
    blueprint: scalingpolicy-update-stack

commit 28c5c494f9eb9d8fc371751908ba123e398225fc
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 20 15:46:27 2013 +1000

    Fix PEP H301 (one import per line)
    
    Change-Id: I7b0c991c869c903e60123ad5bdf876b06d83e3e9

commit 796fe8a213b34c289bc9f5a106b2a346a57660d4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 20 15:34:40 2013 +1000

    Fix PEP H402 "one line docstring needs punctuation."
    
    Change-Id: Id0aa43187f6d5e62308f4b329bc9458a512d808d

commit f67dc437f3577ba5b3feb06cdfd14d822766244f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 20 21:53:14 2013 +1000

    PEP: be explicit about what errors are ignored.
    
    Change-Id: I362ba16c8a7b645c9befa7fcd4b0942773b0dbce

commit ab60d9b97f51a61f9a619aa902670a9ac2661489
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri May 17 14:20:31 2013 +0100

    engine : remove unused update states/status
    
    We have some aws-isms in the update code related to different
    update states, which is not actually used anywhere, so may as
    well remove it - it's probably easier at least for now to focus
    on the three update states of COMPLETE/FAILED/REPLACEMENT
    
    Change-Id: Ieeaf92ab0fec6bbfab3dddf2d8fecb0b38c1b2fc

commit 2a986d838d1f46311b31b39c5f7d841fbd5775b1
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri May 17 13:17:57 2013 +0100

    engine : cleanup Resource.update error paths
    
    The current update code uses a nasty pattern where returning an
    arbitrary string from Resource.update is interpreted in parser.Stack
    as an error.  Instead use exceptions which is much nicer :)
    
    Change-Id: I2ddebfd6bbec3dc229012406da72dd928fcc4595

commit 1c8f3bf2c667bf4a79877fca630c3bbc20993b97
Author: Dave Wilde <david.wilde@rackspace.com>
Date:   Sun May 19 10:05:39 2013 +0000

    Adds sudo check for privileged operations.
    
    Adds root user check to determine whether or not sudo is required
    for MySQL status and installation.  We now run sudo -l to verify
    that the user is in the sudoers file, the credentials are then
    cached for the rest of the operations.
    
    bug 1181701
    
    Change-Id: I294b269046ee2049b0fdee3c871096387cefbf24

commit 97191c32c67e935e9f8ff849d9f10a85158a5f6c
Author: Michael Still <mikal@stillhq.com>
Date:   Mon May 20 14:18:40 2013 +1000

    The oslo module called utils is no more.
    
    This had been cleaned up in openstack/common, but left in the config
    file. Clean that up too.
    
    Change-Id: I15b96c53aff3281a44250e9beb4ec56fb80bf9b6

commit 6468cc2446996a990dd591d37d2a5cd10d4b5de4
Merge: 5addde6 843d1fd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 20 03:53:41 2013 +0000

    Merge "Exclude build/ from flake8 checks"

commit 843d1fd476edef2453d31f8440b3b5d1780ee2b7
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon May 20 11:56:06 2013 +1200

    Exclude build/ from flake8 checks
    
    Change-Id: Ie7b19f8488230e8538720b96c73b49453c6a3efe

commit 5addde6bd20443553ce6e72f354f05c390c309a6
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon May 20 11:53:53 2013 +1200

    Tests for Router, RouterInterface, RouterGateway.
    
    quantum package now has over 94% test coverage.
    
    Change-Id: I82b4635e4554e5b94eaac70bd1cc4b9249863dc9

commit 1796f3ec0f2787738d83b62a66b5efaa8563146d
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu May 16 10:02:34 2013 +1200

    Tolerate resource lookup errors for quantum FnGetAtt.
    
    Fixes bug #1180293
    
    Change-Id: I5384456bbbf53558036573c983be0b65e8883612

commit 5d86e2f2ece51a79102aee2af9a3f306c929aaea
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue May 7 16:00:55 2013 +1200

    Implement check_active for quantum net, port, router
    
    These quantum resources go through a BUILD status before becoming
    ACTIVE (or DOWN).
    
    This could explain the issues seen in
    Bug: #1176661
    
    Change-Id: I659774cd402b71be102376b31e2d78bf225d37a6

commit 75c449fcb7bf7f579d7d974968b6ffaf045de26b
Author: Michael Still <mikal@stillhq.com>
Date:   Sun May 19 09:17:47 2013 +1000

    The utils module in oslo is no more.
    
    The utils module in oslo has been removed (with most of its
    functionality moving across to strutils). Luckily it was imported
    in heat but never actually used, so removing it is relatively easy.
    
    Change-Id: I3df27a553ebe7de188893038f9285d4b9a789d19

commit 1d79afc696be72701c02675b0a18e71ebbe22898
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat May 11 14:26:42 2013 -0400

    Migrate to flake8
    
    Fixes bug 117244
    
    Change-Id: Ide81366eb2240377160775830e2307aef6064f9e

commit 8102ccbff096c2d2634220cf3f21fe35045f923b
Merge: a9d05bb 05d532c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 18:41:08 2013 +0000

    Merge "Clean up a pyflakes error in a comment."

commit a9d05bbbd1430e4a69d43e7133d98e63e827214e
Merge: 1b7bc3d 38ed88a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 18:40:53 2013 +0000

    Merge "Align usage of test skipping."

commit 1b7bc3d4f54517d6528dca428968f6ada0a2b1c7
Merge: 473260c d9e7b0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 18:40:14 2013 +0000

    Merge "Use mox for mocking quantum client test calls"

commit 473260c1cfb0f6bbf6118cd13b55e1099f773b80
Merge: 2f66b34 0f47986
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 16:59:03 2013 +0000

    Merge "Fix error in Dependencies representation"

commit 2f66b349d4b741d734f43f1ea9e978201908182d
Merge: 990bbbb 1e46684
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 15:44:00 2013 +0000

    Merge "Initialise resources when service is created."

commit 05d532cc384f3fb9d22a513765ea6c453cc030bf
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 16 09:24:17 2013 -0700

    Clean up a pyflakes error in a comment.
    
    This is a little-bit silly, but it's the last thing. pyflakes parses
    python lines that are in docstring comments that are prefaced by >>>.
    So, without the import, pyflakes complains about undefined import.
    
    Change-Id: Ibac77367efb07b65b992694b2de19473ec9ef473

commit 38ed88a0b698011560ebe74502e0ae4b93c71618
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 16 09:20:51 2013 -0700

    Align usage of test skipping.
    
    There were three different mechanisms for skipping tests in the suite.
    For the most part, skipIf was used, so sync to that. Additionally, it
    was being used as a decorater in most places, but as a call in a few,
    so make it a decorator everywhere. Finally, if it's on the setUp method,
    it's not necessary for it to be on any of the individual tests in the class.
    
    Change-Id: I7fbd09a6bc015e698a190b989d0f8641c4adb63e

commit 0f47986b659407058c26b4bef9c7441ecb5772c4
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 17 10:57:21 2013 +0200

    Fix error in Dependencies representation
    
    This mostly only exists for debugging, but it's helpful if it can actually
    run.
    
    Change-Id: Ie29da5e7e58aed54aaaffa4df479fa0d96ce78fe

commit 990bbbbd462f29a811a97718d679e1167c5982c0
Author: Simon Pasquier <pasquier.simon@gmail.com>
Date:   Fri May 17 11:24:28 2013 +0200

    Fix SecurityGroups for AWS::AutoScaling::LaunchConfiguration
    
    Change-Id: Ie3b0663093c9c4bae14cf3311a65ff92715af8c9
    Fixes: bug #1180878

commit 1e46684b454ec2e6a75933de11b78e7957f3b5f2
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri May 17 13:47:28 2013 +1200

    Initialise resources when service is created.
    
    Without this, calls to validate_template will fail until the first
    parser.Stack is created.
    
    resources.initialise() is called in EngineService __init__
    to avoid this happening in another service method in the future
    Fixes: bug #1181045
    
    Change-Id: I68a74ec7993aff4b74d449a3ae33315b93e9cb0d

commit fa2b9fd0bfcd34aea335c8e2f402fa6af24b7a58
Merge: c024a8b 2bfd9c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 00:02:09 2013 +0000

    Merge "Clean up import of cinderclient exceptions"

commit c024a8b9212d4289a27ea24f6d3b70a6d08a7177
Merge: c7a7567 8efd18e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 00:02:06 2013 +0000

    Merge "Make Volume snapshot a task"

commit c7a7567341d1564df43c62e8df057d8c713de8b5
Merge: 4e4bbb4 7f58b1d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 00:01:08 2013 +0000

    Merge "Move Volume polling to check_create_complete()"

commit 4e4bbb495d33edcf051df4ffe06d5912e40ed0f1
Merge: dea685e 114372c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 00:00:48 2013 +0000

    Merge "Handle errors in Volume creation"

commit d9e7b0ed796fdd46faacf3813c62c620aaf40f54
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed May 15 16:37:55 2013 +1200

    Use mox for mocking quantum client test calls
    
    There is no change in test coverage, future commits will
    expand the code coverage on quantum resource types
    
    Change-Id: I90cb1a2d1073d95c75b941b00b9c667a8c7a72d9

commit dea685ef9055ae058825ea43a8e729a9adf640b4
Merge: 8c80441 eddcf4c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 16 17:47:57 2013 +0000

    Merge "Rename handle_snapshot and pass state"

commit 8c80441ded2dfb42e3f6ad00aad52411729c9f4c
Merge: 2028411 5ea0c0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 16 17:39:24 2013 +0000

    Merge "Cleaned up some simple hacking/pyflakes errors."

commit 5ea0c0e2bee14faa5d4516a527ed7c87ff3fb790
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 16 09:11:15 2013 -0700

    Cleaned up some simple hacking/pyflakes errors.
    
    There are set of trivial changes that involved missing imports or unused
    code. No functional changes should be evident.
    
    Change-Id: If020e33674627845ea78192382bdf8977b442931

commit 2bfd9c033cd21f24108e1f3e5b4834c23a516d34
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 15 22:26:09 2013 +0200

    Clean up import of cinderclient exceptions
    
    Don't import a particular version of the cinderclient API - just import the
    client module and pass the version we want to the Client() constructor as
    is intended. This allows up to access the exceptions directly through
    client.exceptions, rather than having to do a separate import.
    
    Change-Id: Ic0e47506a51a572da01fdfdef0367cfdb3e34d54

commit 8efd18ee64141a3d65c4b855db146e417e49bd3a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 15 22:26:09 2013 +0200

    Make Volume snapshot a task
    
    Change-Id: I53fbd6e2ba9b17fa0ccd38d5e077587df0bbfef8

commit 7f58b1dd7009db07cd7a6016b3d9cbd6089ea91d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 15 22:26:09 2013 +0200

    Move Volume polling to check_create_complete()
    
    Rather than poll in a loop inside handle_create(), use
    check_create_complete() to check the status of the Volume.
    
    Fixes bug #1178578
    
    Change-Id: Icea7154c6e3763c977bd41671f51736c4a366141

commit 114372ca3d584a32bd46b9328dc7033211591457
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 16 13:18:19 2013 +0200

    Handle errors in Volume creation
    
    Set the resource_id as soon as it is know, since we need to be able to
    delete the volume later, even if it is in an error state. Avoid attempting
    to perform a snapshot if the volume was never created successfully.
    
    Change-Id: I33dd842d3d249bafe1037c1b97abf1979f605712

commit eddcf4c6e982335d8acb8f3b408b2bb841890af8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 16 13:18:18 2013 +0200

    Rename handle_snapshot and pass state
    
    Rename handle_snapshot() to handle_snapshot_delete() to better reflect what
    it needs to do (both take a snapshot of the resource and then delete the
    resource). Also, pass the state of the resource prior to delete being
    invoked, since the resource may want to use different error handling in the
    snapshot phase depending on e.g. whether the resource was created
    successfully or not.
    
    Change-Id: I1e5aaab4f13e42333c1f2f39bfeb0ebf2ac89ed8

commit 5b82e2db04690b5f8b4ecdc593e09793c5baf31d
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed May 15 15:43:29 2013 +1200

    use skipIf for all quantum test skip checks
    
    Change-Id: I999c13fd5d2816374ee9fb4d2abe57557583ed9a

commit 03f6d0a51939e02907b310442a84103377121867
Merge: fd39f57 bac58ee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 15 22:08:28 2013 +0000

    Merge "Implement CinderVolume.FnGetAtt"

commit fd39f57dc08d68bd678aeeddf0fb75d9b9588830
Merge: 3f15e10 2ef60a6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 15 21:51:46 2013 +0000

    Merge "Clean up VPC unit tests"

commit 3f15e102e1a70d48996aecb258e1762ed3ed01db
Merge: 8c97ce4 05ca181
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 15 21:50:10 2013 +0000

    Merge "Use python logging for loguserdata.py, log to console"

commit 8c97ce471a2811cba45cd0829c18ec074fb01d8c
Merge: d14efee aed73f9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 15 19:53:35 2013 +0000

    Merge "Move WaitCondition polling to check_create_complete()"

commit 2ef60a648468978f40563c81bebcdb9990219ca2
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 15 15:59:38 2013 +0200

    Clean up VPC unit tests
    
     - Ensure that stacks are cleaned up on failure.
     - Add a test for the case where an something other than a valid reference
       is passed as the GroupSet.
     - Add a test for the case where no GroupSet is passed.
    
    Ref bug #1164913
    
    Change-Id: I7637ed7969f23662643756da4a49627a2b40de20

commit 2028411cae5a1c82164f7beea3ee907eaf869e72
Author: Bartosz Górski <bartosz.gorski@ntti3.com>
Date:   Tue May 14 23:04:56 2013 -0700

    Adds dns_nameserver to OS::Quantum::Subnet.
    
    You can specify list of dns_nameserver in template file when you creating new
    subnet using Quantum resources.
    
    Change-Id: I8978eab11b3ba9fe469c220fc1e7847a2038b54e

commit d14efee9be96d8b33af66d22cf30d1eb0c7fa481
Merge: cc5cbfc 134b11c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 15 02:53:19 2013 +0000

    Merge "Implement OS::Cinder::Volume"

commit 05ca181e9e9eb864a96bdab8bc19734ec143304d
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed May 15 11:43:44 2013 +1200

    Use python logging for loguserdata.py, log to console
    
    Python logging is configured with a stream handler and should
    also replicate the previous logging to 0600 /var/log/heat-provision.log
    
    By logging to a stream handler cloud-init will write to its log,
    which will show up in the server console log. This means that heat
    provisioning can now be monitored without needing to log in with:
    
    nova console-log <servername>
    
    This change also touches the file /var/lib/heat-cfntools/provision-finished
    instead of also writing a datestamp to it, which is redundant.
    
    Change-Id: Id0312bd2216a83753df601b17ad16d5355cdb11d

commit cc5cbfc106ef2c4aa160703d49dff18e1e92db1c
Merge: a160420 e0d9982
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 14 20:19:34 2013 +0000

    Merge "Copy the RHEL6 eventlet workaround from Oslo"

commit a160420096c9bb9e667be9ef2e228a6c7ddac949
Merge: 2d8a4b7 4a42b80
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 14 20:19:26 2013 +0000

    Merge "Update install_venv_common from oslo-incubator"

commit bac58eec6381f72e6d5ca827d9a429b81723010d
Author: Thomas Herve <therve@gmail.com>
Date:   Thu May 9 15:23:37 2013 +0200

    Implement CinderVolume.FnGetAtt
    
    This allows retrieving Cinder properties in the template.
    
    Change-Id: Id20d4d2cbd5f78ad4412f6260d66b43bd2ef6596

commit 134b11ccd145f982b7173bc9a5d0f1bc3e8eef8c
Author: Thomas Herve <therve@gmail.com>
Date:   Wed May 8 14:16:37 2013 +0200

    Implement OS::Cinder::Volume
    
    It creates a new resource type allowing to pass cinder specific
    arguments in the template.
    
    Change-Id: I1e8512892fdc7f141f91580bfca4e370b0740a56

commit 2d8a4b7cec6b61116b50c2adad479b7798a99805
Merge: 4399034 43d54ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 14 12:05:35 2013 +0000

    Merge "heat-cfn : Make error with missing auth details more obvious"

commit 439903445a301b3c1d881316ee2f15f9c084a096
Merge: 376e352 8c3b308
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 14 09:29:23 2013 +0000

    Merge "Add a timeout option to the scheduler"

commit 376e3520f3a5238caba018909abb909245df0d11
Merge: 3f2c04a 54225d0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 14 00:21:15 2013 +0000

    Merge "Add new exception for invalid template ref"

commit e0d9982d400f175474ee88e508fae07c9761f84f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu May 2 10:28:20 2013 +0100

    Copy the RHEL6 eventlet workaround from Oslo
    
    Tests in oslo-incubator now need the horrendous hack to workaround an
    issue with eventlet on RHEL6. We've moved the patch_tox_venv tool
    and redhat-eventlet.patch into oslo-incubator, so add them to
    openstack-common.conf.
    
    Change-Id: I1acfec282b64d7582144b155119bedb1741db2f7

commit 4a42b80057522f316b3185e8f3554d36345c006f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon May 13 22:51:06 2013 +0100

    Update install_venv_common from oslo-incubator
    
    Just some python3 compat work.
    
    Change-Id: I835765d45a861d0bcf9b348f0649c6c9ef5a1992

commit 3f2c04a8eecbab18604b9e846bdf8d22f23e2145
Author: Stephen Sugden <me@stephensugden.com>
Date:   Mon May 13 14:17:31 2013 -0700

    Use hostname from env in heat-keystone-setup
    
    Prints a warning if the endpoints are going to be registered as localhost URIs.
    
    Change-Id: I32efcf826f400ca2763cb5758dce02ffdbdb9ae1

commit 55aec3dd58af585bae02f2af20e506f29c45599a
Merge: cc5dd14 703285d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 13 19:55:06 2013 +0000

    Merge "Provide example config option for instance_user."

commit cc5dd14ded21ca8340b5eeee498aa960f8c879d9
Merge: af063ca 58d88f6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 13 19:50:20 2013 +0000

    Merge "Implement the SubnetId property in the Instance resource"

commit af063ca801b5c4b7e88a28b3dba7a061bc94e577
Merge: 8026858 53127b3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 13 16:58:08 2013 +0000

    Merge "api : Fix template-show partial URL redirect"

commit aed73f9a30406a97e8d5ca583d266df607da26b6
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 13 17:55:41 2013 +0200

    Move WaitCondition polling to check_create_complete()
    
    Rather than poll in a loop inside handle_create(), use
    check_create_complete() to check the status of the WaitCondition.
    
    Change-Id: I63dc6ec6aeedf3238123334722f86a0f1205f306

commit 8c3b308803ef5094ba1962d616e54318b3550d2a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 13 17:55:41 2013 +0200

    Add a timeout option to the scheduler
    
    Change-Id: Ia796c5027c8faeefb9ddf48d88583d3d7901448d

commit 8026858af59c2a0d886881ffaf73c6d2cde39db3
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon May 13 14:45:56 2013 +0100

    engine : rename check_active to make it more generic
    
    Rename check_active to check_create_complete, since "active" is
    really a detail of Instance state, and so it seems wrong for other
    resources which take a long time to create but are not Instance
    based (e.g WaitConditions).  This change will also allow us to
    align other stack "state check" functions with the state we're
    checking for in a consistent way (e.g check_delete_complete etc)
    
    Fixes bug #1178591
    
    Change-Id: I55a824e6ba3de87cedd0b844e7f4e1294917533a

commit 53127b3e7242585337733de604aa3e192acbb7e9
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri May 10 17:09:34 2013 +0100

    api : Fix template-show partial URL redirect
    
    All other API actions will provide a redirect if you only provide the
    stack ID or name (rather than both), the template URL currently doesn't
    because the template subpath is missing from the mapper lookup
    
    Fixes bug #1178705
    
    Change-Id: Ib8e8dd7691bc48587c9d91e937ac2c2c35ac3ce6

commit 652a5c0c7869a97d2ded5664b368aa7e2625851e
Merge: 61090f4 4ddbf8e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 13 04:52:27 2013 +0000

    Merge "Deprecate tools/nova_create_flavors.sh"

commit 703285dca3c63c2e98d1abd176c6d31f28c36097
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri May 10 13:35:08 2013 -0700

    Provide example config option for instance_user.
    
    Change-Id: I0782dafd785c21e96e4063ab4604dd3703c7c436

commit 54225d05d50aa9234eb44abc4d295047da393d87
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed May 8 18:40:17 2013 -0400

    Add new exception for invalid template ref
    
    Hopefully is clearer than a KeyError.
    
    Change-Id: Ib387825396ab0286df00aaff3b1b539cd7fc9a77
    Fixes: bug #1178011

commit 58d88f64d79ecc336a15e5898b1de1efd605f112
Author: Winson Chan <winson.c.chan@intel.com>
Date:   Tue May 7 23:13:49 2013 -0700

    Implement the SubnetId property in the Instance resource
    
    If the SubnetId parameter is given in the template, the handle_create method
    in the Instance resource verifies the subnet in quantum and configures the
    NetworkInterfaces for the subnet. If no NetworkInterface is specified, a port
    is created for the subnet and the nic is configured to use that port.
    
    Change-Id: I5a05cbe0798e6b181bf9dd3b547cda525e18480f
    Fixes: bug #1163952

commit 43d54ba5ad69c2ecd69e75d8d455039fe9b352f9
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed May 8 14:43:12 2013 +0100

    heat-cfn : Make error with missing auth details more obvious
    
    Exit with an error message describing the missing auth details
    instead of failing with cryptic "Name or service not known" error
    when credentials etc are missing
    
    fixes bug #1154759
    
    Change-Id: I19c22357526c73e824a2b2bb9f862c8724a8ebba

commit 61090f485e3c57792d237bacf63d07970923b0e9
Merge: 66e3cdd bafd8b8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 8 15:49:39 2013 +0000

    Merge "Fix GroupSet assignment to use resource id instead of name"

commit bafd8b80f25ca25a1919226f1daba4e21857e851
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Apr 26 12:04:20 2013 -0400

    Fix GroupSet assignment to use resource id instead of name
    
    This allows the security groups to be passed to Quantum in the
    expected format.
    
    Change-Id: I7925bfdb71a076b4a2ecdeee396abf42d111ef8c
    Fixes: bug #1164913

commit 66e3cddc0536c69df5e88f0b9567412d52940610
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 8 17:12:34 2013 +0200

    Fix unit test coverage issues for wrappertask
    
    Copy and paste fail.
    
    Change-Id: Ib3e5144d81fda7598e41e92f425b489d2cfc9a46

commit 2fa218502ef544f547527d5820c7268b3b68067a
Author: Thomas Herve <therve@gmail.com>
Date:   Wed May 8 16:43:29 2013 +0200

    Explicitely register options to fix intermittent failure
    
    Using parallel tests, stackServiceTest sometimes fail with a
    NoSuchOptError. Adding a register_engine_opts call seems to fix it.
    
    Change-Id: I2bc6e7ab8d2e2cb20d1f3e7d0d93d75bdb631af3

commit 44886ce0663d9c2c746ba70bb036dbfc4888548d
Merge: f754d1d 6843c09
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 8 13:38:49 2013 +0000

    Merge "Skip more tests that require Cinder backups"

commit 6843c096bf4e602e12134b6a1faac718df27253a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 8 13:41:48 2013 +0200

    Skip more tests that require Cinder backups
    
    Most of the unit tests that require the backups feature in
    python-cinderclient have been made optional, but a couple remained. This
    patch makes those also conditional on the feature being available.
    
    Change-Id: I8c954e7d7aa4b516b302140bfe5e66a7066717ed

commit f754d1d53dd6a9b14b96f9d165ed687aa5326d87
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue May 7 16:21:34 2013 +0100

    templates : remove in-tree templates
    
    Now we have the heat-templates repository, and the test dependencies
    on the in-tree templates has been removed, we can remove these
    
    Change-Id: I85b379dbf5202136cbb987c3f176b9cc7b7ff666

commit 04aa1215a1cbc5b38d9529f8984258088d2c0861
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue May 7 15:59:49 2013 +0100

    tests : convert test_template_format to test-local templates
    
    test_template_format is different from all other tests, in that
    we don't want to use the most minimal template possible, we
    actually want to test conversion works with maximal/non-trivial
    templates, so copy the two templates used by this test into a
    local tests/templates directory, with a README caution that
    in general inline-minimal templates are preferred.
    
    Change-Id: Ib5421545103728385992625884f86f2667ee2465

commit 5e2a562fc44c445b452d453f2ea32e6b7655e69f
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue May 7 16:43:40 2013 +0100

    tests : convert most remaining tests to inline templates
    
    Convert all except the test_template_format test to minimal
    inline templates
    
    Change-Id: I73f263d3d7d24eaa2c20eed171b7486cfa873f9a

commit 0b3ee9de7441039c716e13cc8fb450bd6e213729
Merge: 275a30e aa7fe09
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 8 01:42:53 2013 +0000

    Merge "tests : utils parse stack specify tenant in context"

commit 275a30e2e91dba052ad0a4e4b68db68417d0de06
Merge: ccd085d 83c55cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 8 01:42:02 2013 +0000

    Merge "tests : utils parse_stack allow stack_id override"

commit ccd085d028083be8e14047ba3ac87a973f817800
Merge: b940806 c67604a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 8 01:41:19 2013 +0000

    Merge "tools : remove fetch-cloudformation-examples"

commit b940806ab6849cb9062477f1f1d040790c7fdc68
Merge: 60e7ef0 b7c5e69
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 8 01:41:00 2013 +0000

    Merge "docs : update local template references to heat-templates url"

commit 60e7ef03669bd7c14fe689a5de9b848abd051bfc
Merge: 8b189b7 9eec986
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 23:37:05 2013 +0000

    Merge "Wait for any nova server status that makes sense"

commit 8b189b750e802fddfd8ed57a9ec604bbd5f4e371
Merge: 7453015 b996861
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 23:35:06 2013 +0000

    Merge "Add test to handle nova BUILD status on create"

commit 74530156ac2fab295bcb9f4ecb90169e531b8271
Merge: 8ab0339 25a29bc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 23:31:09 2013 +0000

    Merge "Fix skips done in the test suite by using testtools skipIf"

commit 8ab0339bb81aa3d8a6fa4441e013913f7cad2169
Merge: 823e43f 80e3084
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 23:19:16 2013 +0000

    Merge "Use scheduler for driving autoscaling task"

commit 823e43fec7e9aaebf95de746e043ca9cbc785104
Merge: 7739725 38be6dd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 23:19:08 2013 +0000

    Merge "Use a PollingTaskGroup to simplify autoscaling"

commit 77397259c20a31992f7bc3e003686129e768a4c5
Merge: d8b1cfe 772f8b9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 23:16:38 2013 +0000

    Merge "Add a wrappertask decorator"

commit d8b1cfe4fecd68288ba1c1be5243ce7dbeff57d1
Merge: 0ac0a5e 58126e1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 22:39:03 2013 +0000

    Merge "Support password authentication."

commit 0ac0a5e0bdeb484f6e45a6a7331a9b21d38a70d1
Merge: 32d93a8 3d21cdb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 22:32:28 2013 +0000

    Merge "Add a PollingTaskGroup task"

commit 25a29bc237c0a4072470bd8f59de0af4c0ef351d
Author: Thomas Herve <therve@gmail.com>
Date:   Tue May 7 18:59:46 2013 +0200

    Fix skips done in the test suite by using testtools skipIf
    
    The shipped skip_if function was broken as skipIf is already a
    decorator.
    
    Change-Id: Ifc5c3a7878fa047fe1a807c43d91fe34bc7b4081

commit 32d93a836b2a778fd59d4aae31af67043a4a2e6f
Merge: e344713 f149434
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 17:39:14 2013 +0000

    Merge "Give each cli its own test."

commit 9eec986f82e76b899835a8e6a1fafaa4474a7ff4
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 1 15:51:03 2013 -0700

    Wait for any nova server status that makes sense
    
    Nova may return some transient states based on operator actions that do
    not mean a resource has failed. Rather than report these as unexpected,
    wait on them just like BUILD.
    
    Fixes bug #1140324
    
    Change-Id: I757c073fb8a7da44f41e9a9cb9ae71dbc35d3c33

commit b9968614d5f7131ce7b1810c9bec7a07e7752ea7
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 1 15:17:37 2013 -0700

    Add test to handle nova BUILD status on create
    
    Other tests assume nova will return an ACTIVE server on create, which is
    somewhat unlikely.
    
    Fixes bug #1133580
    
    Change-Id: I6ccc079e8978894f7648a6000f74869434c600f6

commit e3447136bfeb389dddefb28420722ae957cf4d24
Merge: f333d77 8dcea9b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 17:33:51 2013 +0000

    Merge "Support SnapshotId in volume creation."

commit c67604ae7ad429b7289698014e476513c58558a6
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue May 7 16:23:29 2013 +0100

    tools : remove fetch-cloudformation-examples
    
    This template-related script now lives in the heat-templates repo
    
    Change-Id: Id1940ca1217572145da8eb37b690704a7f06205d

commit b7c5e698e2215a9b7ebb424de8a8406f5efa2734
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue May 7 16:19:44 2013 +0100

    docs : update local template references to heat-templates url
    
    Update references to the to-be-removed in-tree templates, so
    we use raw URLs to the heat-templates repo instead
    
    Change-Id: I2121cedc2bffe1760d845dd2d87d97dd2265f1e9

commit aa7fe097f0b1ed78e3025fc7acfd72f0ddb2a71f
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue May 7 15:43:37 2013 +0100

    tests : utils parse stack specify tenant in context
    
    Some tests require the tenant name (not just the tenant_id)
    to be set
    
    Change-Id: I381701cc83ba419041df6102fd8b47d88c5b2c3f

commit 83c55cb458fb5f14c21a03fc3ccd820278e61078
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue May 7 15:42:51 2013 +0100

    tests : utils parse_stack allow stack_id override
    
    Allow the stack_id to be specified, required for some tests
    
    Change-Id: I35f236bd26ae0140e41485f9762ef09df00144b1

commit 80e3084a91ace801aa2e69fd6be6a711d9184ec3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 7 15:10:10 2013 +0200

    Use scheduler for driving autoscaling task
    
    For threads that drive autoscaling events, run them to completion using the
    task scheduler, to abstract out the sleeping from the main code.
    
    Change-Id: I9b21404a171d92d6edbc59d3099d3ee34f08e22d

commit 38be6dd6f2d7e62f09178fd743d76fe11255e5fb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 7 15:10:10 2013 +0200

    Use a PollingTaskGroup to simplify autoscaling
    
    Change-Id: I608930784b18437b4745962dc6f8bdd8b47355b6

commit 772f8b9e812ced3fe21425870bcde3b765cd73ab
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 7 15:10:10 2013 +0200

    Add a wrappertask decorator
    
    It is common that we might want to create a task that is a light wrapper
    around another task. This allows us to, for example, call some clean-up
    function after a PollingTaskGroup has completed. We really want to make
    sure that any exceptions caused by timeout or cancellation get passed on to
    the subtask as well.
    
    Python 3 sports the "yield from" keyword (PEP 380) that effectively allows
    the sort of nesting of generators that we want to do here. This change
    provides a decorator function that allows the decorated generator function
    to do the same thing using the "yield" keyword, even in Python 2.
    
    Change-Id: I110141f2891ed35b8ffe98ec6ae8b42738f7db64

commit 3d21cdb263c14a06c14208169e72d565fc0424d5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 7 15:10:09 2013 +0200

    Add a PollingTaskGroup task
    
    A PollingTaskGroup can monitor a collection of subtasks.
    
    Change-Id: I5db4e7a9d32647397f3229e7654aa0fb68d794ce

commit f333d77084c99c937c28e1fc3a225740f18acaa4
Merge: 6ad24e4 984496a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 07:11:19 2013 +0000

    Merge "Support Snapshot policy in volumes"

commit 4ddbf8e41dfce01d42f36cac149990895ca1e0d2
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue May 7 16:56:22 2013 +1200

    Deprecate tools/nova_create_flavors.sh
    
    This script now just prints a warning and runs
    nova flavor-list
    
    Change-Id: Iee5e2fa54d38a24d634840db10a7f5411cb2e9dd

commit 58126e14d7a9e50721b71aee0b9d113c4d79bd8c
Author: Cody A.W. Somerville <cody.somerville@hp.com>
Date:   Sun May 5 22:05:50 2013 -0400

    Support password authentication.
    
    Add alternative authentication middleware to authenticate against Keystone using
    username and password instead of validating existing auth token. The benefit
    being that you no longer require admin/service token to authenticate users.
    
    To use, update heat-api.conf:
         [paste_deploy]
         flavor = standalone
    
    This should make it possible to try heat out against existing public
    clouds.
    
    Change-Id: Ia584bba78e8984581f0fb6882bbb17d5efa238db

commit 8dcea9b40c8299fe615a0ceb63960af3177882bd
Author: Thomas Herve <therve@gmail.com>
Date:   Mon May 6 09:02:25 2013 +0200

    Support SnapshotId in volume creation.
    
    This uses cinder backups as snapshot, to be symmetrical to the deletion
    policy.
    
    Change-Id: Ie8f1ff095df7bdad8500c6298d1b7d9fd233693f
    Implements: blueprint bp/volume-snapshots

commit f149434edaf61158fcef74c5680fb425a5806a8e
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon May 6 10:53:56 2013 +1200

    Give each cli its own test.
    
    This will give a nicer failure message, and results in 3
    slowish tests instead of 1 really slow one.
    
    Change-Id: I5c3fbd2507068908c165e163b8f458bf8cb00bc1

commit 6ad24e4d1773ef34fc7aaadf65ac5e0c915894db
Merge: 67f969c d03d56f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 3 16:51:20 2013 +0000

    Merge "heat tests : separate Autoscaling and CW alarm tests"

commit 67f969c9755b070acd138e25a0a69d04010f23e1
Merge: 896f881 6e9a0e4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 3 16:51:18 2013 +0000

    Merge "heat tests : convert most tests to inline templates"

commit 896f881d8ea4ef01521a1cc62fa77589b5eff6ac
Merge: 0326c16 a6cd037
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 3 16:51:14 2013 +0000

    Merge "heat tests : add parse_stack function to test utils"

commit d03d56f3bfbdf54cafdcc9ca24b1cffd98525ad3
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri May 3 13:42:24 2013 +0100

    heat tests : separate Autoscaling and CW alarm tests
    
    Currently the AutoScaling test also tests the CloudWatch Alarm
    resource, so separate out the CW Alarm test to simplify things
    
    Change-Id: Ia346ee49f3a363e2d63e801c74265545d7af1acf

commit 6e9a0e468317bd5fc50517a58448408ef5fa24ce
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri May 3 11:43:54 2013 +0100

    heat tests : convert most tests to inline templates
    
    Convert to inline minimal templates, to remove dependency on
    in-tree templates which we plan to remove.  Note there are still
    some more tests remaining which need similar changes (shardy todo)
    
    Change-Id: I0864d1f15ea3b815d449277387440157f104bbf3

commit a6cd037bd893933249f10d0952a2881ac7e0ee40
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri May 3 13:31:35 2013 +0100

    heat tests : add parse_stack function to test utils
    
    Add convenience function parse_stack to utils so it can be
    reused in test to avoid duplication
    
    Change-Id: I608e2227c695a9faecbd8ff78a1339b47174a006

commit 0326c16c11ddea21ba3c8fc4cb73eca93566c706
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 3 15:57:57 2013 +0200

    Fix error reporting in @stack_delete_after unit tests
    
    If a unit test decorated with @stack_delete_after (to ensure that a stack
    being tested is cleaned up) fails in such a way that the stack cannot be
    cleaned up, the original error was suppressed, making debugging very
    difficult. In this case, we should re-raise the original exception.
    
    Change-Id: I2b0c326f819cd8a6bc772fe52deb14fb1c41bf93

commit c9fa7375d426068e639710d662f44e246e0b1241
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 3 16:07:14 2013 +0200

    Set Stack id to None when deleted
    
    If a Stack object has been removed from the database, we should reset its
    ID to None so that if the object is used further, it will not be assumed
    that it is represented in the database.
    
    Change-Id: Iaa7e9327324f101487847362973bd7f8386ce44b

commit 984496a1e5d8cfe17ed61b61c336b93861928189
Author: Thomas Herve <therve@gmail.com>
Date:   Thu May 2 15:13:52 2013 +0200

    Support Snapshot policy in volumes
    
    This handles the Snapshot DeletionPolicy in the AWS::EC2::Volume
    resource, creating a backup of the volume before deleting it. It
    requires a recent cinder client with backup support.
    
    Implements: blueprint volume-snapshots
    Change-Id: Idbb14a434ad6ccde9f198e07799e8aef0867dd6f

commit 7b832657540c2b62ff8ce00e42823ae764ccd894
Merge: 04d0356 34cc7d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 3 10:02:46 2013 +0000

    Merge "heat api: ec2token remove unnecessary jsonutils retry"

commit 04d03565876e841aa90d64a337a9f3009645d770
Merge: 0628e85 ec8e96d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 3 09:07:57 2013 +0000

    Merge "Use install_venv_common from oslo"

commit 0628e85023b275fd853d242e97be72d73321b4c0
Merge: b1f3073 ceb26ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 3 09:06:34 2013 +0000

    Merge "Sometimes use quantum for SecurityGroup"

commit b1f3073f2e8e5ac77e47f8cd8daa98612af60b29
Merge: a56e1ce 8914fbc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 3 09:03:37 2013 +0000

    Merge "Allow non-replacement updates of Alarms"

commit a56e1cea37359810d1ce0c4cf30cb691af70c4c1
Merge: 21735a4 e121c46
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 3 05:07:22 2013 +0000

    Merge "Fix test_validate to run by itself"

commit 21735a4a5288db032e745402185d16fa1a780bbb
Merge: 9405fcc 334df9f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 3 05:02:10 2013 +0000

    Merge "Depend on discover to fix python2.6 tests"

commit 8914fbc52d9a6bdf84f3e0ce29f7a5371ad606cf
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 3 14:25:57 2013 +1000

    Allow non-replacement updates of Alarms
    
    blueprint cloudwatch-update-stack
    
    Change-Id: I58982caf33bb5b326797472ec6c3dab8eba3a668

commit 9405fccb1cf61799c6497bd9f140f31d1d5ebd02
Merge: 147e1e6 91b587e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 2 20:38:18 2013 +0000

    Merge "Split the module lines in openstack-common.conf"

commit ceb26ad46a288612dbc34ad51a52e6c4f643040f
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Apr 19 11:55:43 2013 -0400

    Sometimes use quantum for SecurityGroup
    
    This implements the following properties in AWS::EC2::SecurityGroup
    - VpcId
    - SecurityGroupEgress
    
    If VpcId is specified, completely separate code paths
    are used which make quantum calls instead of nova calls.
    
    This implements blueprint quantum-security-group
    
    This is based off https://review.openstack.org/#/c/22280/
    with a few enhancements:
    - Quantum firewall rules translated to acceptable format for ICMP
    - remote_ip_prefix used for security group rule creation
    
    Change-Id: I8f1953cb559da0e97821ae0072dfb01dc8267c0c
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 334df9fc21dd3e3fc3c8aee2f9c2ad128c9f98ce
Author: Thomas Herve <therve@gmail.com>
Date:   Thu May 2 21:50:01 2013 +0200

    Depend on discover to fix python2.6 tests
    
    It also fix a failure introduced by using 2.7-specific setUpClass.
    
    Fixes: bug #1175753
    Change-Id: I63ba61050602df92c654bd70519947965494df37

commit 34cc7d2ca927fc94ca7d359ae0ea1e3136c9449c
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu May 2 20:14:13 2013 +0100

    heat api: ec2token remove unnecessary jsonutils retry
    
    Remove the try/catch around jsonutils dumps, since this is
    handled internally by jsonutils via the dumps default parameter
    
    Change-Id: I66c63b441f61cde506ef40e3eace60c3c41e90ca

commit 147e1e6afe28e24ef7b508ca7fed0bb0a926b6f0
Author: Thomas Herve <therve@gmail.com>
Date:   Wed May 1 16:54:57 2013 +0200

    Make DeletionPolicy a resource attribute instead of a property.
    
    This improves validation of the different values, and make the Retain
    policy works for all resources.
    
    Fixes: bug #1160779
    Change-Id: Idb0d275c44661db341f693d9d80629661d66c7ac

commit ec8e96d0fa4692aba9aa5590ca7fbb1c8b465642
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu May 2 10:45:37 2013 +0100

    Use install_venv_common from oslo
    
    The core of install_venv.py was moved into oslo-incubator recently so
    just use that.
    
    Change-Id: I7ba52660fc1433f116e6ee1ad33c89ba393c416b

commit 91b587e2c016eba77a2c603485d2bfa697cac3fc
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu May 2 10:26:22 2013 +0100

    Split the module lines in openstack-common.conf
    
    update.py was changed to support this format recently. It makes it
    much easier to review changes to the list of modules.
    
    Change-Id: I0f86f65e107ab54231bd48182947d5799e8a460f

commit 7c708e7607caf164c8a27eb5a9deffd3116352f6
Merge: 1bf71c5 d5b5584
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 2 08:23:31 2013 +0000

    Merge "Fix test_dbinstance not running by itself"

commit 1bf71c5ed58ca94d830314f44d9dcbb0944cab3b
Merge: 1f3ce63 144f5f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 2 08:22:14 2013 +0000

    Merge "Remove unused jenkins arguments from tox.ini"

commit 1f3ce63290fc8808a5f7a20eb45836d94372c643
Merge: e25158e 9103a87
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 2 08:22:00 2013 +0000

    Merge "Refactor instance tests to share common code"

commit e25158e038ab385c94f8b6c804ff11a8a086627e
Merge: 030362b e082629
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 2 08:11:32 2013 +0000

    Merge "Enhance testcase for failed resource deletion"

commit 030362b38389c8f30f3cb0906d39e00568f5c745
Merge: 1ba1280 5ae3de0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 2 08:09:07 2013 +0000

    Merge "Remove all references to nose"

commit 9103a87a09922c1980000836c8c1f6f9745336da
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 1 12:28:40 2013 -0700

    Refactor instance tests to share common code
    
    Change-Id: I565f6aee43d07f3fc451538ca02f9398eedebaf3

commit 1ba12808db573fc4c400ccd3c53dad114ed6868d
Merge: 4b8102f bbc772b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 1 23:43:08 2013 +0000

    Merge "Fix warning about using os.tempnam in test suite."

commit 4b8102f0fee773d463197f0cc9427fd84e5204ab
Merge: f4e8635 33dd5c6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 1 23:41:44 2013 +0000

    Merge "Fix "No handlers could be found" warnings"

commit f4e8635e276324d849c98164d8c8d0d34606c0e0
Merge: 887d230 8518ca0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 1 23:33:04 2013 +0000

    Merge "heat api : Update ec2token middleware for v4 signatures"

commit e121c46118f77102272884f92132a2e36e30257c
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 1 16:25:27 2013 -0700

    Fix test_validate to run by itself
    
    Resources were not initialized, so all tests would fail. Calls the same
    method which is called internally to load all plugins.
    
    Change-Id: I696f1d40499bb9a3ca6fde5d08101e9ddabc4369

commit d5b55844d221181a82331ce555f5088235951eb7
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 1 16:19:25 2013 -0700

    Fix test_dbinstance not running by itself
    
    This test seems to need a clean copy of the db like many others. Call
    setup_dummy_db to initialize so it runs reliably by itself.
    
    Change-Id: I60fcd6b5c94659f16ef85ca3bdbd61417c59322b

commit 887d230257130c4716f49b8ed301d2151119035d
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed May 1 19:03:08 2013 +0100

    heat tests : run_tests.sh reinstate text coverage report
    
    testr migration removed the text CLI summary report, so add
    it back in now for easy visibility of coverage results
    
    Change-Id: I419b1a9ea45f391a2cf623ad4431c93982ae5231

commit 5ae3de07b9fd48bd64cad22836cca947c971856d
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 1 10:33:30 2013 -0700

    Remove all references to nose
    
    Now that testtools and testr have replaced nose, trims all references
    and removes nose from test-requires.
    
    Change-Id: I0aae8fe2c09c5b25741226555838dc330d5c4d91

commit 8518ca055851e435396712914faa98071e37b863
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Apr 8 14:53:04 2013 +0100

    heat api : Update ec2token middleware for v4 signatures
    
    Update ec2token so it can verify v4 signature formats.
    
    Note for v4 signatures to work you currently need to install
    the latest python-keystoneclient, as no release yet contains
    patch ref https://review.openstack.org/#/c/26013/
    
    This change should be backwards compatible, as older keystoneclient
    versions will simply ignore the additional request keys
    
    fixes bug #1122472
    
    Change-Id: Iccc6be7913ab5ca5813a2e0c8f66cda0ccd85a0b

commit 144f5f1249dd0ea58748364bccef5242bc0750f2
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 1 09:39:34 2013 -0700

    Remove unused jenkins arguments from tox.ini
    
    These do not match the established testing patterns for OpenStack and
    seem to be quite redundant. They also mention nosetests which is no
    longer used.
    
    Change-Id: I874a226b515f1a8ad24136eba81a40fc170435b9

commit e082629400c0bec63925c162e93826ef3649578b
Author: Andrew Plunk <andrew.plunk@rackspace.com>
Date:   Wed May 1 11:02:11 2013 -0500

    Enhance testcase for failed resource deletion
    
    Verified that the test_access_key_no_user testcase
    was valid for bug/1155824 and made a small enhancement
    to verify the final resource state.
    
    Change-Id: I63c6d1b37166b24cedd18bf6cae3d0aae0b18fa6
    Implements: failed resource deletion testcase
    Fixes: bug #1156375

commit a9557085c828fdbf67fd69f5f1b4b6ef7c70c1ab
Author: Thomas Herve <therve@gmail.com>
Date:   Tue Apr 30 18:44:17 2013 +0200

    Retrieve the list of availability zones from nova in Fn::GetAZs
    
    Fixes: bug #1096001
    Change-Id: Ie5c46ae038dff4f53ba8d722e878583044bd194c

commit 33dd5c65cee3a8b7e97d3801d328e403ccbd7a0c
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 1 00:59:03 2013 -0700

    Fix "No handlers could be found" warnings
    
    These warnings are caused because nothing is capturing log output in
    their test cases. HeatTestCase automatically does this using the
    FakeLogger fixture.
    
    Change-Id: I7884c99cebc0c69f7675cdddd5e53de2e4b52c13

commit bbc772b3c7ace6ee904ea116356768447fa209ae
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 1 00:52:02 2013 -0700

    Fix warning about using os.tempnam in test suite.
    
    Change-Id: Ibd725071ccdd9af951034685880f35ac678feae2

commit a0df5125f4a07d7d9bf902332d02026a0cfde2ba
Merge: 5232aeb 85064fb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 1 02:15:15 2013 +0000

    Merge "heat docs: deprecate old GettingStarted guide"

commit 5232aeba7bd156c8a438751acc3da900e9b2ca4a
Author: Clint Byrum <clint@fewbar.com>
Date:   Sun Apr 28 09:48:43 2013 -0700

    Remove unused skip_unless and skip_test decorators
    
    Change-Id: I1519fc4b3b827ef35352968b67759b0b5d3fd5f2

commit 71ff5ae6cd4fcc18e502e6532359292fc67c175f
Author: Clint Byrum <clint@fewbar.com>
Date:   Sat Apr 27 08:43:23 2013 -0700

    Remove unused and outdated heat/testing dir
    
    The descriptions of testing are not in line with the test suite as it is
    today, and none of the code there is actually used.
    
    Change-Id: I717015184fea53d40fc8bd6782dcf4eb8a8520d4

commit 02def52cc2855fb41c78469a09c3d949a506303e
Author: Clint Byrum <clint@fewbar.com>
Date:   Sat Apr 27 08:37:41 2013 -0700

    Re-work run_tests.sh to call testr instead of nose
    
    Running testr directly or running the tests in tox are the preferred
    method at this point, but developers may still have automation around
    run_tests.sh.
    
    Change-Id: I5cd8a0e6bcee192440bdbc072dbd560615130def

commit 224e0be8fcdc3cbb2891f4ef438aca2978540930
Author: Clint Byrum <clint@fewbar.com>
Date:   Sat Apr 27 08:37:00 2013 -0700

    Remove broken --doctest call from run_pep8.sh
    
    It does not seem to actually be required and causes the script to fail
    when not running inside tox.
    
    Change-Id: Ib5be301054b08623ea31a97c1b2d6c341e7fdd3e

commit 2c4eea5500691a7cbc84fc0273a5a79bc03fe78d
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Apr 26 15:49:33 2013 -0700

    Remove use of nose attrib plugin and most unittest
    
    Some simple cases that do not use mox still use unittest directly.
    Replacing unittest.TestCase with HeatTestCase has the added benefit of
    capturing all logging for reporting during failure.
    
    Change-Id: I76192bdb91822055f1e2f7d2e806bf094d399304

commit fb6de9419fe729f2a46dcb10ce6191439d933218
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Apr 25 16:33:48 2013 -0700

    Removing all prints and capturing logging
    
    A new base class for tests is used to reduce repetitive steps used in
    a majority of tests. This new base class also uses fixtures.FakeLogger
    to suppress logging, though it will be shown on any failures to aid in
    debugging the failure.
    
    Prints that happen on normal operation of the test suite are all removed
    as they are not needed and only clutter the output.
    
    Change-Id: I0365283ce415c5390fd68bdf1f0b3c8038b1b9af

commit f40a4bb33346fb4022dfb6b94eab12befd61bd91
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Apr 25 16:17:24 2013 -0700

    Remove functional tests in preferece for tempest
    
    These tests are not unit tests, and take a long time. They are being
    moved into tempest, which is where integration/functional tests live in
    OpenStack.
    
    Change-Id: Ida7792a00a8565f812c55da448d8c50a8b8a90b9

commit 9ae4b981b8896a19a0ffdcb466058f2a74e2e0af
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Apr 25 16:16:20 2013 -0700

    Remove examples and update testing-overview.txt
    
    With the migration to testrepository, many of the instructions are
    obsolete. Also the examples are not needed as we have plenty of fine
    examples available in the code itself.
    
    Change-Id: I87524eaab4c39ea75d7e53fb11ffe103d5339cc3

commit 405510e2634dfe0005148b9fb041cfad2335e6e9
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Apr 24 20:07:37 2013 -0700

    Use testr for running gate tests
    
    Fixes bug 1172468
    
    Change-Id: Ifd87e44d752b4b3c77b4ea8f38feceb03bccaebe

commit 8b8525260df0e46ec26893e6149c4e930bf31aba
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Apr 24 17:30:35 2013 -0700

    Enable running tests via testr
    
    This also disables the functional tests from running. The code is still
    left here for posterity. These are intended to be moved into tempest
    test cases and thus will be removed entirely at that time.
    
    Change-Id: I294671baead6e83a8312b41681e99d395f861209

commit 36dea3a747b10092ee1e4c90d3a388868d4f4e46
Merge: daad31f 4ee2730
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 30 19:59:48 2013 +0000

    Merge "Make Resource.create() a co-routine"

commit daad31fccbd457972bcd99e9c3ee4cb4bce53beb
Merge: 1c58d13 459fb94
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 30 19:59:43 2013 +0000

    Merge "heat docs : Update jeos building documentation"

commit 4ee2730522ff7bcebf2c5f6dd917b500f608bc52
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 30 19:28:32 2013 +0200

    Make Resource.create() a co-routine
    
    At the moment, we will just run each co-routine to completion, but in
    future we can use this to return control to the caller so that resources
    may be created in parallel.
    
    Change-Id: I5c2daf3839e53d855acb73fc4288b5be76794c7f

commit 1c58d13f56812e8b14ff5b769b497015645623ae
Merge: 05236c2 160490d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 30 16:54:41 2013 +0000

    Merge "Add a scheduler module"

commit 05236c29deff749ee0606883323fddd920257ae4
Merge: 0524aa2 cb381b9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 30 16:35:34 2013 +0000

    Merge "heat api: fix ec2token authentication"

commit 85064fbaddfbdf8e9fcda15bbab273ca6fcf466f
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Apr 29 18:05:22 2013 +0100

    heat docs: deprecate old GettingStarted guide
    
    Remove content of the old GettingStarted guide and replace with
    a link to the new docs location
    
    Change-Id: I6af2b3bef05f920a9df77e4ec94b7c3c2dfbb68c

commit 459fb9472c9ac0ce7b906de24bffa78d7b249cfa
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Apr 29 18:00:19 2013 +0100

    heat docs : Update jeos building documentation
    
    Replace references to heat-jeos with documentation describing the
    use of the new heat-templates/tools/heat-jeos.sh example script
    
    fixes bug #1171602
    
    Change-Id: I88fd2a5667cccd79a77c4a663c782fb537279fac

commit 0524aa2f09cfb427da056e17a2879a543ec483fd
Merge: a6f2287 9531cbf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 30 10:00:47 2013 +0000

    Merge "Update tools/integration.sh script to new docs tree"

commit a6f228783ce9a6b8195b37b0e028ec88cbc37f1f
Merge: 7ce9a21 25dfc5f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 30 09:51:37 2013 +0000

    Merge "Validate properties against the schema in validate_template"

commit cb381b90bd20551354e6ce5b0a99c836a3f777f5
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Apr 30 10:38:04 2013 +0100

    heat api: fix ec2token authentication
    
    Since the change merged from https://review.openstack.org/#/c/27383/
    ec2token auth no longer works, because there is a mismatch between
    the config file section name and the section specified in ec2token
    
    fixes bug #1174673
    
    Change-Id: I5c0465de5c023f587b677b10717ca3a08ba411b7

commit 7ce9a214f0d090fcbb59d59524b152b72fe6fce2
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon Apr 22 11:03:18 2013 -0700

    Remove pyflakes_bypass
    
    There are valid pythonic ways to address all of the complaints that
    pyflakes made in the past.
    
    Fixes bug #1171420
    
    Change-Id: Idf145185ebb4df237fff887365fa0c48d3603025

commit c8711ce6504f35f399d51f224974ff23987781d5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Apr 29 19:30:13 2013 +0200

    Fix DB sync script
    
    Broken by a60f6d45693c8a0d70f78a0fa9216a8c54c062e7, since we don't
    import the db api into heat.db any more.
    
    Change-Id: If5175ae84c9da0c8787a162a549b727381c6fbd6

commit 9531cbf586c539bb7fa4defaa8097bf31da06d81
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Apr 29 17:20:41 2013 +0100

    Update tools/integration.sh script to new docs tree
    
    Update location to refer to the new fedora getting started guide
    
    Change-Id: I507e1102a1979debd975fa6601e5385b1a47a756

commit 25dfc5f062b5c8a9f9266173607c199931b4c07e
Author: Thomas Herve <therve@gmail.com>
Date:   Mon Apr 29 17:21:42 2013 +0200

    Validate properties against the schema in validate_template
    
    Change-Id: I81457d8d363226b90b2a878ec2c93f88b376dc83
    Fixes: bug #1154722

commit 2db9b282a00546c57b85c47ca5bcbee39f5c7924
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Apr 29 13:46:57 2013 +0100

    heat engine : register options before using them
    
    Fix regression caused by the __init__.py refactoring, which means
    we try to use cfg.CONF.host before registering it.
    
    fixes bug #1174302
    
    Change-Id: Iff4d75f53e242d7df8c7071cbeeead034a7ad9b0

commit 746877fe2ec4bb44edd88dd714eb6a20ef8162a2
Merge: 117e73b a60f6d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 29 11:59:25 2013 +0000

    Merge "Do not initialize anything during import phase"

commit 160490d3afbf2de25edb2bb4d20f27672b523395
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Apr 29 11:28:37 2013 +0200

    Add a scheduler module
    
    Utility routines for running coroutine-based tasks.
    
    Change-Id: I907d889a564a1118b7c9caa30f3ad65dfac76534

commit 117e73ba572ea421deabb7bd05318388439e2056
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sat Apr 27 13:20:04 2013 +0100

    Remove engine_topic configuration option
    
    Fixes bug #1173575
    
    This is currently broken since heat-engine always listens to the
    'engine' topic and there isn't actually a good use case for this to be
    configurable, so let's kill it.
    
    Change-Id: I35c0292c921f81857f80a7f111df5ac330d54ecf

commit e28a34f560b83527f2f7022ded4bc91efa2059f8
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sat Apr 27 13:08:52 2013 +0100

    Send RPCs to 'engine' topic not 'engine.$host'
    
    Fixes bug #1173573
    
    We currently send engine RPCs to the 'engine.$host' topic means that
    it is impossible to run heat-api and heat-engine on different
    machines because you can't configure heat-api with the hostname of
    heat-engine.
    
    Fix this simply by sending RPCs to 'engine' which heat-engine. We have
    always listened on this topic, so there is no backwards compat
    concerns.
    
    This is somewhat related to the multiple-engines blueprint, but
    doesn't really help or hinder it.
    
    Change-Id: Ibd4dc948ace4476bfa8e7fdc86e948a622416e58

commit 25b82f0a70677feb0f7221ad8a2ebc882faf0a4f
Merge: d437d86 c0c1768
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 26 03:54:43 2013 +0000

    Merge "Consolidated api-paste.ini file"

commit d437d8688540d69505fce0d274bf4bd960bc08f0
Merge: fd6a005 841ca88
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 26 03:54:40 2013 +0000

    Merge "Propagate deletion errors with exceptions"

commit fd6a00567b6f851309b37b40efdab9024975c61e
Merge: 39d17a6 f7c7d10
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 26 03:54:36 2013 +0000

    Merge "Mock delete_network in Quantum unit tests"

commit 39d17a68f057bbcdfa0f8c09101b7e3c180b1201
Merge: 33bd726 2570ef9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 26 03:54:34 2013 +0000

    Merge "Mark resources as failed when creation aborted"

commit 33bd7263d92dfa3c31ee4f0f8da778214885fd49
Merge: a2e8cab 9e90af1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 26 03:54:32 2013 +0000

    Merge "Propagate creation errors with exceptions"

commit a2e8cabd2a10da0c08468744d1781b8969f79544
Merge: b4263e9 28b6066
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 24 18:39:23 2013 +0000

    Merge "Move ec2token defaults from paste.ini to .conf"

commit b4263e9eb639c0f48faedfd50b62b9936b0ec937
Merge: f3be3d9 a4d2b3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 24 18:29:25 2013 +0000

    Merge "Optionally allow ec2token config to come from .conf"

commit a60f6d45693c8a0d70f78a0fa9216a8c54c062e7
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Apr 23 15:51:57 2013 -0700

    Do not initialize anything during import phase
    
    The structure of the program is compromised by doing too much logic in
    the import phase. We can read the code more cleanly if we can see where
    the intended initialization code is called. This may make tests slightly
    more tedious to write, but that should be handled by writing generic
    fixtures which can be reused for exactly this purpose.
    
    Change-Id: I1d221e2f90d1f6e89717a37d2128caabd077d30a

commit c0c1768e4a2b441ef286fb49c60419be3fe80786
Author: Steve Baker <sbaker@redhat.com>
Date:   Sat Apr 13 10:14:11 2013 -0700

    Consolidated api-paste.ini file
    
    Load a single api-paste.ini file, specified by config
    Delete unused paste.ini files
    Update docs for new paste.ini and config arrangement
    
    There will be a corresponding devstack change, and once this is in
    I will email the packagers on the packaging implications
    
    Change-Id: Ic10b1a486094d15bfd832f0f934e6268ec323085

commit 28b60667e259e433b3344ede78ee2eb752de273d
Author: Steve Baker <sbaker@redhat.com>
Date:   Sat Apr 13 08:48:24 2013 +1000

    Move ec2token defaults from paste.ini to .conf
    
    paste.ini files can now be considered not user-editable
    (in normal circumstances)
    
    Change-Id: Ia2a6d784ed2fad009de9e77717e6e0dc00c5e2f4

commit a4d2b3edbd926c9dbe15c8443954f5b85cc52d9a
Author: Steve Baker <sbaker@redhat.com>
Date:   Sat Apr 13 08:46:35 2013 +1000

    Optionally allow ec2token config to come from .conf
    
    Just like keystoneclient.middleware.auth_token
    first checks paste.ini file then .conf file when fetching
    a config value
    
    Change-Id: I9db9744d0ab12fcf486de9a9d3f8e870a4ff66de

commit 841ca88d1b68907e1aafd748ab6bc9be0280cb61
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 23 13:36:47 2013 +0200

    Propagate deletion errors with exceptions
    
    Change-Id: Ib8380f6d985e328c56d53b326700d6c9df636f40

commit f7c7d106fd303fec0d154b7488f083e9202cbf39
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 23 13:36:47 2013 +0200

    Mock delete_network in Quantum unit tests
    
    Change-Id: I0a1f0e56ed84aa4efcdf7c65c7c634f738bdddda

commit 2570ef9ccdb897692d8af91e75c880059b3a8df9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 23 13:36:47 2013 +0200

    Mark resources as failed when creation aborted
    
    Previously resources would be left in the CREATE_IN_PROGRESS state in the
    event of a timeout or the thread being cancelled (due to a delete being
    requested while the stack was still being created). We should instead put
    these resources into the CREATE_FAILED state when this occurs, thus
    creating an event with the reason.
    
    Change-Id: I05956aa9ef26941b79cef9dbf0cb6a347047d199

commit 9e90af14cfe0bbd2edef35ad48ca4328f4a02eb3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 23 13:36:47 2013 +0200

    Propagate creation errors with exceptions
    
    Change-Id: I567f1901e1203930d282620112368ac32440b9ed

commit f3be3d90b30b6beb5d1ba94a4589a4345469f544
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 23 13:36:47 2013 +0200

    Assert on Resource double-create()
    
    There's no valid case in which we should be creating a resource multiple
    times.
    
    Change-Id: Id90edd3a09ec15d3814a322ac0b7ec75fd0be54a

commit f12a2a326d547f85125479dd74e2a20aa4675263
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 23 13:36:46 2013 +0200

    Fix issues with EIP unit test
    
    The resource was not being destroyed correctly, but errors were ignored.
    
    Change-Id: I1caa9d092f58f458bd6da46f4cba4ad027b1fd38

commit f3454692fbd6808a8bd82844a1b191bc8d912a16
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 23 13:21:28 2013 +0200

    Get rid of create state in Instance
    
    We don't want to store any state in the Instance object, instead take
    advantage of the new mechanism whereby the result of handle_create() is
    passed to check_active().
    
    This makes the autoscaling code uglier for now (since it must still store
    the instance state in the instance), but this will go away when we move to
    using co-routines to create resources in parallel.
    
    Change-Id: Ib11c8da22900453eb9713eba5106859c8a09dbe2

commit 9bd13ec4d596c41d35f84e5880419808b6a021ff
Merge: 2b408a1 0f6e437
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 23 10:59:47 2013 +0000

    Merge "Clean up metadata refresh unit test"

commit 2b408a1ed97a823d38472e83f5fdd8dc5f41b648
Merge: 818f9e7 ea58e3f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 23 10:59:45 2013 +0000

    Merge "Get rid of create state in Autoscaling"

commit 818f9e7c67b49e62c389714a52668c1330f4dad8
Merge: a258040 78f0da4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 23 10:31:00 2013 +0000

    Merge "Fix pyflakes-bypass for PyFlakes 0.7"

commit a25804014b1c57c772847b9804f95123f59e7648
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Apr 8 15:47:46 2013 +1200

    Remove service _user, _password, _tenant from context
    
    These are not currently used anywhere in heat-engine, and I'm
    not comfortable with the service password going over the (controller)
    network.
    
    If heat-engine needs access to these in the future then they can always
    be configured in heat-engine.conf, or the operation can be performed
    in the api and the results put into the context.
    
    Change-Id: I81aab6b5a2c9aa7d6412531f70108857cbfa637b

commit 419a3d953e7c67dafc7b44b278eb432c27fe23be
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Apr 3 12:29:50 2013 +1300

    Move heat-api auth_token conf from paste.ini
    
    keystone auth_token middleware now allows heat to have auth_token
    configuration in heat-api.conf. Moves the example of
    auth_token configuration from heat-api-paste.ini to heat-api.conf.
    This simplifies user configuations and users is no longer required
    to edit heat-api-paste.ini.
    
    This does not break backward compatibility. auth_token first
    tries the configurations in /etc/heat/heat-api-paste.ini and then the
    above configurations. Thus a user who already uses heat-api-paste.ini
    does not need to change it.
    
    Change-Id: Ia0a4d912cd7380094e121ee4af733277ca4d812e
    Blueprint: keystone-middleware

commit cfda18b43e2e5782e5595e54f4a48f30b860e5dd
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Apr 8 15:35:55 2013 +1200

    Subclass keystone middleware to set headers
    
    Replace old forked auth_token with a subclass
    of keystoneclient middleware.
    
    The advantages of moving to keystoneclient middleware:
    - can use v3 (or v2) keystone api
    - PKI tokens
    - token revocation
    
    The subclass sets the following headers to be consumed by our
    request context filter:
    - X-Admin-User
    - X-Admin-Pass
    - X-Admin-Tenant-Name
    - X-Auth-Url
    
    The need to override _build_user_headers should be a short-term thing,
    X-Admin-* isn't actually used currently, and there are a few options
    that need to be discussed for getting X-Auth-Url to the engine.
    
    Change-Id: Iacc5046fbf559724a4ae0bd6091d662e23d65544
    Blueprint: keystone-middleware

commit f83b7eaf0940791002b8834890d7d903ec11a77d
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Tue Apr 23 00:12:22 2013 +0200

    Improve Python 3.x compatibility
    
    Mechanical translation of the deprecated except x,y:
    construct. the except x as y: construct works with
    all python 2.6+ versions
    
    Change-Id: Iad349b8079a01bbd66a22800ae2fcdfcde03b377

commit 78f0da46f21f2dcba2c69e782ad61be061012835
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Apr 22 18:24:56 2013 +0200

    Fix pyflakes-bypass for PyFlakes 0.7
    
    Don't make assumptions about argument types, get the line number from the
    message object.
    
    Fixes bug #1171420
    
    Change-Id: Id0b1b254a1561941dea8ab5bb23aea1f936e7f0b

commit 4ce8855fbc631e39170044f7edc9d3e0f6e5f923
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Apr 22 11:12:58 2013 +0100

    Simplify rpc client calls
    
    We always pass host=None to _engine_topic() which means that we always
    construct a topic using CONF.engine_topic and CONF.host.
    
    And since RpcProxy methods falls back to the topic supplied to its
    constructor, we never need to explicitly pass it.
    
    We can safely remove the _engine_topic() method and the passing of an
    explicit topic to RpcProxy methods and replace it with constructing the
    correct topic at construction time, without causing any functional
    changes.
    
    While we're at it, replace the last use of the variable name FLAGS with
    CONF.
    
    Change-Id: Iefdc6b78a068975ac45b10d6b53210cb283d2ef8

commit feb98c5c261fa69c0d251329ac25b65a5fdc5d37
Merge: f982c31 bfdee58
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Apr 14 20:07:21 2013 +0000

    Merge "Pass data from handle_create() to check_active()"

commit f982c315ccd105c219a6f3951e0cc071a5cc549b
Merge: 7dbf505 7b1bf19
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Apr 13 17:12:45 2013 +0000

    Merge "Updated OpenShift template"

commit 7dbf505e155c37ebc5fa36d9fa98f0dbf596efb8
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 12 17:07:59 2013 +1000

    Fix the exception message in stack_resource.get_output()
    
    Change-Id: Ifa81e3e9062e3e731ff1989f41f390171c203c71

commit 7b1bf192cc3907053865374ccf2a487fa378f3a2
Author: Krishna Raman <kraman@redhat.com>
Date:   Thu Apr 11 22:37:04 2013 -0700

    Updated OpenShift template
    
    OpenShift Origin images require a lot of packages. So, although the OpenShift
    Origin HEAT template can be adapted to run with JEOS images, they would take
    > 25 min to spin up. Instead, I have opted to create heavier images to speed up
    machine creation. @See https://github.com/sdake/heat-jeos/pull/49
    
    Change-Id: I371d28a9833a48a6b588f907cce3298b30552e90

commit e346a21addf150c3ef107bc004d4a0c96b72b4b1
Merge: 9316876 5a3e5b2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 11 22:05:36 2013 +0000

    Merge "uses os.urandom instead of Crypto.Random for backward compatibility"

commit 9316876095ab96d420b79e7c0336cf6196a23639
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Apr 11 20:08:24 2013 +0200

    heat-cfn: Handle parameters with = in them
    
    Change-Id: Iee193169ec3dd583158ad929df20541ec210149b

commit 5a3e5b2cd22cb567203f06d337cf9a457f59915b
Author: Giulio Fidente <gfidente@redhat.com>
Date:   Thu Apr 11 17:31:53 2013 +0200

    uses os.urandom instead of Crypto.Random for backward compatibility
    
    Crypto.Random has been introduced by pycrypto 2.1 but in RHEL6 and
    derivates you will only find pycrypto 2.0.1
    
    Change-Id: Ib601981b0b8fcb5b3e8fc8761ee05adf7f6574fa

commit 4e426f92ea819ad4f13ae39cf36066b8b983c3b8
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 10 19:14:31 2013 +1000

    Update the README to point to docs.openstack.org/developer/heat
    
    Change-Id: I056b84b437e4c7522dd61af780eb3e60dd0775c6

commit 09dace6e0e866d7d1067eb8f33d7b68379a907be
Merge: cb4115e 6e65b88
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 10 06:43:07 2013 +0000

    Merge "Update to the latest loopingcall from oslo."

commit 0f6e437e889f4a8d7b7c197047a380b04803f3c8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 9 20:01:24 2013 +0200

    Clean up metadata refresh unit test
    
    The stack was not being fully created, because the calls to the mock
    functions were not present for the second instance.
    
    Change-Id: I894473533eb40133e4c22facbbee749a971cec89

commit ea58e3fd0b2137a8f141750bc7029c03c907f6a2
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 9 20:01:23 2013 +0200

    Get rid of create state in Autoscaling
    
    Avoid storing the state of instances that are currently being created in
    the instance group resource itself. Instead, ensure that they are returned
    from handle_create() and take advantage of that result being passed back in
    to check_active().
    
    Change-Id: Ie2c75eaee620aa0599665168bfb92b345128d392

commit bfdee58d2e8d60cb87545a62bd9d2d9c1b372a04
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 9 20:01:23 2013 +0200

    Pass data from handle_create() to check_active()
    
    All resources that implement check_active() will require some state to be
    retained from the call to handle_create(). Saving this as state in the
    Resource object results in repeated, ugly, and potentially error-prone
    code.
    
    Instead, allow a subclass-defined state object returned from
    handle_create() to be passed to check_active(). This ensures that the state
    is limited in scope to where it is meaningful (during the create
    operation), and that it will be garbage-collected at the appropriate time,
    even if an unexpected exception occurs e.g. because a thread is cancelled.
    
    Change-Id: I9d690b44a066aaf33970562a2b9a55c633a7d4e8

commit cb4115edc59a1a006f5198063cf9dfb3d9ff38b7
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Apr 9 17:59:08 2013 +0100

    heat templates : Update Wordpress config for F18 guests
    
    F18 contains apache 2.4 which requires a different syntax to enable
    non-local access to the wordpress install
    
    fixes bug #1166897
    
    Change-Id: Ia63cceeba35904f05a1b4cf76fc075d3cdc7cd86

commit 092222de42ca094039364e9a6c4c486a8071220e
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Apr 8 18:20:43 2013 +0100

    heat : Getting started updates for grizzly
    
    Update GettingStarted to drop references to F16/essex and add the
    password sed which is required when running grizzly installed via
    tools/openstack on Fedora
    
    Change-Id: I08d265e2e2388b54a6aa9f47c4930c32f71f3e93

commit 011d8397b4bd6c96af2ab654a5009a01b8c85775
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Apr 8 17:47:39 2013 +0100

    heat : cloudwatch paste.ini credentials incorrect
    
    The cloudwatch paste config should specify service/heat
    like the other API services, not admin/admin
    
    Change-Id: I0590c88edd6b544aba467ab171dd7f610b50c380

commit 57975d377a899b4febf2a12b02fdeaf050174a26
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Apr 8 17:46:38 2013 +0100

    heat tools : openstack script fixes for grizzly
    
    Update tools/openstack so it works with the grizzly preview repo
    (tested on F18 with both grizzly repo and folsom distro packages)
    
    fixes bug #1164605
    
    Change-Id: I347a53c9be677131dad37f9fbeb1ed5eb9cb810b

commit c6e812d4fe084c1156be35f5d4f5fd1703c1b72e
Merge: d5c258c 1b63311
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 9 05:35:05 2013 +0000

    Merge "Remove paste config for non-existant cache filters"

commit d5c258c1de9c94dccb093167542c209c21627a42
Merge: 10d939a 412a0d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 9 05:35:02 2013 +0000

    Merge "Remove unused and deprecated auth-context filter"

commit 6e65b881c00bfcdea6ef81cc0e3bb06b20299147
Author: Michael Still <mikal@stillhq.com>
Date:   Tue Apr 9 15:05:30 2013 +1000

    Update to the latest loopingcall from oslo.
    
    This needs threadgroup as well, as it uses loopingcall.
    
    Change-Id: Idfa68519c9e263830c9e6a16c2e1bfbd8c89069d

commit 1b633110926649a4751ee2f399273f5864c004c8
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Apr 5 15:55:31 2013 +1300

    Remove paste config for non-existant cache filters
    
    This appears to be junk DNA from glance, which has filters
    for caching image files.
    
    Change-Id: Id7ae29028d351dd005a61a5727bc7d40ceb0a705

commit 412a0d5696a0a0006def931e648fedd2936c95f5
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Apr 5 15:47:11 2013 +1300

    Remove unused and deprecated auth-context filter
    
    keystone.middleware.auth_token is now just aliased to
    keystoneclient.middleware.auth_token.
    
    Also heat_auth_token doesn't seem to exist, so this has likely
    always been broken
    
    Change-Id: I5eadd9a02e41921b39fc8b6783c22010893bb5e9

commit 10d939a1c6fe885f3400539cb8d3d2713e05b766
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Apr 8 12:43:35 2013 +0200

    Attempt to delete resources even if they failed
    
    To do otherwise risks leaving resources silently running that exist but
    have experienced some kind of error during creation.
    
    Fixes bug 1165023
    
    Change-Id: Ie60fb053b1a596d102ca1b6a8429dd50ed41ff92

commit 36ab0d79cbb3489f6095f9dca65297a9a5f1451d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Apr 8 12:43:35 2013 +0200

    Fix AccessKey deletion with bad credentials
    
    If an AccessKey could not be created, it also could not be deleted. This
    change allows deletion of the resource to proceed even if the user does not
    exist.
    
    Fixes bug 1155824
    
    Also fixes a bug that the actual key would never be deleted, because the
    resource_id is set to None beforehand.
    
    Change-Id: I34886410e3e25ad62e4eba537063f922b011e25a

commit 4128aeed6213df08bb38a0046dae3d708e693d78
Merge: d86bc52 f8b684d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 8 09:43:34 2013 +0000

    Merge "ReST API: Translate the documentation to WADL"

commit d86bc52c927f780367cedb5a732a467c44ee46eb
Merge: fc90b85 e466eee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 5 07:32:08 2013 +0000

    Merge "Delete unused ContextMiddleware"

commit e466eee5217132dac5353194a718b992221bf520
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Apr 5 13:41:03 2013 +1300

    Delete unused ContextMiddleware
    
    heat.common.context.ContextMiddleware appears to be the only
    one that matters
    
    Change-Id: If4166fa75f7179251b132ac6082b7f29d94b6e97

commit fc90b85bf847fdfe76d2826a1846f73582ff81ea
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Apr 5 11:35:28 2013 +1300

    Replace deprecated commands with current equivalents
    
    Change-Id: I871d7f0e5cd0a22a284a6e6733607feafbbb52a2

commit 19afa57bfd3fe5f74094dd548f37b509ea06e816
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Apr 5 11:30:59 2013 +1300

    Fix sphinx warnings
    
    Change-Id: I0e2e837d7114bde22a5a4b2ffb65aa06416c0a97

commit f8b684d9a86b4078e53b7a4f972f89cd878a584c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Apr 4 19:25:24 2013 +0200

    ReST API: Translate the documentation to WADL
    
    Change-Id: Ib1847ee2266d188f198fdf8fb7feb53770d9c1a5

commit 625466fd2e69da1f4a0e4c4548fcd8af76688112
Merge: 02f0cb3 2b42043
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 4 15:15:38 2013 +0000

    Merge "Add Getting Started Guides the developer doc's"

commit 02f0cb37057442a064e7f57f1d8f244cf5a38dd4
Merge: b8c155c f3fc5c5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 4 15:09:49 2013 +0000

    Merge "No longer pass no_cache=True to novaclient create"

commit b8c155cbd65531e2d9bb4a972b2fc0ca09e0b3f1
Merge: 7280ffd 0998dc3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 4 15:07:58 2013 +0000

    Merge "Pass in endpoint url for quantum auth_token auth"

commit 7280ffd521d182d5e783426fadc5c6b7fbda482f
Merge: 7bf3aad 8234fb0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 4 15:07:56 2013 +0000

    Merge "Allow nova operations with only auth_token"

commit 7bf3aad738cd289dd451237ccd83a85630d48012
Merge: d613912 84ec72a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 4 15:06:26 2013 +0000

    Merge "Pass in endpoint url for swift auth_token auth"

commit d6139120609807eb54f0ea48748122c54df01a8f
Merge: cd9406a 66d4326
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 4 15:06:23 2013 +0000

    Merge "Allow cinder operations with only auth_token"

commit cd9406a814ca0a416f721531801e9c20ed46ee2d
Merge: 3fb3449 4aac029
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 4 07:29:41 2013 +0000

    Merge "Log tracepath for stack validate exceptions."

commit 2b420437fd9101c0214dee81c2b7299d746e93c0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 4 15:28:04 2013 +1100

    Add Getting Started Guides the developer doc's
    
    These have been copied from the wiki.
    
    DocImpact
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
    
    Change-Id: I4c93bc5a1811e674cef3c7868e7cf9a457c12dea

commit f3fc5c579b720f42db256bf6ccaa9aa15e848f92
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Apr 2 15:09:29 2013 +1300

    No longer pass no_cache=True to novaclient create
    
    The default is now os_cache=False, so default behaviour will not
    use a keyring that prompts for a password.
    
    This was committed on 2012-12-12 and released in
    python-novaclient 2.11.0 on 2013-02-11
    
    Part of blueprint auth-token-only
    
    Change-Id: Id2846b2e344f8e3321240795aebf9a59ddad711a

commit 4aac0292266d711ac17bcc486c1e0fa2764c35cc
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Apr 3 12:41:13 2013 +1300

    Log tracepath for stack validate exceptions.
    
    Calling validate on each resource exercises a lot of code, and
    will at times cause non-validation related exceptions.
    
    This change just logs the tracepath for any exception that happens
    during validate.
    
    This may be a contender for backporting to milestone-proposed,
    since diagnosing some problems on the grizzly branch will be
    difficult without it
    
    Change-Id: Ib010a8ec826552e2817da3a22c633dcac6c3ffc6
    Fixes: bug #1163586

commit 0998dc347842962a72d8aa8ef15db424b9472368
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Apr 2 15:57:19 2013 +1300

    Pass in endpoint url for quantum auth_token auth
    
    This aligns quantum auth_token only authentication with the
    way Horizon does it.
    
    Tested by launching a stack with and without the --token-only flag
    
    Also tested using Horizon, which is auth_token only
    
    Part of blueprint auth-token-only
    
    Change-Id: Ic6d471de527951415ef4858cbbff27cf60561924

commit 8234fb0d0e7d4a1398c983e3c018575b4f35e43a
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Apr 2 14:57:51 2013 +1300

    Allow nova operations with only auth_token
    
    This uses the same technique as Horizon for auth_token operations.
    
    Specifically, the nova endpoint is found directly from keystone
    and the auth_token and management_url are set on novaclient
    after it has been created.
    
    Note that the explicit call to authenticate() is not required
    and actually breaks the auth_token case.
    
    Tested by launching a stack with and without the --token-only flag
    
    Also tested using Horizon, which is auth_token only
    
    Part of blueprint auth-token-only
    
    Change-Id: Ic11a838b96a4b5130cb2ac9d685e8a97c9d0a0ad

commit 84ec72aa6770e4acd612bb18369de5aef9198d59
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Apr 2 14:13:18 2013 +1300

    Pass in endpoint url for swift auth_token auth
    
    This aligns swift auth_token only authentication with the
    way Horizon does it, and avoids python-swiftclient bug #1160172
    
    Tested by launching a stack with and without the --token-only flag
    
    Also tested using Horizon, which is auth_token only
    
    Part of blueprint auth-token-only
    
    Change-Id: I0622f76e93df4f7353fc0cc61dc962b6c8f0be11

commit 66d432663265dc5ae2ba009249847c5f6fde400f
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Mar 28 09:29:38 2013 +1300

    Allow cinder operations with only auth_token
    
    This uses the same technique as Horizon for auth_token operations.
    
    Specifically, the cinder endpoint is found directly from keystone
    and the auth_token and management_url are set on cinderclient
    after it has been created.
    
    Client libs are in theory capable of looking up their own endpoints
    given an auth_token, but in practice this is the code-path least
    travelled and there are many issues. I think it is best to do what
    Horizon does, since all Horizon operations use only a token and always
    provide the endpoint to the client lib.
    
    Tested by launching a stack with and without the --token-only flag
    
    Also tested using Horizon, which is auth_token only
    
    Part of blueprint auth-token-only
    
    Change-Id: Iea9159299ad3f354bcc768c9ac1172d6d9f814a8

commit 3fb34493bf361a54cd9aaa97975544461b0a21c2
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Apr 2 13:24:09 2013 +1300

    Catch NotFound exceptions on Volume handle_delete
    
    Currently stack delete fails if the underlying volume is
    already deleted.
    Fixes: bug #1163067
    
    Change-Id: I9d7c009f70a0bb7274f3e19cbe10e9061c5e2d60

commit d388e48fa30ac3bd602dacf111eaa3f7518a4480
Merge: 1fdb61d ad79106
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 1 18:10:49 2013 +0000

    Merge "Fix swift client token authentication"

commit 1fdb61d88835510cc94ddafa473fd0e4abe0aad6
Merge: 8d36abf 4f953f4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 28 09:31:45 2013 +0000

    Merge "Make swift FnGetAtt fault tolerant and block less"

commit 8d36abfb1a0d457814233289e2d2fac1ef3d9ef8
Merge: 2ac3b8b b76eb46
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 28 09:30:20 2013 +0000

    Merge "Don't assume a Parameter value is a str"

commit 2ac3b8b8742c05fc5faf2295b5d00f4f12b4aab9
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Mar 27 16:08:41 2013 +0000

    heat engine : Autoscaling reload Loadbalancer correctly
    
    Since the change implemented as part of bug #1136148 we no longer
    wait for nova to create the instance before reloading the loadbalancer
    which means we race nova assigning an IP to the instance and typically
    the loadbalancer config ends up with the 0.0.0.0 default value
    which the loadbalancer implementation uses when nova returns no IP.
    
    This patch moves the LB reload into a separate function, which is called
    after instances are active on group creation or adjustment
    
    Since our loadbalancer is broken without this fix, this is a candidate
    for backporting to grizzly milestone-proposed.
    
    fixes bug #1160407
    
    Change-Id: I50423883dead9a615aa79b8765d5480a9345686d

commit b76eb46fdeb3431b5220dd909334ba64b7a2515b
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Mar 27 13:35:54 2013 +1300

    Don't assume a Parameter value is a str
    
    Currently show_stack and list_stacks will fail for templates
    which have a Number in the Parameters.
    
    This should be considered for backport to milestone_proposed.
    
    Change-Id: I1b20babf0998f7714f8bc7bf144e03ff1d7c0c91
    Fixes: bug #1160653

commit 4f953f4e8815f00bb3d0ebbfd68338bd668be133
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Mar 27 10:02:31 2013 +1300

    Make swift FnGetAtt fault tolerant and block less
    
    head_container is now only called for required attributes
    and will tolerate failure if there is an issue with the underlying
    container.
    
    This was preventing deleting of stacks with swift resources.
    
    Possibly this is eligible for backporting to milestone-proposed.
    
    Change-Id: I2f489126957f11924943955a7f63a2ebc45f1911
    Fixes: bug #1160584

commit c105af573ede8670e421fb69b50614e869303d35
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Mar 26 09:44:10 2013 +0000

    heat : remove fallback ec2signer implementation
    
    Now keystoneclient 0.2.3 has been released, we can remove the
    temporary internal ec2signer implementation
    
    Change-Id: I9f050b8771400384615f1ae7f3da76da501e5197

commit ad79106093f0ef7f85df8b1fdd490e0c7a5a0df1
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Mar 26 17:11:47 2013 +1300

    Fix swift client token authentication
    
    Triggered by launching a stack containing swift containers
    through Horizon.
    
    The swift client does its own endpoint lookup if we don't know
    it, so we don't have to do it ourselves. Also, our endpoint lookup
    was broken in the auth_token codepath.
    
    Part of blueprint auth-token-only
    
    Change-Id: I1876f233001a58cb17e7dd7d5cf8883e295a9b87

commit 6975739b1ef133d4fdcab2b29091413c47d40205
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Mar 20 16:52:49 2013 +1300

    validate_template returns whole Parameters snippet
    
    Currently the engine validate_template returns cfn formatted
    Parameters from the template, which isn't actually very useful
    to build a full UI from a validate call.
    
    This change returns the original Parameters template snippet
    and changes the cfn api to reformat to the CFN API legacy format.
    
    The Parameters section of the RPC and the REST APIs now return
    a dictionary containing the parameters as specified in the template.
    Previously the Parameters section contained a list in the CFN API
    format.
    
    Pseudo parameters are filtered out of the validate results.
    
    Change-Id: Iea53dc847ff13f5f479ec3a66bcf141c4ccaeb25
    Fixes: bug #1157537

commit 84ba8f8ef9ca0b9c53817f387e568a71ab2d4cf8
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Mar 21 17:45:43 2013 +0000

    heat getting started : fix heat-jeos URL
    
    heat-jeos URL is wrong since heat-api org got deleted
    
    Change-Id: Ic1a89117e9928931fdc07f8fe2934a9d965e3c1e

commit 1b609f3c0621c44e4988a166a38f36c2b57eb4c6
Merge: e735729 6d8c46e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 21 02:09:27 2013 +0000

    Merge "Get rid of versioninfo cruft"

commit e735729970568a4cdf7d3cd036d7e007b14a3afd
Merge: dfd6efc a924df9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 21 00:04:51 2013 +0000

    Merge "Tolerate missing keys in reformat_dict_keys"

commit dfd6efc23d14fb8e5b9d3d92851d391c937868c4
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Mar 20 19:13:16 2013 -0400

    Change executable file permission for rpmlint
    
    (sync.py)
    
    Change-Id: I335510e6ef2788389248de90c05191c84440ff78
    Fixes: Bug #1158009
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit d665740935473eda873ea47915674306181b8d7d
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Mar 20 18:53:31 2013 -0400

    Change executable file permissions for rpmlint
    
    Fixes: Bug #1158009
    Change-Id: I761debfb77be5cf5204af90a013d7f4f043fdb17
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit a924df95b53de114898e185d70ff2d98ae3b7a87
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Mar 21 10:42:28 2013 +1300

    Tolerate missing keys in reformat_dict_keys
    
    For validate, some keys are optional but still need mapping
    if they are there.
    
    Helps bug #1157537
    
    Change-Id: Ib29cd99979a84892a98117c607651ea4c352e3d1

commit 6d8c46ef41c2f6c3e126ec4d8b28bb2e2535fb80
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Mar 20 14:08:28 2013 -0400

    Get rid of versioninfo cruft
    
    The version information is no longer stored in a file.
    
    Fixes: Bug #1157885
    Change-Id: Ide0662ad3d7b2596743cd9427bc3b50e8357ffe1
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 8c6dfdea9bd3504461845fe3c6bfa2d24e633570
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Mar 19 14:54:35 2013 -0700

    Bump Heat version to 2013.2
    
    Heat PTL Signoff for 2013.1
    
    Change-Id: Ic8d91e1629642bbb54f673c1e879898d66e010bc

commit 4efb51ccf1a08f329279cfb979d98916d57ed733
Merge: bb9cb5f 0803b49
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 18 02:40:36 2013 +0000

    Merge "Create a wsgi factory method for Debug filter."

commit bb9cb5f34caea5a6bff83f1ad19c3640a9d8289f
Merge: e08ff18 7e758d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 17 23:32:28 2013 +0000

    Merge "If a stack create fails, ensure the stack is deleteable"

commit e08ff182a460c44647e1291238ad4901e2ce0f74
Merge: 9b6b6df bc8f069
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 17 21:04:42 2013 +0000

    Merge "Add heat-keystone-setup man page"

commit 0803b49e4961c81588795ee47e45eca64f24919d
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Mar 18 09:21:35 2013 +1300

    Create a wsgi factory method for Debug filter.
    
    This can be enabled by putting the following in the *-paste.ini
    file:
    [filter:debug]
    paste.filter_factory = heat.common.wsgi:filter_factory
    heat.filter_factory = heat.common.wsgi:debug_filter
    
    and adding 'debug' to the pipeline.
    
    This assisted with bug #1133792
    
    Change-Id: I4c2d3194ac9673d095b4115d4b6f385fd2f4fa4e

commit 7e758d5915cdb559db0587c327f3e80189b89e9c
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Mar 16 13:37:29 2013 -0700

    If a stack create fails, ensure the stack is deleteable
    
    The resource delete operation attempts to delete CREATE_FAILED
    resources.  Further it attempts to delete resources that were
    not created during a creation operation because further processing
    of the template does not take place.
    
    This patch special cases these two conditions in the delete operation.
    
    Change-Id: I1c83ba68754f38a0f7e91e77fcf02177c457504e
    Fixes: Bug #1155824

commit 9b6b6dfe56f228f6f46c233c9af7e67dd1a6a8c0
Merge: 9288d3e 76a0fb4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 15 21:43:43 2013 +0000

    Merge "heat docs : Add 2013 to the copyright string"

commit 9288d3e33e3359c98205d382c439315acc2ad43c
Merge: a7ae6d7 30fab61
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 15 18:18:27 2013 +0000

    Merge "Add a manual page for heat-db-setup"

commit a7ae6d7e246eda245c35b56f4e5f829cd5a28208
Merge: b91604f 0a6af7d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 15 17:19:18 2013 +0000

    Merge "Use built-in exception filtering for GreenletExit"

commit 30fab6117729e31756359c91aea9420cc74bff90
Author: sdake <sdake@redhat.com>
Date:   Thu Mar 14 11:31:19 2013 -0700

    Add a manual page for heat-db-setup
    
    Change-Id: I628d9e1295238b0bc405fc6ccb464889b85090e0
    Fixes: Bug #1153691

commit bc8f0699289699bf4095ea0dbe6fd5c9dd092ba7
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Mar 14 15:03:55 2013 -0700

    Add heat-keystone-setup man page
    
    Change-Id: I314ce01d35d65e3b50b72d2abaf51710b8461da7
    Fixes: Bug #1153693

commit b91604f8f7d656d6162d6df852a59d9eadc753dc
Merge: 3b43cce 89005a0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 14 22:18:45 2013 +0000

    Merge "part-handler: add missing import"

commit 3b43cce6e69ad5cc7e291c79be3429d238de518e
Merge: 7ed79c6 655e377
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 14 22:18:03 2013 +0000

    Merge "loguserdata: handle exceptions from running the userdata"

commit 7ed79c6f0750f1de5a312d0fced73c98678289ae
Merge: eb52664 ac8b8f9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 14 22:14:24 2013 +0000

    Merge "Allow per-deployment configuration of user id"

commit eb52664146a69c0385018d8873d17e9c1ebd9127
Merge: 2daef27 5862514
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 14 22:13:31 2013 +0000

    Merge "Remove ssh from cloud-config-files"

commit 2daef27b6a5c03c0ae240dbb6672fd50e7ca25c8
Author: sdake <sdake@redhat.com>
Date:   Thu Mar 14 11:30:34 2013 -0700

    Sort the manual page list in conf.py
    
    Change-Id: I81c193c23a3b78cb98d54157a486bf15dc3ab979
    Fixes: Bug #1153691

commit ac8b8f9c42911529aab585413bbd7344bd754dad
Author: sdake <sdake@redhat.com>
Date:   Tue Mar 12 21:50:58 2013 -0700

    Allow per-deployment configuration of user id
    
    Previously user ids of new instances were limited to ec2-user.
    This patch adds a new configuration option to be placed in
    /etc/heat/heat-engine.conf called "default_instance_user" which
    allows the default of ec2-user to be overriden.
    
    Note for reviewers that runcmd does not work properly.  It was
    actually running after the loguserdata.py script finished execution.
    
    Fixes: Bug #1101347
    Change-Id: Ica2dbe63d9dcbce8bb8de298eba452c34ab173d9

commit f72dbac99a125b677f644e155b2eb58c6f11cd15
Merge: 1a36279 fbea931
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 14 15:38:24 2013 +0000

    Merge "loguserdata: prevent shadowing of arguments and globals"

commit 5862514aef704409e5d4463827953e06ced207b6
Author: sdake <sdake@redhat.com>
Date:   Thu Mar 14 07:38:31 2013 -0700

    Remove ssh from cloud-config-files
    
    the cc_ssh script already executes in cloud config without being
    explicitly called.  As it is now, it is executing twice.
    
    Make it execute only once.
    
    Change-Id: I2d53adbea0175f63db71be516639d40aa0f8a1de

commit 1a36279f64ef3c9e46bec17b10815914e8c97e82
Merge: cbf3686 8e49385
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 14 11:01:59 2013 +0000

    Merge "Update dependency versions to match oslo-incubator"

commit cbf3686a6b7da99588d804ed01da982179b1651d
Merge: a492c6e 834b87a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 14 05:45:08 2013 +0000

    Merge "heat engine : fix exception syntax issue"

commit 655e377d456b090a061f8c34a050284ed2e4b6ee
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 14 14:21:55 2013 +1100

    loguserdata: handle exceptions from running the userdata
    
    - log the exceptions so the user can diagnose issues.
    
    bug 1154641
    Change-Id: Ic085c9f062255a9fa44b3e31b464c9ebd19a947c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit fbea93155097d283b3b1b479d2c3ade3c233d287
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 14 12:33:23 2013 +1100

    loguserdata: prevent shadowing of arguments and globals
    
    cleaning this up for bug 1154641
    
    Change-Id: I95271bdeba1bba29e78af79de4e2173d07750e4f
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 89005a04e72b553ea76b28d3694cc2a3c069feec
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 14 12:25:12 2013 +1100

    part-handler: add missing import
    
    errno is used in the excption but not imported.
    
    bug 1154887
    Change-Id: I1c2961f08824d919ed2483a0a9cf54c50862f354

commit a492c6e04f83c7897290765083a396647dff0b74
Merge: 20cf011 6d6b993
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 13 22:17:40 2013 +0000

    Merge "Remove Nova dependencies from hacking test"

commit 20cf011566195e7d6464fb3869637a72c548772e
Merge: 22c9c4e 481c810
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 13 19:15:37 2013 +0000

    Merge "heat docs : Add heat-watch manpage"

commit 834b87a258a162ff8462de98b54a8036bf592d87
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Mar 13 18:03:34 2013 +0000

    heat engine : fix exception syntax issue
    
    Fix exception clause to use a tuple or the two types of
    exception are not correctly caught.
    
    fixes bug 1154708
    
    Change-Id: Ia742c92dc189d03f8034ca864334526f1234dde3

commit 22c9c4e76f964be7ae55f4959ef7a482102d02c0
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Mar 13 14:12:29 2013 +0000

    heat docs : Add manpage for heat-boto
    
    Fixes bug 1153688
    
    Change-Id: Ie48c7158d253951e5885e8b701cd1c4c9a5fa37e

commit 6d6b993287b9f166a4b92107df650373d52899d1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Mar 13 12:41:06 2013 +0100

    Remove Nova dependencies from hacking test
    
    References to Nova in the docstrings(!) of the hacking.py tests caused the
    run_pep8.sh script to fail if the Grizzly development version of Nova was
    not installed. Update all the references to use Heat packages instead.
    
    Change-Id: I2e84e9a231451705d61fa9acddc65ee95a98e294

commit 76a0fb43dc694351c6f68355276155df046216ce
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Mar 13 11:39:13 2013 +0000

    heat docs : Add 2013 to the copyright string
    
    Change-Id: I0c86ccfd7232396d1fc6883b37adc2d5b877d19c

commit 481c8104edee778c31ba64220a8b1188a98bdcaa
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Mar 13 11:37:59 2013 +0000

    heat docs : Add heat-watch manpage
    
    fixes bug 1153689
    
    Change-Id: I7a4566cb850cf94761c1948fa7ad976e7d4f5446

commit 8e4938525793fb601c7372bf9bcb69fe33ebecb3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Mar 13 09:28:14 2013 +0100

    Update dependency versions to match oslo-incubator
    
    Fixes bug 1097843
    
    Change-Id: I3bd56261ed9e3640adb07965d4394d99db45e0b5

commit 7149a817b023b5f731a79901af8de4ca671a0247
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 13 17:16:20 2013 +1100

    Fix security groups (need to be accessed as attributes)
    
    bug 1134193
    Thanks Lukas Barton for the patch in the bug.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
    Change-Id: I448ba76fcf47d4e02775ff8eca38897eb399a3cc

commit 724a6fed27f747cf6b851313bd4e697383b91c4d
Merge: 4df46a4 193f2b2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 13 00:39:21 2013 +0000

    Merge "Remove todolist from docs index"

commit 193f2b257c631ecb778a47b46f583f4fd9ec22ac
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 13 11:13:12 2013 +1100

    Remove todolist from docs index
    
    This does not seem to be supported, so removing.
    
    bug 1153681
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
    
    Change-Id: I830980997438562d1ec241c33fcd8e67c32b21d9

commit 4df46a413a1c3ea3b5354fd88491d9484d9cc07c
Author: Ian Main <imain@redhat.com>
Date:   Thu Feb 28 23:30:59 2013 -0500

    Only split roles if they are not None.
    
    Change-Id: I2fbfbd6f6b1c898f7032744f9411821d5d97048c
    Signed-off-by: Ian Main <imain@redhat.com>
    Fixes: bug #1136891

commit c8411a3cb2b2a5aa2b756c2cfb5a359a25f75fd7
Merge: b754782 b15bd9d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 12 19:34:32 2013 +0000

    Merge "Revert NestedStack FnGetRefId changes"

commit b754782b343ee5bb3d38bd722182269e56a1b630
Merge: aa33775 2075f94
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 12 18:35:08 2013 +0000

    Merge "heat engine : Add validation of stack names"

commit aa3377512c8c8c8f118c38645f4a5a02f5565c3c
Merge: f2b1d4b b2e15ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 12 18:35:05 2013 +0000

    Merge "heat templates : Update for F18"

commit b15bd9d778772ed86d5a0d8a8be92485596127a9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Mar 12 19:29:38 2013 +0100

    Revert NestedStack FnGetRefId changes
    
    This partially reverts commit e376c83cbd57c0720336848e4b82e3b7b804a347.
    
    Allow StackResource to set the resource_id, since it will be the one
    retrieving the stack using it.
    
    Fixes bug #1154202
    
    Change-Id: I2140afb4e9bf89b4eb73e45f4ef5974df98e87e1

commit f2b1d4b433606580c3eed9df9942112fa8440291
Merge: e9bd11f 45bd459
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 12 18:29:13 2013 +0000

    Merge "Squash Grizzly database migrations"

commit e9bd11fd552ee6757e1268cd6c93ae576f85ff5d
Merge: e67d1d1 711b824
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 12 18:10:22 2013 +0000

    Merge "Pin SQLAlchemy to 0.7.x"

commit e67d1d1c07b719b932f6a424df72dd642266a1ad
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Mar 12 16:37:35 2013 +0000

    Switch to final 1.1.0 oslo.config release
    
    Fixes bug #1128256
    
    oslo.config has now been released to PyPI in time for Grizzly RC1 so
    we can switch to using it directly.
    
    Change-Id: I655f831718ae5f4e25e941ee206fe195214a9a91

commit b2e15ce1f738ee239e0db31ddbbdecc7e8a8c765
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Mar 12 14:39:11 2013 +0000

    heat templates : Update for F18
    
    Remove F16 as it's EOL, update with F18 as it's the current
    version.  Leave the default as F17 for now in all except the
    Openshift templates (because Openshift doesn't work on F17,
    although these templates are currently broken anyway..)
    
    fixes bug 1154121
    
    Change-Id: Ia95e6bfb4a15e355dfb0051d57f5b70a408551c6

commit 2075f94b56660c97ad6e5c0829687f9d2d1803f1
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Mar 12 09:50:33 2013 +0000

    heat engine : Add validation of stack names
    
    Add regex validation of stack names, aligns us with stack names
    allowed by AWS, with the addition of "." and "_" characters
    
    fixes bug 1103447
    
    Change-Id: I8fab0d3ad03379dfc2a18dc016e66ca8fee6cc86

commit 711b824cdf90b33ad146a12a5f6db7db6cab569c
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Mon Mar 11 16:28:17 2013 +0100

    Pin SQLAlchemy to 0.7.x
    
    0.7.10 has been released and is compatible with 0.7.x. Instead
    of pinning to 0.7.9, simply pin to 0.7.x to avoid SQLAlchemy 0.8
    
    Fixes: Bug #1153983
    
    Change-Id: I1a2ea0c36161df15fd55e95a6679628d14858944

commit 45bd459318b9d60214bf6db28d2cbb4b62676518
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Mar 12 10:03:29 2013 +0100

    Squash Grizzly database migrations
    
    Fixes bug #1072949
    
    Change-Id: I07e4d1454141c9011aacdec3a4eb01a3ea1936c9

commit 16cd2030aaa86cb040d028a1038daf07e54b19ee
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Mar 12 10:03:29 2013 +0100

    Use internal DB management
    
    Use our own internal code for managing database migrations, rather than
    calling sqlalchemy-migrate's command line directly. This allows us to
    automatically specify the initial version of the database, which is
    required in order to be able to squash migrations (bug 1072949).
    
    Change-Id: I88206f8b55fe6fe4016cee8e5bf1d5eeb0ae30d2

commit 36672da65ecf88607ba0faf5330054ca4857d2a6
Merge: dd2d5c9 357d977
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 12 02:02:01 2013 +0000

    Merge "Register DB options independently of engine"

commit dd2d5c9a3b87da673bb872d607f3534f36cc5f4c
Merge: e587079 4888ab1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 11 20:11:56 2013 +0000

    Merge "Avoid manipulating DB directly in unit test"

commit e587079bf40389fdb66f82b994e1e6252a9a15b7
Merge: 340c9f2 f6a024b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 11 20:10:19 2013 +0000

    Merge "Establish an initial version of the database"

commit 340c9f202ec3da689328d8a4a3b4eb76b8c16423
Merge: d1020b9 6d5007e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 11 20:10:04 2013 +0000

    Merge "Set correct type for owner_id in DB model"

commit d1020b9fb96736d1e971b04595b9969f71ff447c
Merge: 11cb47f 6624f85
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 11 20:10:01 2013 +0000

    Merge "Skip quantum unit tests if client not installed"

commit 357d977a0a65fb79c411b926e8f3929f524afd65
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Mar 11 16:54:21 2013 +0100

    Register DB options independently of engine
    
    We need a script that will just manage database migrations (for bug
    1072949), so for this purpose we want to register only the DB options, not
    all of the engine options.
    
    Change-Id: I99bb8d5800741d71572a14c3a5a33dcf0e1b0268

commit 4888ab12fcd7eb1f660a4585da3ba8be82ae67a3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Mar 11 16:54:21 2013 +0100

    Avoid manipulating DB directly in unit test
    
    Use the parser.Stack class for inserting data into the database in the
    watch rule unit tests. If there is direct database manipulation in the unit
    tests, it risks falling out of step with the implementation in the code (in
    this case, by not supplying the disable_rollback value).
    
    (Required to squash DB migrations, bug 1072949)
    
    Change-Id: I66e5a0093d20222c876f52e626043704777dcb6a

commit f6a024be81366c85ad1cbc61a4e6cb790fee113b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Mar 11 16:54:21 2013 +0100

    Establish an initial version of the database
    
    Adapted from Nova commit ee2f6f1bed21a5ef92d84634cd4e949062073d62. This
    will allow us to squash database migrations.
    
    Change-Id: Icede692e4cc866cd27bae3aaa19c1f2466b989d0

commit 6d5007e732553f02a0d872eb5c8c92ccc0b6fbd9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Mar 11 16:54:20 2013 +0100

    Set correct type for owner_id in DB model
    
    This was already fixed in the database migrations (see bug 1078854), but
    was still wrong in the model.
    
    Change-Id: I8c0302d295ac228b6911a6c55e841066a502bdb1

commit 11cb47f09259994171e7512d96c3584d6389833b
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Mar 11 16:16:45 2013 +0000

    heat clients : Fix --timeout option for heat-boto
    
    Fix boto client wrapper so it passes the timeout value to boto
    
    fixes bug 1135970
    
    Change-Id: Ic1d242cf038e9244c8fb2efc65659cd6f9976df3

commit 6624f85f9663e812f1fafabb73483888c7479743
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Mar 11 16:54:20 2013 +0100

    Skip quantum unit tests if client not installed
    
    Quantum is optional, so we should skip unit tests that require
    quantumclient if it is not available.
    
    Fixes bug 1152242
    
    Change-Id: I6c399b1845adfe457051c372601db6352cdf6261

commit 0174b7d4d31e0939fa8863089d9cae990be1c317
Merge: ca112f3 9060187
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 11 10:00:24 2013 +0000

    Merge "Delay calling _get_user() until AccessKey is created"

commit ca112f3f7ec7a5dc5243f32b1deeb535d5aa0b35
Merge: f75171a 8939c3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 11 09:57:38 2013 +0000

    Merge "Recognise arn: for REST stack lookup."

commit 9060187b4d7df19fbcad1b7fddcb0108ca24ad4e
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Mar 11 17:05:44 2013 +1300

    Delay calling _get_user() until AccessKey is created
    
    Change-Id: I149909d9677f348edd415d3e5f37322b8ad33d28
    Fixes: bug #1153397

commit f75171a623156e8b3cfbf64b510cf4ecddd9dd5f
Merge: 3369d7e d10fe9b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 10 20:16:02 2013 +0000

    Merge "Update to Quantum Client 2.2.0"

commit 3369d7e491bc1374c8e78eb2faa5e154feabaa91
Merge: e64c536 b8aad78
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 10 20:14:49 2013 +0000

    Merge "heat engine : store stack on failed update"

commit 8939c3e5241c731b010cae4113f63221b19fa5c5
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Mar 8 13:08:04 2013 +1300

    Recognise arn: for REST stack lookup.
    
    Note that the Routes mapper does brittle regexp fu to map parameters,
    hence using \x3A for matching a colon
    
    Fixes: Bug #1131759
    Change-Id: I063bf9057782c1c0a3f809d4f8068e2594be264d

commit d10fe9b8ad5fb0d2b4f4f181efe6d93064e3d1ad
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri Mar 8 10:12:14 2013 -0800

    Update to Quantum Client 2.2.0
    
    This patch updates tools/pip-requires to use the python-quantumclient 2.2
    It also limits the version to <3.0.0 to prevent breaking something accidently
    when 3.0.0 is released.
    
    Fixes bug 1152695
    
    Change-Id: If47e5bf1d638a2ac87d523651060fc7859bf8049

commit b8aad78cc5389874056de547dcd26a198a3bbd03
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Mar 8 17:23:17 2013 +0000

    heat engine : store stack on failed update
    
    Store the stack even when the update fails, otherwise we
    lose track of the resources which failed on create so they
    are not removed on stack delete
    
    fixes bug 1151989
    
    Change-Id: Ic8aa5ef92e188fb704ed25563aa9b86aa69232b4

commit e64c536c41623570b373dd6c754c9d557af5a9d9
Merge: 4996792 545b54f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 8 16:55:55 2013 +0000

    Merge "Use stack.resource_by_refid to get the user resource."

commit 4996792d2d52cd244843fd6cbd9ead5ef07a0f21
Merge: 932b58d e657f05
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 8 16:55:54 2013 +0000

    Merge "Add Quantum floating ip assoc tests to improve coverage."

commit 932b58dc41c7169c0ef60c5cfdb88730feb7b190
Merge: 5b374ef 1c995a1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 8 16:55:52 2013 +0000

    Merge "Add Quantum port tests to improve coverage."

commit 5b374efef639f41ad3aeb7296b38ad10a172bbb3
Merge: da6d678 a95cc1e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 8 16:55:45 2013 +0000

    Merge "Add Quantum floating ip tests to improve coverage."

commit e657f054949e8867ac91475d5a6882484f275d7a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 8 23:19:09 2013 +1100

    Add Quantum floating ip assoc tests to improve coverage.
    
    bug 1152445
    
    Change-Id: I7540b233f665f59bdecb171aa353798d2ce310b5

commit 1c995a18a08e706a31ba6e003be633dab36545f3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 8 23:12:29 2013 +1100

    Add Quantum port tests to improve coverage.
    
    bug 1152445
    
    Change-Id: I6cb5d5dc03e0ed8ffd17cd3e0e2d36e705864bac
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a95cc1e2fd5e221098bef7bce2711a1cd466efd7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 8 23:04:32 2013 +1100

    Add Quantum floating ip tests to improve coverage.
    
    bug 1152445
    
    Change-Id: If72885228f1d7200f7330a093f3c8a08ad1eea96
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit da6d6787a7fccf11f9356b1feb73e4627983ff8b
Merge: 2cf859c 010be1c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 8 10:43:29 2013 +0000

    Merge "Add tests to validate REST path to action mapping."

commit 2cf859c8b50bc9f55438b8a325afbe33c9f13031
Merge: dd0bdbb 63882b7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 8 10:37:17 2013 +0000

    Merge "Use quantum IDs for VPC, Subnet, RouteTable resources"

commit 010be1cae9b3dcc9d64423e75e509c27ad66365b
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Mar 8 13:06:04 2013 +1300

    Add tests to validate REST path to action mapping.
    
    The Routes mapping performs some brittle regexp manipulation
    to build the parameter mapping on the path, so its nice to validate
    that it is doing what is expected.
    
    Supports bug #1131759
    
    Change-Id: I251178c2bd9cb03fcedc2da7ea31378b62ae309f

commit dd0bdbb12a70bb3e5e3725754b51154273c4e331
Merge: ad40354 15389b3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 7 22:12:28 2013 +0000

    Merge "heat common : BaseClient respect host argument"

commit ad40354d1cdb5d594f2ac69ff903480f8de31e83
Merge: e42806a 2e000a6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 7 22:12:11 2013 +0000

    Merge "heat clients : make --host option error for heat-boto"

commit 545b54f9bee189846f7e7b3c0f367cfa91b2ce03
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Mar 5 14:00:22 2013 +1300

    Use stack.resource_by_refid to get the user resource.
    
    Related to Bug #1131534
    Change-Id: If8c9f0982f4a29c597c5ad3805637270e1a97f23

commit 63882b7bcbc55e411db26b4689f9cfe30d5a722b
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Mar 4 10:49:37 2013 +1300

    Use quantum IDs for VPC, Subnet, RouteTable resources
    
    Previously the resource IDs were the resource names
    so an already existing quantum entity cannot be passed into a
    template.
    
    Fixes: bug #1142812
    
    Change-Id: I9ea6561674d88dbbdd82b7c69400a70c529c4525

commit e42806acd95f19ac73f97c966138239921bc9496
Merge: cd27954 ed77bb2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 7 21:13:21 2013 +0000

    Merge "heat common : quieten policy logging"

commit cd2795441410017f111f108d76d67374020dac11
Merge: 43926dc 5203546
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 7 21:11:50 2013 +0000

    Merge "heat common : policy.py change LOG to logger"

commit 43926dc69c4f6271b20f4560ca523c37805b5ea5
Merge: ab9006a 4954ac3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 7 21:04:47 2013 +0000

    Merge "fakes: remove some duplicate methods"

commit ab9006a05335b5194d8d7838bce404b2344a25f9
Merge: 180430f 3629e7c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 7 21:04:19 2013 +0000

    Merge "Convenience method to look up resource by FnGetRefId"

commit ed77bb268d3b4aa4beed5b358135cc489105c188
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Mar 7 11:14:45 2013 +0000

    heat common : quieten policy logging
    
    Policy logs the currently loaded policy for every request, which is
    too noisy even for debug - we already log the file which contains
    the policy when we load it, so this is probably sufficient.
    
    fixes bug 1150091
    
    Change-Id: I0891a30793375c7a0a6b2856db4377eecfeaad8e

commit 52035468bb6e721e16ca41c85bbb359f9efb6b40
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Mar 7 11:12:20 2013 +0000

    heat common : policy.py change LOG to logger
    
    The convention in most other files is to use "logger" for the
    log handle, so this file using "LOG" looks a bit odd/inconsistent
    
    ref bug 1150091
    
    Change-Id: I159ad59dfaa3a1db36aad11cb6ce9625f1105c51

commit 15389b38a11bbb9ef49beb136cd3ebfe00cc8628
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Mar 7 12:08:08 2013 +0000

    heat common : BaseClient respect host argument
    
    Currently the BaseClient class ignores any host argument and overwrites
    it with the host from the keystone catalog URL, we should respect the
    host parameter if it is passed, but make it optional
    
    ref bug 1102101
    
    Change-Id: I371e3b70a7bd207a177625c3e6855d8504678f1b

commit 2e000a6d28698a3f456db0db91472881bab53050
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Mar 7 12:11:16 2013 +0000

    heat clients : make --host option error for heat-boto
    
    The --host option cannot work for heat-boto, so print a helpful
    error if the user tries to use it.
    
    ref bug 1102101
    
    Change-Id: I63129b314eabd7bc84647efb96e9f10b1963b8b2

commit 180430fa32951303e76e8d9a54c657d8c36e0e6d
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Mar 5 18:36:15 2013 +0000

    heat tests : Improve resource.py test coverage
    
    Add tests for good/error paths of create/update functions
    
    ref bug 1146529
    
    Change-Id: I2b50b94e61a85a681575fbe6cad5576f2df311b9

commit 0dfb31efe815c9688ebdcad861f38db51472d23a
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Mar 5 18:08:59 2013 +0000

    heat engine : allow Properties validation failure events
    
    Currently if properties.validate() fails causing the resource
    to go to CREATE_FAILED state, we get an error when creating
    the event, because the bad properties are evaluated in the event
    constructor.  Instead create a dummy Error property with the
    error string for the event.
    
    ref bug 1146529
    
    Change-Id: I12f11de617d796d65c67a5ddb6d74c86adf67b5d

commit fe8cf076986e1764ddbf1a120a83f91e6564ba18
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Mar 5 15:46:08 2013 +0000

    heat tests : move GenericResource into tests directory
    
    The resource.py GenericResource type is only used in tests, so
    move it into the tests area, such that it can't accidentally be
    used in the main heat codebase when we fail to import any resource
    plugins..
    
    Change-Id: I3912cc540903002a6dd5109e7ce51c7eb67ebf10

commit 3629e7c444aeaa83d30dd585d95b21a4815b27e2
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Mar 4 10:47:53 2013 +1300

    Convenience method to look up resource by FnGetRefId
    
    This assumes that no resource will raise an error when FnGetRefId is
    called, and any resource that does really needs to be fixed.
    
    Change-Id: I5b58a28661e4eb10ccb21e8b50ec131937618d4a

commit c73b3dd5722823bf94d556e1cb20f10712e9faf1
Merge: 01dfe08 cfcaa89
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 7 00:11:51 2013 +0000

    Merge "Allow instance NetworkInterfaces to be list of str or dict"

commit 01dfe08fa832d5a7dac2242a082af8bd05f2ff64
Merge: bb16224 2f3f98f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 7 00:09:39 2013 +0000

    Merge "Allow REST stack lookup by ARN"

commit bb16224c4a77717dcb62bb26171ac11308a54a10
Merge: 1fda6a0 081b2d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 23:24:43 2013 +0000

    Merge "Switch to oslo.config"

commit 4954ac3b9c4a3bcf291815376915994edf711e5e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 7 09:27:58 2013 +1100

    fakes: remove some duplicate methods
    
    My pyflakes is complaining...
    
    Change-Id: I1c846377ac56d5cbf941b51e48a7baacecc926fe

commit 1fda6a0b25a09d84ab92339128a09e2e0f2abff4
Merge: d8ea739 bc1de6a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 22:21:49 2013 +0000

    Merge "make parsed template snapshots before updating"

commit 081b2d5a043c4b1f1fc1d4faf9add9f577f1752f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Mar 6 20:21:29 2013 +0000

    Switch to oslo.config
    
    The oslo-config package has been renamed. Switch to the new
    version.
    
    Change-Id: I6a0fa803b0076bc5338c996e21bbcef54e1d75cd

commit 2f3f98f58d4ffe401cb542508bd62da4f14f0dbf
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Mar 6 16:22:58 2013 +1300

    Allow REST stack lookup by ARN
    
    This uses the same approach as the cfn api, which assumes the stack
    name is an arn, before falling back to an identify_stack call.
    
    Change-Id: I64e9826fa58e05863e9459d3aab041a8d7997405
    Fixes: Bug #1131759

commit d8ea7394c29a4000996159b905ceee522a5adcb9
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Mar 6 14:55:12 2013 +0000

    heat engine : watchrule quietly discard unused metric data
    
    Some cfn-push-stats options try to send multiple metrics to a
    watch, which won't work with our simplified CW implementation
    which expects exactly one Metric associated with each watch
    (since that's all you can define via the template)
    So quietly discard any metric data we aren't interested in.
    
    ref bug 1133510
    
    Change-Id: I5159611b96c501ff2d8e6e605cbd3d4ae5f77e48

commit 0a6af7d8326a287b1f5d1554253b9d3c15661202
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Mar 6 16:21:03 2013 +0100

    Use built-in exception filtering for GreenletExit
    
    Python handles this natively.
    
    Change-Id: I440b87112826f44f4c9c3b4bbdd161d2e202341b

commit 876ec0a7283b62e0994e1c0b7c42d6c22fb1bb74
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Mar 6 14:14:53 2013 +0000

    heat engine : Loadbalancer template watch reference should be Ref
    
    Replace hard-coded reference to latency_watcher with Ref, otherwise
    the name is not fully qualified for the nested stack and the engine
    fails to lookup the watchrule
    
    ref bug 1133510
    
    Change-Id: If0352726ee89e2c8b78beb9436be36b811f1e1cd

commit bc1de6ae780e10b4de2337646c4fda40380b2335
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 6 16:28:00 2013 +1100

    make parsed template snapshots before updating
    
    This is to make sure that as the update progresses and dependant
    resources are modified/replaced that we compare the original
    dynamic data with the current.
    
    bug 1134258
    Change-Id: Ia4e474e914aa9e99e5e569c4f2276beb55798421

commit b8b5624d1b1680d03439a51a6bd7e0d792032e93
Merge: 1ef6dae c541b05
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 11:48:26 2013 +0000

    Merge "heat engine : Ensure properties validation is caught"

commit 1ef6daeef42e8a35ed8bd6c277f8e486198ca525
Merge: 269c397 e376c83
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 11:40:43 2013 +0000

    Merge "Test coverage for NestedStack, and fix FnGetRefId"

commit c541b05f31fa47638eb968432174f64af39b833e
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Mar 5 15:16:59 2013 +0000

    heat engine : Ensure properties validation is caught
    
    Rework usage of properties.validate() so that we always
    catch the error and set the resource state to failed when
    a properties validation error occurs
    
    fixes bug 1146529
    
    Change-Id: I4c5b24cc29a19a5170852aa7626031f9612b3272

commit cfcaa895a6357a4bc08ce84928541f2d80c5b0e7
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Mar 6 15:29:12 2013 +1300

    Allow instance NetworkInterfaces to be list of str or dict
    
    It should be possible to specify NetworkInterfaces of an instance either
    as an array of strings or as an array of dicts.
    
    The following should now be possible:
    This will define nics in the order specified by DeviceIndex
    "NetworkInterfaces" : [
      { "NetworkInterfaceId" : {"Ref" : "controlXface"}, "DeviceIndex" : "0" },
      { "NetworkInterfaceId" : {"Ref" : "controlXface2"}, "DeviceIndex" : "1" },
    ],
    
    This will define nics in the order specified by list position
    "NetworkInterfaces" : [{"Ref" : "controlXface"}, {"Ref" : "controlXface2"}],
    
    Mixing the 2 forms is supported but the resulting order is not defined.
    
    Amazon documentation is ambigious about which form is actually supported
    http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-networkinterfaces
    http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/quickref-ec2.html#cfn-template-snippets-eni
    Fixes: Bug #1096013
    
    Change-Id: Id387d2e750cbe533a9b8a1fedc49d5bcf690fbcf

commit 269c397be26a8c759596c0743fad363e6185f59c
Merge: d3b8dc8 dcb3f2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 01:52:47 2013 +0000

    Merge "When updating the metadata load the stack with the stored context"

commit e376c83cbd57c0720336848e4b82e3b7b804a347
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Mar 6 13:28:22 2013 +1300

    Test coverage for NestedStack, and fix FnGetRefId
    
    NestedStack now has 100% coverage. resource_id is now set during create
    instead of evaluated during FnGetRefId
    
    Fixes: Bug #1131534
    Change-Id: I21966acc711a801d28a8a22c377758d2363dd096

commit dcb3f2aa81e94036ca24f79ac1cdbc8d3bad3207
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 6 09:45:56 2013 +1100

    When updating the metadata load the stack with the stored context
    
    bug 1144996
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
    
    Change-Id: I2b0547f4867f19f8319e2c4b79ac325ae8cd6bd8

commit d3b8dc89b436733e0efaffea38763d2fb58e9ac3
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Mar 5 11:57:44 2013 +0000

    add missing licence header
    
    Change-Id: I95d883c7c58ecba925bc6fa41d7a9491b18a55fa

commit 8634e15ca10ed9a919bbec1823a56e7eb4dc3d29
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Mar 5 09:01:56 2013 -0700

    Stop heat services from logging to stderr by default
    
    Change the configuration files to set use_stderr to False by
    default.  Oslo's log sets use_stderr to True by default, and
    the only reasonable way to override is via the config files.
    
    Change-Id: Ibc4ac3b8cb5d7478260d5d014eb48860bae4bc0b
    Fixes: Bug #1146848

commit 0a19b19fde916efafef8617e90b1d43e8ef01198
Merge: 431456d d817ec2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 5 15:10:23 2013 +0000

    Merge "Make sure we have a volumes property before trying to use it"

commit d817ec2f7f077808e4f6f6e3b797079a7b03cc47
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 5 23:44:54 2013 +1100

    Make sure we have a volumes property before trying to use it
    
    bug 1146742
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
    Change-Id: I2d56af0b07f544642e0527a8300db842d2bc0268

commit 431456d08e7d7409539f787052a08d872a7e079e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 5 22:46:06 2013 +1100

    Prevent shadowing of the "context" module/parameter
    
    Keep the module name true.
    part of bug 1144996
    
    Change-Id: Idb8c5a8190bbb7f81d70c1a95bf5352791f87693
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 9a682de2f1735c276903eb39c980abfe033cf9c0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 5 22:17:12 2013 +1100

    Fail validation when an unknown property is supplied in a template.
    
    bug #1101098
    Change-Id: I9430ad859e9a93d6c0d2a417877e02c151e98a05

commit 244f1930e405b798c906234f784da77337432839
Merge: 1e5f052 cadcf10
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 5 08:47:38 2013 +0000

    Merge "Validation failures now raise StackValidationFailed"

commit 1e5f05232f2f14453cd3ce87da3023f81c1b95f9
Merge: 37d3981 e9cba1b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 5 02:09:00 2013 +0000

    Merge "vpc_test: move DependsOn to the correct template section"

commit cadcf10ac381eaea4d0f695fddc25e5ed1477160
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Feb 8 14:54:57 2013 +1300

    Validation failures now raise StackValidationFailed
    
    This changes the way validation failures are presented
    to heat-cfn as per bug 1072939
    
    Change-Id: Iddaaf0c83c5d0df7c0143c6805096a83f8e5dc51

commit 37d3981effeed33e743f4c6502e3ec3c1fc76193
Merge: 1e6d4ce 137f9c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 5 01:43:51 2013 +0000

    Merge "Add N802 rule to hacking.py"

commit 1e6d4ceb6f0704d7495bdcec1c55ed6c7d6c82f6
Merge: 89dcb6b 8dfd53d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 5 01:40:02 2013 +0000

    Merge "Create autoscaling instances in parallel"

commit 89dcb6b050be2c475c0ca8bcd44dbe12447780a2
Merge: e9beca4 a2292ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 5 01:39:55 2013 +0000

    Merge "Separate public/private autoscaling adjust() APIs"

commit e9beca4cf20d040be5e5b84296dfe3f4f34fccb3
Merge: 4f4e948 13223e8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 5 01:36:15 2013 +0000

    Merge "Move instance polling into check_active()"

commit 4f4e948e3eee8d09f56c2aaff79b222187efe2fe
Merge: d02b088 f9f11a5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 5 01:16:01 2013 +0000

    Merge "Use oslo logging setup."

commit e9cba1bb0a423fe117e4c636a04c9134512c8fc5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 5 11:49:12 2013 +1100

    vpc_test: move DependsOn to the correct template section
    
    found when fixing bug #1101098
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
    
    Change-Id: I7591111bcdf768119d265d0a9c901a0e189604d3

commit d02b0889c637c26b840939662d4d51358169b892
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Mar 4 15:29:36 2013 +0000

    heat clients : Make heat-boto rollback disabled by default
    
    The boto library always sends the DisableRollback parameter,
    defaulted to False, which is the opposite of the engine
    default now, so we have to set DisableRollback to True in
    the boto client wrapper
    
    ref bug 1131303
    
    Change-Id: I4acbba7b37f24cb1a874292ff2323ae24b630edf

commit 0aea9429bf122eb4cde1b749b129ecfe6ca8f63c
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Mar 4 15:27:57 2013 +0000

    heat clients : Change --disable-rollback to --enable-rollback
    
    Since the engine default is now rollback disabled, flip this
    switch so the user can opt-in to rollback functionality via
    the --enable-rollback cli option to heat-cfn/heat-boto
    
    ref bug 1131303
    
    Change-Id: I3965de9a2beb510d5623d0c7cd8ff3aea9d4364a

commit 7f9d593c98452a2c8f23d82f8bb504ae4c3a365c
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Mar 4 11:57:56 2013 +0000

    heat engine : Disable stack rollback by default
    
    Until the event-persistence BP is implemented, we should
    disable stack rollback by default and make it opt-in.
    
    fixes bug 1131303
    
    Change-Id: I101e108c3959c4b7b4cfc68449ba2b989b157626

commit 137f9c0ad2b7c8d542c051ece2527b4c9d182817
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Feb 28 14:42:00 2013 -0700

    Add N802 rule to hacking.py
    
    Gate on commit headers < 50 characters
    
    Change-Id: Ia6a616d8a9b0eabca05a23476e284f261108b43a
    Fixes: Bug #1136386

commit 78e975eaf142aca97a3976830e85ce1ed519528a
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Feb 28 17:02:11 2013 -0700

    Add pyflakes to test-requires
    
    pyflakes needs to be installed in the venv
    
    Change-Id: Ie7aada13da4e191108363c80daf719212d06d316
    Fixes: Bug #1131275

commit 7ffeadc54b61735881818ee1393145a7730fbe31
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Mar 4 10:16:16 2013 -0700

    Remove unused import from test_nokey.py
    
    test_nokey.py was recently merged into the source tree with an
    unused import (copy.py).
    
    Change-Id: I27b7040b5719ea21d1e0a79afe499bf7fa5a94e5
    Fixes: Bug #1131275

commit 8dfd53db24610b5c534ab165328ddfb6927deff9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Mar 4 11:31:27 2013 +0100

    Create autoscaling instances in parallel
    
    Fixes bug #1136148
    
    Change-Id: I02ea52df85c4ed7f0f16abcfd1ab24b35168a787
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a2292edf96db5a2aa5eb481bfeeeac43edded7eb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Mar 4 11:31:27 2013 +0100

    Separate public/private autoscaling adjust() APIs
    
    Internal uses of adjust() have slightly different needs.
    
    Change-Id: Ibb85425f08b7b2d78be2d9ef5c8a9f464b7eead1
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 13223e8fba0c7c8c3f716bfd2259a008d69642f0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Mar 4 11:31:27 2013 +0100

    Move instance polling into check_active()
    
    Don't poll for the instance status in handle_create(). Allow
    Resource.create() to poll the resource using check_active().
    
    Change-Id: I13a8fefcef6594d014e7e5a3131f9342521e367d
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f9f11a5bc3f9fd779e665b1d3357113140613154
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 4 17:00:47 2013 +1100

    Use oslo logging setup.
    
    The one reason we kept our own version was because of the qpid
    logging that is quite useful. But this is now easily done via
    the "default_log_levels" option.
    
    I have setup the api servers with:
     ampqlib,qpid.messaging,keystone,eventlet
    and the engine with:
     ampqlib,qpid.messaging,keystone,eventlet,sqlalchemy
    
    bug: 1143629
    Change-Id: I04eeab469ab59da550e08188d53b2cfbb576c04d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit c4248dd0d763ef87ff55fb1847530253d33e85ba
Merge: d16622c a7d22ff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 3 20:25:43 2013 +0000

    Merge "Add breaks to for loops"

commit d16622c6ec3175cd9b0c3fa8d8a928aa568d7dcc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Mar 1 17:12:54 2013 +0100

    Split resource create into create and check_active
    
    Change-Id: Ib8206f204e8805936defaa3431ecdf34b161e724
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a2c2e6798fa0f3987d81c663fc1af5ff13392ec5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Mar 1 17:12:54 2013 +0100

    Fix unit tests for Instance IP
    
    Don't try to test the IP addresses after the instance has been deleted.
    
    Ref bug #1091497
    
    Change-Id: I566c26a4707edc9d210bd422dcff8fbbcc2236d5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4afe5f3e5041e79680f53f86bd459c842514eeec
Merge: d7c29c8 bb65fee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 1 16:12:22 2013 +0000

    Merge "Remove unused import from loguserdata.py"

commit d7c29c879628c2db5e3eaa31672b5a9dbe6483a5
Merge: 7f1bb4a ad1a5a8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 1 16:11:06 2013 +0000

    Merge "Fix Unrecognized Attribute admin_state_up Error"

commit 7f1bb4a3f5b148f0894f7f22a8fa6abe65e000b1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Mar 1 15:24:19 2013 +0100

    Fix flaky unit test
    
    This was failing intermittently during the gate tests because there was no
    dependency in the template for the Instance on the WaitConditionHandle, nor
    for the WaitCondition on the Instance, so the order in which resources
    would be created was somewhat random.
    
    This patch fixes the test template, and tests updating the metadata should
    occur *during* creation of the stack, as well after, to replicate a real
    wait condition (which won't finish creation until the metadata update
    occurs).
    
    Change-Id: I26b5590a9ee90d205bd9f2e31bcb74e68065ac25
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 8147ce785e0636e05fa64ce0b287e732d32a8dd7
Merge: c538c6b 74d2df9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 1 10:49:01 2013 +0000

    Merge "Allow heat to be used without a KeyName set."

commit ad1a5a8a26260f71073122edf6b1fb8fd0b2ceed
Author: jiangwt100 <jiangwt100@gmail.com>
Date:   Thu Feb 28 17:48:00 2013 +0800

    Fix Unrecognized Attribute admin_state_up Error
    
    Bug #1135485
    screen-h-eng
    Error message: {"QuantumError": "Unrecognized attribute(s) 'admin_state_up'"}
    
    Change-Id: I4668b0603e0deab85e416d9cec5617f17eaa2aea

commit a7d22ff1e2c59fc97421ec6c1c5cfaac18d0481f
Author: Ian Main <imain@redhat.com>
Date:   Thu Feb 28 18:03:26 2013 -0800

    Add breaks to for loops
    
    This just adds breaks to a couple of matching for loops in instance.py.
    
    Fixes: bug #1130898
    Change-Id: Iacfa040ba3a400b506e4fbc63c513eb3e67ecb11

commit bb65fee164900cdd7faedf2f9c244d518ee5082a
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Feb 28 17:15:26 2013 -0700

    Remove unused import from loguserdata.py
    
    Change-Id: I0bdf8a51e0d21533c5ce8148cdffcbc92f89fef9
    Fixes: Bug #1131275

commit 74d2df9d95eeb2999995fe10d0fb6ac507a79d92
Author: Ian Main <imain@redhat.com>
Date:   Mon Feb 18 11:20:20 2013 -0800

    Allow heat to be used without a KeyName set.
    
    This patch lets you start an instance without setting the KeyName, which
    I gather is allowed in ec2 as well.
    
    This revision adds a template and test.
    
    Fixes: bug #1129394
    Change-Id: I667f373b73479caa506ee49d8d1615ff4aad47ed
    Signed-off-by: Ian Main <imain@redhat.com>

commit c538c6b6e4a56209bc54b54b1b9dafd17e388b5d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 1 09:40:59 2013 +1100

    Do a metadata refresh after an explicit metadata write.
    
    if we have a template with (logically) the following:
    instance2:
       metadata
         GetAtt waitcond.data
    
    waitcond:
    
    when the waitcond is fired, it updates the metadata but it needs a call
    to update the references in "instance2's" metadata.
    
    bug #1135229
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
    Change-Id: I1a6af9112ba100b17075063f59165b448d6a11f4

commit 83457be86a36f72142c95de5cee4a06a5aa2b5fd
Merge: d640718 7c920db
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 20:55:38 2013 +0000

    Merge "Make the exception string a little more useful"

commit d640718167eb9e9d17c97b64b636063f2b82ba1e
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Feb 27 15:23:48 2013 -0700

    Gate on certain pyflakes failures
    
    To prevent recent gating problems from typos, an
    import not used and redefinition of function problems in
    the source code have become gating.
    
    Fixes: Bug #1131275
    Change-Id: I7011f3ac5940afc70c38758e67a2222a66e625c3
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 2358f6d5bc3e79f6d973ec25de81569286aeabc4
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Feb 27 11:00:32 2013 -0700

    Remove unused imports from repo in preperation for pyflakes
    
    Lots of unused imports
    
    Fixes: Bug #1131275
    
    Change-Id: Iacb1d02173b0ec0e0dc81aff84ca6e29e60e2934
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit eea4a6d16d274839a3da650a735a9b25f7072679
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Feb 27 10:39:54 2013 -0700

    Add heat-watch to pep8 checks
    
    heat-watch was missing from pep8 checks in the past.  Tidy up heat-watch
    and add to run_pep8.sh.
    
    Change-Id: I36680b24ee90a5daeb7f8d7418b665a215026325
    Fixes: Bug #1131275

commit 637740a4f1aa64e192c05638b76ad2355909e346
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Feb 27 10:26:46 2013 -0700

    Update infrastructure to more closely match other OpenStack projects
    
    This patch imports nova's HACKING.rst guidelines altered for Heat.
    This patch imports nova's run_pep8.sh with some minor alterations.
    This patch imports nova's hacking.py extensions to pep8.
    
    This patch places the run_pep8 logic in a separate file rather than
    having it spread between tox.ini and run_tests.sh.  The HACKING.rst
    requirements as well as general pep8 requirements are then enforced
    with run_pep8.sh.
    
    Avoid running once the N802 rule until dependency changelogs are
    less then 50 characters.
    
    Change-Id: If46c14668eae3cf11b8fbff46d766cc589d701aa
    Fixes: Bug #1131275

commit 52fc9ac812ed89798c9ef008065fc58eb3ea94db
Merge: 259295a 6bdebc5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 19:34:29 2013 +0000

    Merge "heat clients : make boto client library pass disable_rollback"

commit 259295a9fa4e415c1e9b7a2e9a83375327aab6fb
Merge: d308040 af3e503
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 19:27:19 2013 +0000

    Merge "heat engine : fix hardcoded DisableRollback value"

commit af3e5035d941ce68bbaa26df9fbe7f0731c098a1
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 28 16:14:35 2013 +0000

    heat engine : fix hardcoded DisableRollback value
    
    Engine API should return the real state of rollback now we
    implement it, not hard-code to True
    
    fixes bug 1135963
    
    Change-Id: I6b9e6ea9587fe0c84b57f34bf69c2dcec5d5c09f

commit 6bdebc59ba92f2c5af545630819e7cc504e8f94b
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 28 16:04:33 2013 +0000

    heat clients : make boto client library pass disable_rollback
    
    Make the boto_client.py wrapper correctly interpret the DisableRollback
    argument, so the --disable-rollback option of heat-boto will work
    
    fixes bug 1131283
    
    Change-Id: If31daa1583ff836fbb3f67799b89602b16f904e3

commit d308040850464cca47a9c028532b188c2eb8e8c0
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 28 15:13:48 2013 +0000

    heat tools : openstack script install mysql via openstack-db
    
    Don't install mysql-server in tools/openstack, instead allow
    openstack-db to non-interactively install it for us, which means
    the root password is set as per the -r password option when
    installing on a fresh system with no mysql
    
    NOTE : if testing this on a system which has had mysql installed,
    do yum remove mysql-server && rm -fr /var/lib/mysql or the
    reinstalled mysql will use the old credentials
    
    fixes bug 1133502
    
    Change-Id: Ie3ba56e5f971e032be4f099e81cbb24afe76dfbc

commit 1d31ef47b595748c09fc63257bf02bf1e53abc05
Merge: 8636a5e 151ee29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 13:57:46 2013 +0000

    Merge "Removes unused config settings from heat-engine.conf"

commit 8636a5ece14f96c181068e8b7a17918b2f9fd7a4
Merge: fde2078 6b55ccf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 12:21:43 2013 +0000

    Merge "heat engine : loadbalancer resource template, refer to StackId"

commit fde20780e57f5e8940a3f1ab16c72747a0aa6a94
Merge: 9d3bdfd 83780a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 12:21:01 2013 +0000

    Merge "heat engine : Re-resolve resource static data before create"

commit 9d3bdfd523e687e21851fc0cd148b28b9647d8db
Merge: fce0c8a f4fcb7b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 12:20:34 2013 +0000

    Merge "heat engine : Compare runtime resolved resource snippets on update"

commit fce0c8a20a952900c1a7ed3a066bc9c1cc5b179f
Merge: 6c5bd88 79bc817
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 12:05:05 2013 +0000

    Merge "heat engine : Set stack parameters AWS::StackId on stack create/store"

commit 6c5bd880dfc8844f517392a3e4f53bc7154df802
Merge: 95c8037 8a4a196
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 12:04:17 2013 +0000

    Merge "heat engine : Add parser parameter support for AWS::StackId"

commit 95c803746a6876b05b8d06ba180f0f76a86ac677
Merge: acbb587 737cc26
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 02:51:45 2013 +0000

    Merge "Put heat data files in /var/lib/heat-cfntools"

commit acbb5871e3cadd07d6b5ea604a5280aa609cc148
Merge: e402210 9ea6ae8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 01:42:58 2013 +0000

    Merge "Remove duplicate Mapper() constructor"

commit 737cc26570e194f691de71a7372f33a75a32e8c2
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Feb 26 17:38:30 2013 -0700

    Put heat data files in /var/lib/heat-cfntools
    
    The /var/lib/heat-cfntools directory should be owned by the
    heat-cfntools package for whichever distro it is included.
    
    This avoids the problem of heat writing to directories owned
    by cloud-init.
    
    For the moment, the part handler will continue to write to
    /var/lib/cloud/data to be removed at a later date.
    
    Change-Id: I70b714c70ed146d4f6807850d6e7264c6a4624cd
    Fixes: Bug #1105806

commit e4022108f65650acd31cd9010044d00a18550200
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Feb 28 10:06:55 2013 +1300

    Depend on recently released python-quantumclient 2.1.2
    Fixes bug 1133381
    
    Change-Id: I9e3f1185e77c8f021a523f201d2191389eb253ef

commit 9ea6ae892fe7c41a4433b481cc738c30b37e0227
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Feb 27 20:22:56 2013 +1100

    Remove duplicate Mapper() constructor
    
    Change-Id: Ie65fa739dc90515a7170a49c0552b69cdbb7d044
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 6b55ccfaeacdb174e3e80912d7cd52951e9de0f2
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 26 14:20:00 2013 +0000

    heat engine : loadbalancer resource template, refer to StackId
    
    Use the new AWS::StackId pseudo parameter to refer to the stack for
    cfn-hup etc, otherwise the stack lookup by name will fail - using
    the AWS::StackId parameter means we'll refer to the stack via the
    full ARN and the CFN API will be able to lookup the nested stack.
    
    ref bug 1131666
    
    Change-Id: Ieac738df766ae1f1039e743d465cd080b2090473

commit 83780a788f00a8bb08bc71fa8db06a9a8f11be9f
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 26 14:17:00 2013 +0000

    heat engine : Re-resolve resource static data before create
    
    Re-resolve the template static data before creating the resource,
    or we resolve the wrong value for the AWS::StackId pseudo parameter
    which is updated after the parser.Stack gets stored.
    
    ref bug 1131666
    
    Change-Id: I68e87366d379356fd7f2685367300abe5594d6f6

commit f4fcb7bd5ae3345555f1ac8fdbad2fe84408c0a5
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 26 14:55:18 2013 +0000

    heat engine : Compare runtime resolved resource snippets on update
    
    We need to compare the runtime resolved resource snippet, since that
    is what we get back from self.parsed_template.  If we don't do this,
    then we get a false positive when a Ref to a parameter which gets
    updated (e.g AWS::StackId) is used in the resource properties.
    
    ref bug 1131666
    
    Change-Id: Ib488c43b9eca998a7a82b7571097f5bb69ef946c

commit 79bc8170a0d854b2d688af2da82f0ff3e106e562
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Feb 25 16:34:13 2013 +0000

    heat engine : Set stack parameters AWS::StackId on stack create/store
    
    We need to set the ARN provided via the AWS::StackId pseudo parameter
    when the stack is stored, and also whenever a parser.Stack object is
    created
    
    ref bug 1131666
    
    Change-Id: Ic8dc5ab2b25c85c51f2f685fe69bb2447a1e3615

commit 8a4a1960f152431bd0ae822b249da156dc9d3bf1
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Feb 25 14:47:45 2013 +0000

    heat engine : Add parser parameter support for AWS::StackId
    
    Adds support for the AWS::StackId pseudo parameter, which will
    allow us to to reference the stack ARN in the template, e.g so that
    stacks can query their resource metadata via ARN not stack name,
    which will solve the problem with nested resource being unable
    to query their metadata.
    
    ref bug 1131666
    
    Change-Id: Ib7b1d380fa8766b6d0c968bd66270da8ce8245c4

commit 151ee297c35c2224a2e8592504e8abd3aeebb7be
Author: Robert van Leeuwen <robert.vanleeuwen@spilgames.com>
Date:   Wed Feb 27 14:35:52 2013 +0100

    Removes unused config settings from heat-engine.conf
    
    Change-Id: Ia660009f18eae9d9c22adc5ab36c18f711856bce
    Fixes: bug #1134346

commit 7dace2f8356f830921a6d1b681e2ad1a6e1decc4
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Feb 22 16:11:00 2013 +0000

    heat engine : Make loadbalancer nested template raw string
    
    Make the nested template a raw string so we don't need to remember
    to double backslash everything
    
    Change-Id: I307db94f8b610f66eafa68f060dcef742a9e1375

commit d6f8dfed1674b3eb186edd57c9b41bba594e24bf
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Feb 25 11:19:19 2013 +0000

    Add waitcondition to loadbalancer nested template
    
    We want to ensure the LB instance has fully launched before declaring
    this resource created, otherwise the resource will not be functional
    and attempts to modify config via metadata updates will fail
    
    Change-Id: I879c21302f1c3a75a567d959fc2e398c7bfc3f65

commit 7f1cacf44d3ed9eb73320ed552c7b38cfd5b8b86
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 26 16:34:28 2013 +0000

    heat engine : fix variable/import shadowing in service.py
    
    The resources import is shadowed by a variable declaration in
    validate template, which is confusing, so add a prefix to
    differentiate the variable from the import
    
    bug 1133434
    
    Change-Id: Ia7c451c3a2588ddff114da9897b3bcf58e68cf0c

commit da31d59cc03c8a10bd823fe397c7b15d844cb5b6
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 26 16:31:12 2013 +0000

    heat engine : reinstate resources import
    
    Reinstate the resources import removed by 06f4f85, without this
    we fail to create any resources (GenericResource is created for
    all resources due to no resource plugins being imported).
    
    bug 1133434
    
    Change-Id: I2b24d58dee83a426deee09f8a9a121f503534de4

commit 2e7e3242a52659aea040c7e2bf704d298141f2d8
Merge: 036bdaa cca4de0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 26 04:25:41 2013 +0000

    Merge "Update the metadata if an alarm action makes changes"

commit 036bdaa14203e9dcc0d666bd50d592b2fd9bf0c6
Merge: 4400520 06f4f85
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 26 03:18:26 2013 +0000

    Merge "Make the alarm actions run in one thread"

commit 4400520aed488a590277cc04ef501eb0dc18a648
Merge: bb5404a d0dde5b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 25 23:44:11 2013 +0000

    Merge "Throw a proper error if the flavor is missing."

commit cca4de0c855f7224902900a0489df322e09a5bf5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Feb 25 11:44:19 2013 +1100

    Update the metadata if an alarm action makes changes
    
    The point of this change?
    - You have another instances' ip in your metadata and if it
      gets restarted you want cfn-hup to see the new ip.
    
    How is it achieved?
    - poll for the metadata so you can see these changes (cfn-hup)
    - when ever an alarm action is run we make sure the metadata is refreshed.
    
    bug #1131024
    Change-Id: I0798c4da9689b126c3c98cafa63138ff2c484ea9

commit 06f4f858715f89100644867a1aad95bdb3352e41
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Feb 26 09:16:12 2013 +1100

    Make the alarm actions run in one thread
    
    bug #1131024
    Change-Id: I678d8919a17fc73350ec9061ad2a7234e1d6b9f6

commit bb5404ae112782a2554e0dc03e8cbd8f65493d85
Merge: e897e13 fe4955b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 25 16:09:55 2013 +0000

    Merge "heat : Only set qpid loglevel when rpc_backend specifies qpid"

commit fe4955b49ef8c59ac00afb132070f2149853f23d
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Feb 25 10:36:13 2013 +0000

    heat : Only set qpid loglevel when rpc_backend specifies qpid
    
    fixes bug 1132709
    
    Change-Id: Iefad8be07ab806b17f04ff536af955dc015ee4be

commit e897e1334022697a90b179d62dce1e874424b71a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Feb 22 16:05:12 2013 +0100

    Use a short_id for naming S3 containers
    
    Change-Id: Iba8ea4eb536d58e1332897cec2059aebbb41b28a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 6d52011ed248edf5a42991cc094a17ff1cf7d7de
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Feb 22 16:05:12 2013 +0100

    Use a short_id for naming Swift containers
    
    Change-Id: Id6ee6b92f05326e3feda3f2b770fff5864e38e19
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit ebcad29e1e42caa5cf2c6fb2b229ba8166430ac2
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Feb 22 16:05:12 2013 +0100

    Add a module for generating random short ID strings
    
    These can be used to ensure uniqueness of names when creating resources in
    OpenStack services.
    
    Change-Id: Ifb048fd8ec676b7fd6a15c5d4a39bfc98f0aeca9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 7c920dbe0bc6ce1b67abb9c8aedd573827ef882f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Feb 25 11:14:49 2013 +1100

    Make the exception string a little more useful
    
    This partial helps bug #1119883
    
    Change-Id: I247ab39406bcc608c0d66a8140dc198b93491ac1

commit d5cd88b484392b6ad14d963148ba5d1a9b7ffb0e
Merge: 0bea9e7 f1ce0de
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Feb 24 22:26:25 2013 +0000

    Merge "Protect AccessKey deletion from failing"

commit 0bea9e7c8df25ab43cf48c1b8f7ebe50c4034b33
Merge: e5d98d5 75b28f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Feb 24 22:08:35 2013 +0000

    Merge "Remove compat cfg wrapper"

commit e5d98d5555634a632634f1faffeadfd19d539f99
Merge: bf64384 45be56e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Feb 24 22:02:40 2013 +0000

    Merge "Make quantumclient optional again"

commit 75b28f26bb092eec650c48e56677e5f228309607
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sat Feb 23 09:55:39 2013 +0000

    Remove compat cfg wrapper
    
    This wrapper was there to allow oslo-config changes through the gate
    while keystoneclient hadn't been updated.
    
    Change-Id: I3d48673af58ae379e8e4d2c7fb4b4d81f3ed67dd

commit bf643849185c071268d4c44a065f041e88dea4dd
Merge: d055650 deab965
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 22 17:21:42 2013 +0000

    Merge "Fix tarball tag to be empty rather than a point"

commit 45be56e26a8bbedb49851d4e04369e87f418cd08
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Feb 22 16:05:11 2013 +0100

    Make quantumclient optional again
    
    Don't crash if quantumclient is not available; just don't register the
    resource types that require it.
    
    Change-Id: I9dacc5397327ef7ec784f808227582ee9bd037df
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d055650dced6a3cb96e974baeab3637b0ed3b032
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Feb 22 16:05:11 2013 +0100

    Get rid of unused imports
    
    Change-Id: I954cf6eb2c326bbeb6bd043b2c11dfe2e01f52d3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 7bcb659215b4ba7db77e2aa08435e247c5d3a5d6
Merge: 5f18a81 a756566
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 22 14:28:13 2013 +0000

    Merge "heat loadbalancer : make LB nested template create credentials"

commit 5f18a8147d4a6e2ce82ef0447094513d9c91d223
Merge: 1d2444b a2911ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 22 13:11:39 2013 +0000

    Merge "heat api : allow validation of YAML templates via cfn api"

commit a756566e4917cd31429c71dcde286a6d7ba4fe1a
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Feb 22 11:00:44 2013 +0000

    heat loadbalancer : make LB nested template create credentials
    
    Create User/AccessKey resources correctly in the LB nested template
    so we can create a cfn-credentials file which will allow cfn-hup
    to access the CFN API
    
    fixes bug 1131663
    
    Change-Id: I11b6640dbc5689de8f6103f4c1e841f42acbba54

commit 1d2444bb0ad7470c98e6d6de8f1d55c2361af639
Merge: 651891c 5d6745e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 22 11:21:43 2013 +0000

    Merge "heat api : don't store whole request in ec2Credentials context"

commit f1ce0de322c6719b858d54cc0e8fbbe8b0f61cdb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Feb 22 20:52:20 2013 +1100

    Protect AccessKey deletion from failing
    
    The deletion calls _get_user() that calls FnGetRefId for each
    resource. But since this is the delete most resources have been
    deleted.
    
    bug #1131534
    
    Change-Id: I08ffd27d1d05214b1a8cf86744e7d4f91d7e1558

commit deab965eaeaa22de24ea70da64e5f07bca2b8ca6
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Feb 22 10:22:28 2013 +0100

    Fix tarball tag to be empty rather than a point
    
    Fix tarball tag to be empty rather than a point.
    Really fixes bug 1131622.
    
    Change-Id: Idfbd3eb7f5e0fb855e3153ac465896652eb74343

commit 651891c306fa5f48924b4c0be2638462a1d5c09b
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Feb 22 10:03:09 2013 +0100

    Do not tag development releases "dev"
    
    Do not tag development releases "dev", as it conflicts with our common
    versioning code. Fixes bug 1131622.
    
    Change-Id: I33ab25de1d1509c79d11f1919239798663b0cd22

commit a2911cebd6e9c66a64ad95c4b7351a5f5002d640
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 21 17:29:21 2013 +0000

    heat api : allow validation of YAML templates via cfn api
    
    Currently validation only works if the template is json
    
    fixes bug 1131290
    
    Change-Id: Ia08ba7cc18908697b5fdfc1eb711d84d7b39c7cb

commit 5d6745e8e6b7bac34ff943dbffda8aa6316ffb24
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 21 17:12:53 2013 +0000

    heat api : don't store whole request in ec2Credentials context
    
    The ec2token middleware currently dumps the whole request into the
    request context when using AWS Auth, when all we really want are
    the credentials (accesskey/signature)
    
    fixes bug 1072917
    
    Change-Id: I8fb0d4d7ada29d7d19c702a7da1251384166c246

commit 409a2705b3799ea202b7e8ed5c346b8c55c62fea
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 21 15:58:38 2013 +0000

    heat tests : fix run_tests.sh pep checks
    
    run_tests.sh parses tox.ini, which has been changed removing the
    pep8 version, so remove this test and specify the version in
    test-requires.  This allows the pep tests to run via run_tests.sh
    again, a subsequent patch can reinstate the version check based
    on the test-requires version
    
    fixes bug 1131251
    
    Change-Id: Ib24f588cbe81ded768376c138d9d89f5bb311185

commit a4eac4da5dd2088c4eddff0e2de63c1a9fa4225d
Merge: a2945a2 cc4b37c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 21 15:05:09 2013 +0000

    Merge "Add an attribute to InstanceGroup and AutoScalingGroup to return the ips"

commit a2945a20cc9d2c4f9cc2290fb5cf7ee0e67be0db
Merge: 118da28 c8d1481
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 21 14:54:19 2013 +0000

    Merge "heat : bump oslo-config version to fix import error"

commit 118da280803b58fcd0d88ca3f052b212de4ef234
Merge: a3daa3f 902b83e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 21 10:48:45 2013 +0000

    Merge "Remove "deny from all" line in wordpress config"

commit c8d1481c1efc1832c6e64763d8cc74cc1a2e5605
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 21 10:35:27 2013 +0000

    heat : bump oslo-config version to fix import error
    
    New oslo config patch causes services to fail to launch, with
    "ImportError: No module named oslo.config", bumping to
    oslo-config-2013.1b4.tar appears to fix the problem
    
    fixes bug 1131135
    
    Change-Id: I460564be19fc97bd54bb59c759c1148e7ead774b

commit a3daa3fd99a9fda972cd345ea25e50ce75ea05e3
Merge: 5890ca3 150d2ca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 21 08:49:28 2013 +0000

    Merge "Use oslo-config-2013.1b3"

commit cc4b37cc775d67a87b26b4e270a028778ac86d09
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Feb 21 14:42:31 2013 +1100

    Add an attribute to InstanceGroup and AutoScalingGroup to return the ips
    
    This is so you can make a custom loadbalancer that can reference the
    group's instance ip's.
    
    fixes bug #1131025
    Change-Id: I32d76d3627704ad503e2ec06bf0da39cf79f33d2

commit 902b83ed52a281e2df53bf587658bfd2dda0c56a
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Feb 20 20:20:35 2013 -0500

    Remove "deny from all" line in wordpress config
    
    (Missed file in 067323878522df12484c02211e852609185cb4fb)
    
    Fixes bug: #1123053
    
    Change-Id: I7c8d8312bfc61c3b31c845bc6d50a296125bdee7
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 5890ca32b2eaf214d019e470820f0fe3a6b83d50
Author: sdake <sdake@redhat.com>
Date:   Wed Feb 20 14:37:32 2013 -0700

    Update GettingStarted with link to prebuilt images
    
    Update prebuilt images usage instructions
    
    Show how to register the prebuilt image with glance
    
    Change-Id: I27d032644dc7062a9cb5c88ed95c08ed146a3665

commit 2d44d736af4c4d90e0b739e013bc275423a2b42b
Merge: 26c11f4 aa2e3d0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 20 19:37:29 2013 +0000

    Merge "heat engine : Add support rollback support for stack updates"

commit 26c11f4b73a3881ec83b2066a24d8777e71872bc
Merge: 84f478f d1a7c3f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 20 19:33:44 2013 +0000

    Merge "heat engine : Update stack dependencies during update"

commit 84f478f23596102f13cbec3d7794a3ea531ee5a6
Merge: 525a574 24a47ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 20 19:33:36 2013 +0000

    Merge "heat engine : fail update immediately on resource update failure"

commit 525a574a89a04270d50d7035bf88e1f4d329e5b0
Merge: 303908b 5be6ce6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 20 18:55:23 2013 +0000

    Merge "heat common : Add ResourceUpdateFailed exception type"

commit 303908b635597fcd58ccc434ad3b05bfdfc99a78
Merge: a6502e4 14358bb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 20 17:49:04 2013 +0000

    Merge "Add config for boto https_validate_certificates"

commit aa2e3d013d42244d3fbe7b770e4b167e37b9e6d3
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Feb 20 15:34:48 2013 +0000

    heat engine : Add support rollback support for stack updates
    
    Adds support for rolling back failed stack updates
    
    blueprint update-rollback
    
    Change-Id: Ie90e37751365a8ef0ed24757c15f4020ee33ab8a

commit d1a7c3fec6c56f38a72af982b76f1fd80482a381
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Feb 20 15:16:53 2013 +0000

    heat engine : Update stack dependencies during update
    
    We need to update the stack dependencies each time we modify the
    resources list, otherwise in the event of a failure, the resources
    returned from the iterator methods don't match with those found via
    getitem/contains (which is important for rollback)
    
    blueprint update-rollback
    
    Change-Id: Ia47f84291f50c33fc052b7b33fa0c1f9e8430ab4

commit 24a47ad695c5913d558f00ce050ba3543592d980
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Feb 20 10:24:06 2013 +0000

    heat engine : fail update immediately on resource update failure
    
    When doing an update, we want to fail immediately, instead of
    collecting the resource update errors and continuing.  This is
    particularly important for update rollback, where we want to
    declare failure ASAP to simplify and speed up the rollback
    
    blueprint update-rollback
    
    Change-Id: I56133254036d8aac592dcf3cda2ca7928cc02fa9

commit 5be6ce6b50825e33ae84a2bdb7f62d103f0ccd7a
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 19 18:34:35 2013 +0000

    heat common : Add ResourceUpdateFailed exception type
    
    blueprint update-rollback
    
    Change-Id: I357f9f5b7db727f968ab385c9da8042e5dce7154

commit a6502e4038abf7aaa34b6bfb1db8b90bd52d46a9
Merge: 0a8e70e 2f4b981
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 19 21:29:57 2013 +0000

    Merge "heat engine : avoid returning empty resource error strings"

commit 0a8e70ef3a570b4d6a824b80773837e3ae5613cd
Merge: 80799fa 04288ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 19 21:26:05 2013 +0000

    Merge "Missing policy json files from tarball"

commit 14358bb9e1bdeb2a1deb3311cd0232ba41f69685
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Feb 19 12:21:07 2013 -0800

    Add config for boto https_validate_certificates
    
    Boto does not, by default, validate https ceritificates on endpoints. We
    now provide a way to specify it in the heat configuration along side
    is_secure. Heat deployers may also need to turn this off if boto ever
    does make it default and they want to use self signed certs.
    
    Fixes bug #1130345
    
    Change-Id: I09b684dd28a8a57c6ce514d1df1e699e7c8b182e

commit 80799fa903a6d3166ad1ad3b6d174f3821e0c851
Merge: 54defea c1c56fb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 19 19:02:30 2013 +0000

    Merge "Use 2013.1 for Grizzly release version info in setup.py"

commit 2f4b981cd4a373cb66af935558e2ed3a779dd202
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 19 18:17:02 2013 +0000

    heat engine : avoid returning empty resource error strings
    
    Avoid the possibility of returning an empty string (when Exceptions
    have not got a string message), or parser.py will treat the error
    as success and the resource operation failure will not be correctly
    reflected in the resource state.
    
    fixes bug 1130270
    
    Change-Id: I1c55dea1f9615cd4b037802ff8c1066694bffea6

commit 04288ce01a9c25bc7e2e886b992e22a9fe42eccd
Author: sdake <sdake@redhat.com>
Date:   Tue Feb 19 08:55:08 2013 -0700

    Missing policy json files from tarball
    
    The tarball is missing files:
    heat/tests/policy/deny_stack_user.json
    heat/tests/policy/notallowed.json
    
    Fixes: bug #1130119
    
    Change-Id: I4614c759044e0eedb9dab5f7cbe8d71f4cbdc38e

commit 54defea528b938a78f686d1f37daaa7025872a34
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 14 16:17:25 2013 +0000

    heat engine : Implement rollback for stack create
    
    Implement stack rollback for create_stack, so if a stack
    creation fails we automatically rollback (ie delete) the
    stack
    
    NOTE : this option defaults to on, so use the --disable-rollback
    option to the CLI tools if you want to disable this feature
    
    blueprint stack-rollback
    
    Change-Id: I70a3822426706d0787e571517e059baff1406c0f

commit 5bf32e30d0e4d5317e880d3dd3403bd334b90403
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Feb 15 18:31:13 2013 +0000

    heat engine : Only create periodic task on CREATE_COMPLETE
    
    Only create the stack periodic watcher task if the stack create
    completed successfully, since we don't want a watcher task if
    the stack ended up rolling back (or just in CREATE_FAILED state)
    
    Change-Id: I5592fa106f740eb2e1dcf40e98a2656627715b6f

commit fd85eb5f441fa3937051faa33f6b9519a648c355
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Feb 18 19:40:09 2013 +0000

    make stack_delete_after decorator tolerate deleted stacks
    
    Make the stack_delete_after decorator try/except so it doesn't cause a
    test failure if the test has already done a delete during the test
    
    Change-Id: I4a5e096478ece0de02cc910366a5d361d5ee45e0

commit bca6e21601babd5125eb3897458d0b0c65e510c3
Merge: df6bd79 01a6f6f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 19 00:55:29 2013 +0000

    Merge "Provide unit test coverage for AWS::EC2::SecurityGroup"

commit c1c56fb438cc6b08a2198016dcfa6568552f62c9
Author: sdake <sdake@redhat.com>
Date:   Mon Feb 18 17:25:34 2013 -0700

    Use 2013.1 for Grizzly release version info in setup.py
    
    setup.py does not have a default version number specified.
    
    Fixes Bug: #1129620
    
    Change-Id: I4fd0ae02ad445aa1bdd25a67aead1e52fd731e3e

commit 01a6f6f6d2f1cdbf3791f07b0495b00e93f108ec
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Feb 19 12:55:09 2013 +1300

    Provide unit test coverage for AWS::EC2::SecurityGroup
    
    There were some issues that testing revealed, includes fixes
    for those.
    
    Fixes bug 1129577
    
    Change-Id: I31b02c7fc9179b61b74dd18a38e15d126b406f80

commit df6bd799dad1a3f135aad7e1868d48ac215116e0
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 14 16:16:09 2013 +0000

    heat cli : Add --disable-rollback option to heat-cfn
    
    When rollback is implemented it will default on, like aws
    so this option allows stack rollback on create to be disabled
    
    blueprint stack-rollback
    
    Change-Id: I02fcaaa656219b1c65729cecdd473e0a5bd86036

commit 76cd4260b1fc452362bc22e6278e99d4196f7009
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 14 15:41:14 2013 +0000

    heat tests : delete stacks from DB in parser tests
    
    The tests which store a stack in the DB should delete it
    at the end of the test, otherwise any cut/paste test
    which uses the same stack name will always fail
    
    Change-Id: Ib2e26480924bfe65a2f6fe8ae55076466394bcee

commit ab8cbf3d326dc34e0537d589c991686f53d16502
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Feb 13 15:59:05 2013 +0000

    heat api : Handle DisableRollback parameter in cfn API
    
    Previously we ignored DisableRollback for create/update,
    pass it to the engine since the engine API now supports it
    
    blueprint stack-rollback
    
    Change-Id: I926d843a88449fa61b665bd1b47946724f6d2ce5

commit fa5e93df10a640053836101d11500f85b2ae7f18
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Feb 18 20:01:42 2013 +0000

    make engine api handle string or bool disable_rollback
    
    Allow API's to pass string or bool format True/False flag
    for the disable_rollback argument to the engine RPC API
    
    Change-Id: I1886263ac2487c4cb36c8bd93fd1d09b04abe813

commit f66871a404b80d5a6f0a9eb0211e08e9e865f4c5
Merge: 9d98e0b d5622fe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 18 20:17:36 2013 +0000

    Merge "Add information about using the python-heatclient to the documentation"

commit 9d98e0b3c256a5bd467c880a289899b6c97b37e7
Merge: ec325a6 4b93f98
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 18 19:49:45 2013 +0000

    Merge "Implement RouteTable and subnet association"

commit d0dde5b4a9d7ba4efe608e45f66e27aa98ed6ec3
Author: Ian Main <imain@redhat.com>
Date:   Thu Feb 14 15:04:30 2013 -0800

    Throw a proper error if the flavor is missing.
    
    I ran into a bug which caused a bt when the flavor is missing on the
    targetted system.  This patch makes it throw a proper exception and a
    useful error message.
    
    Fixes: bug #1129388
    Change-Id: I545fce32732522053e2a4a113a02883a89045910
    Signed-off-by: Ian Main <imain@redhat.com>

commit d5622fee4b38aa461526c657ccd54f6d9e7e0870
Author: sdake <sdake@redhat.com>
Date:   Sat Feb 16 14:12:24 2013 -0700

    Add information about using the python-heatclient to the documentation
    
    Adds information about using python-heatclient.
    
    Fixes Bug: #127498
    
    Change-Id: I77d161a5a7c8f0bed9653681d8f4b5aa513e7086

commit ec325a6931acc458f5acef8a53caa3c17f143cc4
Merge: fb0e683 b1e5bde
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 18 17:58:11 2013 +0000

    Merge "heat engine : Add support for disable_rollback to engine API"

commit fb0e683be788e3ddd1ab9d86ac8a04272e4ffadd
Merge: d22734c ea8bda2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 18 17:48:24 2013 +0000

    Merge "Make AvailabilityZone parameter available to nova create"

commit ea8bda21c15bf9ac1a58326ba9350c0ad3b82be0
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Feb 15 10:57:46 2013 -0500

    Make AvailabilityZone parameter available to nova create
    
    Looks for the AvailabilityZone property in the instance's
    resource section. For example:
    
    "Resources" : {
      "Properties": {
        "AvailabilityZone" : "nova",
    ...
    
    Fixes bug #1096006
    
    Change-Id: I3333b5f909b27e53f6985713de58dd30efc1a80a
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 150d2ca694af16542a0a7c13cb857cbdae98243c
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Feb 18 17:13:52 2013 +0000

    Use oslo-config-2013.1b3
    
    The cfg API is now available via the oslo-config library, so switch to
    it and remove the copied-and-pasted version.
    
    Add the 2013.1b3 tarball to tools/pip-requires - this will be changed
    to 'oslo-config>=2013.1' when oslo-config is published to pypi. This
    will happen in time for grizzly final.
    
    Add dependency_links to setup.py so that oslo-config can be installed
    from the tarball URL specified in pip-requires.
    
    Remove the 'deps = pep8==1.3.4' from tox.ini as it means all the other
    deps get installed with easy_install which can't install oslo-config
    from the URL.
    
    Excluded code from oslo-incubator in the pep8 check.
    
    Retain dummy cfg.py file until keystoneclient middleware has been
    updated (I18c450174277c8e2d15ed93879da6cd92074c27a).
    
    Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc

commit b1e5bde791e106d5857cbf7ed16330f3afcdff2d
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Feb 13 15:40:30 2013 +0000

    heat engine : Add support for disable_rollback to engine API
    
    Adds support for a disable_rollback parameter to the engine API
    which will allow us to control rollback of create/update
    
    blueprint stack-rollback
    
    Change-Id: I832f26c917d8fc178b925ce49a2366faf6e3dc0e
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4b93f989efd3db89c3264f8b4096f7594a377cfc
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Feb 18 09:12:12 2013 +1300

    Implement RouteTable and subnet association
    
    Implements blueprint resource-type-routetable
    and blueprint resource-type-srta
    
    Change-Id: Idb6e8d060563d22847d100220e9a1750340583a8

commit d22734c32600fbe121a50734e2ee30bf7bdf15ad
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Feb 14 10:05:11 2013 +1300

    Implement Internet Gateway and VPC attachment
    
    Please note that this takes a different approach for
    all VPC resources types. Previously the resource_id matched
    the underlying quantum resource UUID (or a composite of the
    underlying UUIDs)
    
    This had some problems, including:
    - it was resource_id abuse
    - it required extra quantum _list and _show calls to get enough
      data to wire up new resources
    - it made the already difficult job of mapping VPC <-> quantum
      even harder
    
    The new approach is to store all quantum UUIDs in resource metadata.
    The resource id is just the resource name, so resources can easily
    fetch other resources from the stack by ref/name then look up
    their metadata to find the underlying quantum UUIDs to perform
    operations with.
    
    Implements blueprint resource-type-internetgateway
    
    Change-Id: I69937254566b74f173439b3c5ce4c4e8d8c49afa

commit b9ed62c6b4ded4cf856388da651c6d86e4ddb779
Author: sdake <sdake@redhat.com>
Date:   Fri Feb 15 16:25:34 2013 -0700

    Escape awk + sign so heat-keystone-setup works on Ubuntu 12.04
    
    plus sign needs escaping
    
    Change-Id: Ia03f1eb213c806d13e88a435023ede8511ddfa4f
    Fixes: bug #126723

commit 6f330aed62e2d199efdd3d0defa4f717b2f84f59
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Feb 14 13:10:24 2013 +1300

    Complete tests for NetworkInterface
    
    Previous test was lacking some coverage, and had a hidden error.
    
    Change-Id: I7cd3c98a3b89eef4f84f0e52701ab7f7fccc61f2

commit 6ac385218d931c4e364902fd828d9e14e41de2ad
Merge: ac920ca 710114b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 13 21:33:45 2013 +0000

    Merge "Use physical_resource_name for quantum/vpc resources."

commit ac920ca66a3974c2befbfd5c48a5b6fc76c77588
Merge: ed81013 09bceee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 13 21:33:38 2013 +0000

    Merge "ip_version is mandatory for quantum create_subnet"

commit ed81013036813c4f55cc5bb39f73b93adbe49ce8
Merge: 6f09686 c73c3bc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 13 21:33:19 2013 +0000

    Merge "Implement VPC Network Interface resource"

commit 6f09686ddb9683630730103a90fac4362870eac6
Merge: 9c3d6e7 c011665
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 13 21:01:13 2013 +0000

    Merge "Add Tags to vpc properties schema (Unimplemented)"

commit 9c3d6e77f2dc241c94803da025aa64a7a7cefd46
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Feb 13 11:10:53 2013 +0100

    Fix policy checks for users without policies
    
    When the User resource doesn't have the `Policies` property specified,
    the policy checking code raised an error because it tried to iterate
    over `None`.
    
    Change-Id: I1ad0a051c837744d8ec0a343929918c92fa78437
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 710114b0ee82cd0f4b7ad9847011a2e5daaf69f5
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Feb 12 13:15:47 2013 +1300

    Use physical_resource_name for quantum/vpc resources.
    
    This give a bit more namespace seperation for quantum resource names.
    
    Change-Id: I72736b4409937eb8511ef94dc58407aed20a0f67

commit 09bceee79bf67b731c1c79fb9a7b6ad799c8b2f6
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Feb 13 13:46:12 2013 +1300

    ip_version is mandatory for quantum create_subnet
    
    Change-Id: I6e0e0afc5d825c00c4b4ecafa893c8a582faadc7

commit c73c3bc21bad4120da442f88565b9926fa76bd2b
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Feb 13 09:44:37 2013 +1300

    Implement VPC Network Interface resource
    
    Implements blueprint resource-type-networkinterface
    
    Change-Id: I90f0c1ef41d457e595ac662d26eeadeae4ec81c7

commit c0116652365372319ac027d4f54ae3d0b2c5a4ff
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Feb 13 11:04:58 2013 +1300

    Add Tags to vpc properties schema (Unimplemented)
    
    Change-Id: I9889c502837d666e25297634f77116f40d4deea8

commit 44ea0380041fd353a22f3d99a266d9cd3399ea5c
Merge: 0673238 098cf6f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 12 21:49:54 2013 +0000

    Merge "Impement VPC subnet resource"

commit 098cf6fe34f1167634ccf044b91649348aaacbbb
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 3 09:00:22 2012 +1300

    Impement VPC subnet resource
    
    Implements blueprint resource-type-subnet
    
    Change-Id: I870e69249b591f9724b3a9c7bf076853a4eb880a

commit 067323878522df12484c02211e852609185cb4fb
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 12 16:02:44 2013 +0000

    heat templates : allow access to wordpress in example templates
    
    Latest wordpress package in Fedora defaults to deny-all so trying
    to access the wordpress site on the instance no longer works,
    so sed out the deny all to allow template examples and integration
    tests to work again
    
    Fixes bug 1123053
    
    Change-Id: I7597e4f491426e639c4c19a92f610c8a693dc1f3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 6cde2c42e21301466720559bfc0b9049ea69cbde
Merge: 22a10bf 3c11589
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 12 15:51:44 2013 +0000

    Merge "Make the doc look a bit better and give a better overview."

commit 22a10bfc5b43425e4f8ed00d615f871748bb650c
Merge: 554c534 15e0532
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 12 15:51:08 2013 +0000

    Merge "Implement NetworkInterfaces instance property."

commit 554c5346d31478b2db388d4d0b7f56de4ec70833
Merge: 6f8b13f 0104c7b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 12 15:49:31 2013 +0000

    Merge "Catch 404s when deleting quantum resources."

commit 6f8b13f13364abcdd3ea5c8707d7f100fddab1ed
Merge: 62d0960 b019ec2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 12 15:47:02 2013 +0000

    Merge "Implement the "Volumes" property of Instances"

commit 62d09608d543bb82f609570a411c49191e1a00da
Merge: c66415e c598d0d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 12 15:42:56 2013 +0000

    Merge "Refactor loguserdata.py so it can be tested."

commit b019ec2690957b373a88bc3ac767b2704e144dc1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Feb 12 17:53:56 2013 +1100

    Implement the "Volumes" property of Instances
    
    This moves the attachment code to clients so both instance
    and volume can use it.
    
    bug: 1101119
    Change-Id: Id412110ceb74b3b5316f591d03898312691f2a3e

commit c66415ef885292b64c61b19dece305698f27968f
Merge: dae0efb 5531eee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 11 15:50:31 2013 +0000

    Merge "heat engine : add option to control instance boto http/https"

commit dae0efb3753f4a29711c75dab84c54a8d9bb60c6
Merge: d7f0c7c e47e14f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 11 10:47:03 2013 +0000

    Merge "Add update support to InstanceGroup"

commit d7f0c7c0f4961bdcf85122f76fc779b4444cb8aa
Merge: 84baf14 cbd9318
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 11 09:47:58 2013 +0000

    Merge "Depend on WebOb==1.2.3 to align with other OS projects"

commit 3c11589e37f0c8fc84ed9ec6fb2c00a4c5a06c6e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Feb 11 14:49:21 2013 +1100

    Make the doc look a bit better and give a better overview.
    
    (styles mostly copied from Ceilometer docs)
    
    Change-Id: Ie3eab4f579e0c16a09634faffb90e96a872d5d84

commit e47e14f0b9ab04e155241a8c27b91413f7c4c885
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Feb 11 14:44:45 2013 +1100

    Add update support to InstanceGroup
    
    Change-Id: Ie4d554f7440d06d408f71ff1b223d34d50b655bc

commit 15e0532428fffa46c3da7b1e2e58a7b47fc7a430
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Feb 11 14:31:09 2013 +1300

    Implement NetworkInterfaces instance property.
    
    This accepts a list of strings, where each string will be a Ref
    to either a OS::Quantum::Port or a (yet to be implemented)
    AWS::EC2::NetworkInterface.
    
    This fixes bug 1096013
    
    Change-Id: Ic8aecf8d59395edcf111b3a778e79762af0e50d4

commit 0104c7ba5c89c5991ed9437e394e050c14ed1291
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Feb 11 14:34:32 2013 +1300

    Catch 404s when deleting quantum resources.
    
    Quantum resources are often automatically deleted when their
    dependencies are deleted, so resource deletion needs to tolerate
    the resource no longer being there.
    
    Change-Id: Id2679a7b72b83f05c1ebac07305ae9a5e5923df9

commit 84baf14fa5b72a37baef2b4625802a2aa1ef9b95
Merge: 2602270 d2528a5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 11 02:41:12 2013 +0000

    Merge "Remove sendfile as a dependency."

commit 2602270524561ededfbdaa4bc76d140993a6d247
Merge: 46defc8 d499938
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 11 02:37:37 2013 +0000

    Merge "heat clients : Make boto client select http/https from configfile"

commit 46defc819b070a40d126ebb190cbb490467d944b
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 5 14:07:14 2013 +0000

    Implement simple AccessPolicy Resource
    
    Implement a simple AccessPolicy resource, which can be used
    to restrict in-instance users to specific resources when they
    call the DescribeStackResource API action
    
    Fixes bug 1115758
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: Idc98531388e535ce16308fd5aab5ceecda1de682

commit b85c44274174176d327657259a124d943b9abb3b
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 7 15:54:42 2013 +0000

    heat templates : Remove IAM Policy sections
    
    Some templates have Policies specified for the User
    resource in the AWS IAM Policy format, which we do
    not yet support, and will confuse users now we have
    OS::Heat::AccessPolicy implemented
    
    ref bug 1115758
    
    Change-Id: I6958b02fe6518ea43729ebc18818524ae7e4921e
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 74100c8657a7eb521360b95e9497c3b7cbd0a399
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 7 15:33:17 2013 +0000

    heat tests : split user test into User/AccessKey
    
    The test is testing two classes, User and AccessKey,
    so make the tests separate
    
    Change-Id: I79e183381ce69e2d2d564c254b2f903b60672e33
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 5531eee5e4602e9aa5ee2d32df01b9ea3355f2ed
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Feb 8 11:39:17 2013 +0000

    heat engine : add option to control instance boto http/https
    
    Currently the heat-jeos code defaults to http only, but we are
    about to fix that, so we instead need a way to specify if
    instances should connect via http or https - boto provides the
    is_secure config file option, so add a new heat option which
    controls this setting in the boto config we create in userdata
    
    fixes bug 1117594
    
    Change-Id: I0b9201107570334d9846d9613d252da1a91efe8a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d4999382a5bbf2be2399464f4fd8280d1123b526
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Feb 8 11:34:58 2013 +0000

    heat clients : Make boto client select http/https from configfile
    
    Currently we hardcode is_secure=False, but boto supports configuration
    of this option from the config file (either ~/.boto or /etc/boto.cfg)
    so better to do that
    
    NOTE - you will need to update your boto config to include is_secure=0
    to retain current (non https) behavior, since it defaults to on
    
    ref bug 1117594
    
    Change-Id: Ic13e8604f12d3d5be4ec132a1bc04ae7624ec85d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d83b7911f08c6aae09602978bb41c8c6c4db0044
Merge: e912c56 1b1dd45
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 8 02:22:14 2013 +0000

    Merge "heat api : Add policy.json authorization to cloudwatch API"

commit e912c565c09c4a2609089abac7b2a827e3be0823
Merge: e39d91b cae898d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 7 16:40:26 2013 +0000

    Merge "heat scripts : Avoid using lsb_release in tools/openstack"

commit cae898d519cf947387286ff7bf61e9c97774e4e3
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Feb 7 11:16:28 2013 +0000

    heat scripts : Avoid using lsb_release in tools/openstack
    
    lsb_release is not installed by default on Fedora (or at least
    it's not on my F17 box), so we should avoid using it, simple
    alternative is just to read /etc/fedora-release instead
    
    Change-Id: I341c151e8560fb971b11d27578934940aeeca1a7
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit e39d91b48f46c7c88fa8161c3440dc568c8c4870
Merge: 91a8221 861f1b7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 7 11:07:29 2013 +0000

    Merge "Add missing logging import"

commit 91a8221b50b0dd8c70fc2bf787d5db7ff4d9546e
Merge: d222386 215de3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 7 10:56:30 2013 +0000

    Merge "test_s3: use try_import from common"

commit 1b1dd456b21a32235ab0327f9fbc312892ec6c46
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Feb 6 16:32:54 2013 +0000

    heat api : Add policy.json authorization to cloudwatch API
    
    Adds a basic policy.json to authorize all actions for the CW API -
    this will deny access to the in-instance users defined in stack
    templates (which are assigned the heat_stack_user role) to all API
    actions apart from PutMetricData action, which is used by
    cfn-push-stats to provide metric data from the instances
    
    Change-Id: I2bbb885bec98b85828cdb92d7efc0688da7be3c1
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit cbd931885ee1f635555f148a5a97f1ccef11740c
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Feb 7 16:23:10 2013 +1300

    Depend on WebOb==1.2.3 to align with other OS projects
    
    Change-Id: Ic1b113a63a9fa44acf98efbe18783f5be5cbeada

commit d2223869f97055bd1012a31a29c3b1df24773a79
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Feb 6 16:27:23 2013 -0800

    Use yaml.safe_load: full yaml.load isn't needed
    
    The only reason to use yaml.load instead of safe_load is if one wants to
    load serialized objects. Heat's use case is purely to load basic data
    structures such as maps/lists/strings. Fixes bug #1117820
    
    Change-Id: I4f6cf2ed4e15405f8b296ccaec737a3779c9867d

commit 861f1b70393a3bb3c40eeb09f3ec2ffa44fe0836
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Feb 7 10:13:02 2013 +1100

    Add missing logging import
    
    Change-Id: I863a4b69fe4d050165d304bbf630c57ce171b1bc

commit 215de3e28c4a378327e52dc5cafcb5de39653ad9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Feb 6 22:25:22 2013 +1100

    test_s3: use try_import from common
    
    Change-Id: I3055c3d2f8061b91b038286d8ff2c5cbdcd41efd

commit aa80a0700d3972e53b9fc794edb70161652f424e
Merge: 9336d81 dfacae6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 6 22:02:55 2013 +0000

    Merge "heat api : Add policy.json authorization to CFN API"

commit 9336d81c5c8cb6e98b59a7621a7b559bb37afa32
Merge: ed14ca1 a45bbcc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 6 22:01:42 2013 +0000

    Merge "heat common : context should split roles from X-Roles"

commit c598d0d3e81b0dbd46fe9239a49ffda16ced5378
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Feb 5 10:10:11 2013 +1300

    Refactor loguserdata.py so it can be tested.
    
    - Use distutils.version.LooseVersion for cloud-init version check
    - Fix bug 1100287 by setting the following modes:
      - 0600 /var/log/heat-provision.log
      - 0700 /var/lib/heat
      - 0700 /var/lib/cloud/data/cfn-userdata (was 0111!)
    - Full test coverage except for where __name__ == '__main__'
    - File size has gone from 1218 bytes to 1636. If necessary we could reduce size in the future by using short names
    
    This works for me when launching a template. At least if there are any regressions they can have a test written for the fix.
    Change-Id: I04e773a743ec210e90394e50d2bb70c70664e80e

commit ed14ca1426eaacbfb1ebdf224b2e9ac058619f81
Merge: 9a177a1 dd963cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 6 19:31:54 2013 +0000

    Merge "Add cinder support to resource volume"

commit dfacae65b5711ad960128c337295e756f6234b31
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 5 19:23:38 2013 +0000

    heat api : Add policy.json authorization to CFN API
    
    Adds a basic policy.json to authorize all actions for the CFN API -
    this will deny access to the in-instance users defined in stack
    templates (which are assigned the heat_stack_user role) to all API
    actions apart from DescribeStackResource, which is used for metadata
    updates
    
    ref bug 1115758
    
    Change-Id: I1431c1f23593fffd0f911f71ef9c186a43e5063a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit a45bbcc8e2c2c98cbd673c845a226721931d9729
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Feb 6 11:39:12 2013 +0000

    heat common : context should split roles from X-Roles
    
    The auth_token code joins roles with a comma delimiter and stores
    the result in the X-Roles header, so we need to split X-Roles back
    into a list for the context (otherwise the oslo policy code breaks)
    
    Change-Id: I32bd1d6355b6fe0e16e729f35b1d0b5c61346a70
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 9a177a14e8adddc3ebbbdefc6f60f8eb2975f672
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Feb 6 10:05:58 2013 +0000

    heat tests : fix StackControllerTest name duplication
    
    StackControllerTest appears twice in the run_tests.sh output,
    since it's used for both the CFN and ReST API tests, so rename
    the CFN testcase to make run_tests output less confusing
    
    Change-Id: Iedf2e21ecd0b511eb93a11c2cf593dbfc1bcaca9
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f46670e82b00f74e249ffa9990ecd66922be1f0d
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 5 16:31:05 2013 +0000

    heat tests : remove duplicate import
    
    Change-Id: I20364f10041420d898e3255adcc12f3a8f53ed03
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit dd963cf11056aaa8d2b8048789876f43dd6bb03a
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Jan 28 15:24:54 2013 -0500

    Add cinder support to resource volume
    
    Fixes bug #1073164
    
    Change-Id: I190067e5ea9334e336e6f105222905b1d48408fd
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit ffaad1ffba2e1cb9d06ead8c34df3223c20a51fd
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 5 19:21:00 2013 +0000

    Add initial code to support policy.json implementation
    
    We don't currently support a policy.json file like
    other openstack services, so this code (mostly copied
    from glance, then modified a bit) will allow us to
    add policy-based authorization to out APIs fairly
    easily
    
    Change-Id: I5ad9f55b3d0979e2526953bdce8b8227852e4b72
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c9666e8e853fae9ecf928407f32f57e2fadb3e2f
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 5 14:18:05 2013 +0000

    update openstack common and include policy.py
    
    Sync with latest oslo (now at bd5d9f0), and update config to
    pull in policy.py
    
    Change-Id: I3571477cbf7c538c9ddb6860f85265ed503d2049
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 2ecc0688b50406cbe0f9bf91e27647a8b83a6140
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Feb 5 14:09:00 2013 +0000

    Remove unused heat/common/policy.py
    
    Remove heat/common/policy.py, since we don't currently implement
    policy filtering, and when we do we should use the oslo policy.py
    
    Change-Id: I0c1d26ceed958d270f59edd612911ce24f74c1ff
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 90bcc70a57f89e55a0af7775c71e6e0c5cd215b7
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Feb 5 00:24:21 2013 -0500

    Fix a few bash logic errors in install script
    
    Slipped by in 0a37f56972714818fcf378945b0d3b91d1b8e10a
    
    Change-Id: Id02454e8224f99b057cc8c9e92580ae6c26bc14e
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit d2528a5222bd76cdaa8f4ab826134e2f9fe14c15
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Feb 5 16:15:13 2013 +1300

    Remove sendfile as a dependency.
    
    This is dead code anyway, since heat-cfn doesn't handle large binary files like glance.
    
    Fixes bug 1087530
    
    Change-Id: Iaba7adce088b20136ece0828d4085679fcbab731

commit 48f38bc24c477c6e44b42b8e2214636552b9c89f
Merge: 6468194 0a37f56
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 5 01:06:18 2013 +0000

    Merge "Change install scripts to use cinder"

commit 6468194ecc838e26e8a78955abd0ccc3ab6cedee
Merge: 5cb518d ca60dad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 5 01:03:10 2013 +0000

    Merge "Update to latest oslo-version code."

commit 5cb518d9014ea69f34a964119840130b962cb80b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Feb 5 09:12:51 2013 +1100

    Fix typo in AutoScaling update
    
    Change-Id: I2e96e6f71c3cb0b9ce73e57344e0eb4706b95f70

commit 0a37f56972714818fcf378945b0d3b91d1b8e10a
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Jan 25 16:06:16 2013 -0500

    Change install scripts to use cinder
    
    Fixes bug #1073164
    
    Change-Id: Id483b028d19dbbc30984299120b87fd020f19903
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 89ad44e0ce85ed26d446234a155acb8d62af6a34
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Feb 4 18:03:52 2013 +0000

    heat engine : AutoScalingGroup UpdateStack support
    
    Adds improved UpdateStack support for AutoScalingGroup,
    now the following properties can be updated without
    replacement:
    'MaxSize', 'MinSize', 'Cooldown', 'DesiredCapacity'
    
    Change-Id: Ic47b4a2456dc19cd91eec7b0381d5d82fcd3f332
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit e4ded57bd4092642a89ebb1b6f3fb2aae180da2c
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Feb 4 14:09:04 2013 +0000

    heat engine : Resource add function to compare properties
    
    Add update_template_diff_properties to make comparison of
    pre/post update resource properties easier
    
    Change-Id: Ic37d37ae510a62739d4cc4219cfd69479a87767d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 5390ebdcfaccc1f9f4ac1360800c238ec203fdde
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Feb 4 13:35:05 2013 +0000

    heat tests : update_allowed_keys should be tuple
    
    In test_resource.py update_allowed_keys should be a tuple not
    a list, so it matches the expected usage in the resource classes
    
    Change-Id: Ic7428e3790ea2c8c9887b464daf303c4f5d563fc
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 099fc71fa1f4a3031b11c4d176589fa21cf6eb4f
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Feb 4 12:08:29 2013 +0000

    heat engine : Resource remove redundant None get defaults
    
    get(k) returns None anyway if k doesn't exist, so the default to
    None is not needed
    
    Change-Id: Id954c510a5c4795b5e0c3ccdcca186983dee2e8f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit a43fcaab7b953b7712f395c51c5db69b8b3089b3
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Feb 4 14:23:07 2013 +0000

    heat docs : Fix version string issue
    
    Fix issue with release/version strings in doc build config
    which was causing doc builds to fail with an error.
    
    Fixes bug 1115269
    
    Change-Id: Ia02d52f502d808d758a541e84056d5ac94aff8b8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ca60dadddaa00427d4a1e6e458188344fd64a5bf
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Feb 4 09:29:49 2013 +1100

    Update to latest oslo-version code.
    
    This pulls in the bugfix patch that handles the usecase wher a packager
    running tests from a tarball.
    
    Change-Id: I38cadc5ceaf880f632a0f7ed4d5e9a51c9ddc4e5

commit c751abc05debe98dff4efde44bb1c9cb43230562
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Feb 1 13:01:18 2013 +0000

    heat engine : WaitCondition add Handle property validation
    
    Add validation to the Handle property for WaitCondition, so
    we check that the identifier in the provided URL maps to
    a WaitConditionHandle resource in the same stack as the
    WaitCondition
    
    fixes bug 1100754
    
    Change-Id: I44c8f52435016fad5a35183472d2b0df26c1915d

commit 7574ce87bcb3d7362a4dbd2965095e3990457bd6
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jan 31 14:22:44 2013 +0000

    heat tests : test_api_cfn_v1 move verify out of teardown
    
    Move VerifyAll out of the teardown function so if it fails
    the stubs are still unset
    
    Change-Id: I92132236f013d9d9dfeb82ba77ecfadc2e07f671
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 95a159cef9e31ed9944f103f07db33b9792d8230
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jan 31 11:44:40 2013 +0000

    heat tests : test_waitcondition move cleanup out of teardown
    
    Move stack delete and mox VerifyAll out of the teardown function
    so if either fails the stubs are unset, meaning all subsequent
    tests won't fail due to being unable to setup their stubs
    stack delete is now performed via the stack_delete_after decorator
    
    Change-Id: I636af84dd66ba4923f068c56ec13e7990d8edc03
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 9cead1a7e8bd44e69d9fee881477231b2b45fbe1
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Feb 1 11:23:33 2013 +0000

    heat tests : Add utility decorator for deleting stacks
    
    Add decorator function which allows test functions to be wrapped
    such that if they create a stack (and it is stored in the testcase
    class as self.stack) it is always deleted on test exit, regardless
    of test success/failure
    
    Change-Id: Ibde9a2cee08448e3f24c6b7efbfe756a01f9eccc
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 2979270a41ae2a3fb28e37900e93dd174a16f6e6
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jan 31 15:41:16 2013 +0000

    heat api : add register_api_opts to init.py
    
    Add register_api_opts to api/__init__.py, slightly simplifying
    the api executables, and also solving an issue with some tests
    which were not working via nosetests -s due to the required
    options not being registered in cfg.CONF
    
    Change-Id: I70b16aae1f73f72518013dbcda37defa79fc5649
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 01a0fa8991d35ead1dc59580e07c0059cb07fd66
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 29 18:20:04 2013 +0000

    heat engine : WaitConditionHandle use creation time for timestamp
    
    Use the resource creation time for the pre-signed URL timestamp,
    otherwise you get a different timestamp/signature every time you
    refer to the resource, which makes things like comparing templates
    for update more difficult.
    
    Change-Id: Ieb4a6269cfcaf1214c08442db03772fdd7570d59
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 0b4ab31c3fc3383892ea15632074a0531c8615eb
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 29 16:02:32 2013 +0000

    heat engine : don't treat UPDATE_COMPLETE as failure
    
    The parser update logic currently treats UPDATE_COMPLETE
    as a failure, which is incorrect
    
    Change-Id: Ibac98fc08cdf3653be80cedfc3ed8ecb5c3eba8f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 2ca04eeb6deae5feb0cbd8053c1855a22db82c76
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 29 15:58:08 2013 +0000

    heat engine : pass fully resolved template to update
    
    We need to pass the fully resolved (static and runtime)
    resource template into the resource update(), so the
    resource can compare pre/post update templates properly
    
    Change-Id: I2fba2fef9c9f9ccb9b7cde9bd24bd06af7659240
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit dfed072c0150e06592920e8016247326369ceffb
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 29 13:57:02 2013 +0000

    heat engine : Support Metadata update for Instance resource
    
    Allow Instance Metadata to be updated via UpdateStack
    
    ref blueprint instance-update-stack
    
    Change-Id: I7c2fd281650e0715c86bf63b8ab61114a9b81da8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d2a1a4beceea891208c3c30ebfad1d250e37dd8c
Merge: 0507990 3569bf2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 31 10:27:02 2013 +0000

    Merge "heat engine : add Resource update_template_diff method"

commit 050799066bb6e70733ba6a7ffad5a3e425955491
Merge: 6f36197 b3744f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 31 10:23:31 2013 +0000

    Merge "heat engine : pass json snippet into resource handle_update"

commit 6f361978810ee1ec22912972683a6960df75aa82
Merge: 6520fdc ac84fae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 31 10:20:26 2013 +0000

    Merge "heat engine : don't replace resource template before update"

commit 3569bf2323baaab90c37a2f164f3a13bfee3c644
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jan 28 16:52:23 2013 +0000

    heat engine : add Resource update_template_diff method
    
    Add method to top-level Resource class update_template_diff()
    which allows us to determine the difference between old/new
    templates for a resource update, and also raise an error
    if the changed keys are not in the list of those defined
    as supported for update by the resource
    
    ref blueprint instance-update-stack
    
    Change-Id: Ibef07a0cecbc15f7f1d6c2c663743e3af8023057
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit b3744f28af6c460f2c029a438e5680ad34d8704c
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jan 28 14:45:24 2013 +0000

    heat engine : pass json snippet into resource handle_update
    
    Change handle_update to accept the resource json_snippet,
    needed to decide if a non-replacement update is possible
    by comparing pre and post update resource definitions
    
    ref blueprint instance-update-stack
    
    Change-Id: I7eedce41eae232330f6fce4f098183cbd7fd6768
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ac84fae5d3847a2fc10ca95d1ba2be28e7fab08f
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jan 28 14:38:20 2013 +0000

    heat engine : don't replace resource template before update
    
    We want to validate the pre-update properties without touching
    the existing template, because the resource implementation will
    need to compare old/new json snippets to decide if a and update
    can be performed or not.
    
    ref blueprint instance-update-stack
    
    Change-Id: I37ce6e799242819de6104a53f8458d8bbc3abf1c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 6520fdc3b2be5fe94c681f0c5433fb9fb9a8b9bd
Merge: b7be08d 4f362bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 31 08:54:44 2013 +0000

    Merge "Wait for deletion of Instances during creation"

commit b7be08d06006aed1f8542fd45a0de1de6295c054
Merge: 4103368 4676914
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 31 08:54:42 2013 +0000

    Merge "Fix Instance deletion in unit tests"

commit 410336810d6234ee5ee96e8d483a7b5a8f149ccc
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Jan 30 14:26:34 2013 -0500

    Hardcode provision-finished file path
    
    A recent change removed the use of the cloudinit module, so write this
    log to /var/lib/heat. Functional test paths updated as well.
    (User data injection was removed, so that has been deleted as well.)
    
    Change-Id: Ibcaf310a5e4ff9a9ed8b1065bdd411e1b95d4de5
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 2533e8ad6d45ac97ee0a291318ef530dea5dcce8
Merge: 54d083d 6836c8f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 30 12:34:11 2013 +0000

    Merge "heat engine : error on resource update with invalid properties"

commit 54d083d233fe8dd137eba8584638f67ae3a84a59
Merge: 438f6d8 aed986c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 29 23:33:17 2013 +0000

    Merge "Store instance resource-id earlier"

commit 4f362bdf38cf54b264d7a0922eb6ae522fe74672
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jan 29 21:54:07 2013 +0100

    Wait for deletion of Instances during creation
    
    When an Instance was still in the BUILD state when it was deleted, the
    resource was not waiting for the instance to be deleted before declaring
    success and moving on.
    
    Change-Id: I05d553fedf10e01a06e20ca0e8ccbbbf463980e4
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4676914695497a9db3ed77d64d5e12e12bc1db4d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jan 29 21:49:27 2013 +0100

    Fix Instance deletion in unit tests
    
    We need to actually return a NotFound exception from the nova client,
    rather than just relying on it returning a status other than ACTIVE.
    
    Change-Id: I1bb0d07db0ffb5c0ed780eb4ca7f5d7ddb98510e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 438f6d85ff6de37f84bec332ab5aa5f67c0350a4
Author: Clint Byrum <clint@fewbar.com>
Date:   Sat Jan 19 20:45:17 2013 -0800

    Initial support for Transifex translations
    
    Adds initial message extract and configuration to allow heat
    to work with Transifex, which is the chosen platform for
    translations in OpenStack.
    
    Fixes bug #1082805
    
    Change-Id: If8585812d6127948f75994765d274da1629069a3

commit 6836c8f808b254af506e99ba78bba89ce5f913dd
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 25 14:37:26 2013 +0000

    heat engine : error on resource update with invalid properties
    
    If properties validation fails, raise an error so the resource is
    marked as UPDATE_FAILED, we don't want to go ahead and try running
    handle_update anyway
    
    Change-Id: I5f748b9de6a2b02d26421a5b6e0b1b5f0db25d0c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit aed986cd469b2cc2f044ca9c8374c1f6bb159e5d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jan 29 19:48:22 2013 +0100

    Store instance resource-id earlier
    
    If creation is interrupted during startup, we will need the ID of the
    instance stored in order to delete it later.
    
    bug 1072932
    
    Change-Id: I56b8d285bba43d6e2466705956f85c06f119d65c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 2ed70d7d507b011c11307ab4d2755012fd28b025
Merge: f09858e 64dedf4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 29 09:30:05 2013 +0000

    Merge "Make flavor-list regexp more robust"

commit f09858e373754580c72fc623bb138c944fa2a934
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Mon Jan 28 18:06:55 2013 +0100

    Merge from Oslo-incubator
    
    Change-Id: I2ef3bb9acdfb5bcae574d812e06fd689d0a7c890

commit 6d32597f067f20797a204ff89e528336288fb8d4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jan 28 21:57:27 2013 +1100

    Make sure failures in groups (autoscaling & static) are raised.
    
    Fixes bug 1104617
    
    Change-Id: Iebd2b0c6a4adf8c252db31348e4dc241c0479765

commit 0eff406e457cd3b6c44186dfe83604de8127329c
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 25 11:30:31 2013 +0000

    heat engine : AutoScalingGroup implement Cooldown property
    
    AutoScalingGroup schema accepts Cooldown but it doesn't do anything
    so implement Cooldown in a similar way to Scaling Policy
    
    fixes bug 1097850
    
    Change-Id: I0dae79fad5c13b0ae588b1a2ea4fe67eb06e3746
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit e15c1fa88dc605351fbe4c32a3763fff5435ffe4
Merge: b71b672 0c697e5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 25 06:46:12 2013 +0000

    Merge "heat engine : ScalingPolicy implement Cooldown property"

commit b71b672bd5f2921fb669eb7e79a173145d30a5ce
Merge: 53b81d2 748fdb7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 25 06:42:05 2013 +0000

    Merge "heat tests : autoscaling test add missing VerifyAll"

commit 53b81d2baf0f1aa1749a36dea17037cdd2e6626f
Merge: 5ed7cf5 d407429
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 25 06:40:57 2013 +0000

    Merge "heat tests : WatchRule test add missing VerifyAll"

commit 64dedf4cc6b240b837fb547d5226129bc1d8e9f1
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Jan 25 18:07:17 2013 +1300

    Make flavor-list regexp more robust
    
    This was failing for me due to different amounts of
    whitespace in the output.
    
    Change-Id: Id8cb7b63f770504df535542dd420f20a70b4b071

commit 5ed7cf501389a7b3be34e0fe5df333334ce74e1e
Merge: 69ebb38 5d46ab0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 25 02:44:47 2013 +0000

    Merge "A native Swift container resource type."

commit 69ebb38db23485dd10e2165bb2f508f34e5bf537
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jan 25 11:56:29 2013 +1100

    Make a dedicated InstanceGroup
    
    Make it the basis of the autoscaling group, the
    main difference is you change the number of instances
    via update (manually) or not at all.
    
    This can be achieved using the autoscaling group, but
    this is clearer from the user's perspective.
    
    Implements blueprint static-inst-group
    
    Change-Id: I72680e92183ba87a76efa64383269afb083a446a

commit 0c697e5d9ebc2c0a24327506c335e3b02d875eeb
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jan 24 09:37:04 2013 +0000

    heat engine : ScalingPolicy implement Cooldown property
    
    Implement the Cooldown property, which the schema currently
    marks as implemented, but it doesn't actually do anything
    
    ref bug 1097850
    
    Change-Id: I0cb1b24baa4377be4a78b2a7b92fb1ed5371fb6f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 748fdb7d9015769113f2b2b458a86cc6d41070a1
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jan 23 16:56:09 2013 +0000

    heat tests : autoscaling test add missing VerifyAll
    
    Add logic to verify stubbed calls to loadbalancer reload,
    also break up the tests a bit into functionally related
    chunks instead of having two mega-tests
    
    Change-Id: I94897b6ec23cae92bc464b4b3ef2a7b634bfdb0c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d407429f7df1b4ad8dc91b8e2a3a4a8b547a2406
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jan 23 15:45:37 2013 +0000

    heat tests : WatchRule test add missing VerifyAll
    
    We don't verify the mocked methods currently, so add the
    missing VerifyAll and fixup the stubs
    
    Change-Id: Ia74e64ef07d7b4fef6e060df1b794dc82cf7ee96
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 8d6aa11e707dee66c421bc2906c166fc58c150dc
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Jan 23 21:59:58 2013 -0800

    Use pkg_resources to detect version of cloud-init
    
    Previously the present of an API call only present in cloud-init 0.6.x
    was used to determine whether or not cfn-userdata would have been executed
    or not. The API call was removed in 0.7.x. This Fixes bug #1103793
    
    Change-Id: I27129f8ae6144ae7172b7159ed70fc5f0d7d07b9

commit 5d46ab040dbccf004adcebe67854a267e9240653
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Jan 22 12:10:15 2013 +1300

    A native Swift container resource type.
    
    Implements blueprint swift-resource-type
    
    The properties schema maps to the swift headers
    that are set during container creation.
    
    The schema allows any arbitrary X-Container-Meta-* header to
    be set in the template, which will be useful for users who
    store arbitrary header keys.
    
    This will be used during the presentation demo at LCA
    next week.
    
    Change-Id: I35e594cbe3cc251d5b48b41ea78ed2edda8aa807

commit bf02c9263fc3dda59ed3900ac4b655644ee08db5
Merge: f8ffddc 90ab473
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 22 17:57:02 2013 +0000

    Merge "heat rename HEAT::HA::Restarter resource"

commit f8ffddca0a7014a33f3b1aec1c33fe43ff39ef12
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 22 16:33:14 2013 +0000

    heat_keystoneclient make token auth work
    
    username/password are ignored so don't pass them, and
    tenant needs to be the context tenant not the service
    tenant or token auth will fail.
    
    Fixes bug 1072944
    
    Change-Id: I862d0041daad278dfe7bc16d59dc733dde90e758
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 38b7e7d501e049349ef70d2167f92e23997627b0
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 22 16:30:18 2013 +0000

    heat api paste.ini auth_uri should use auth_port
    
    For token based auth to work, the auth_uri needs to use
    auth_port, which points at the internalURL of the keystone
    service, the current config uses publicURL which causes
    token auth requests to keystone to fail
    
    ref bug 1072944
    
    Change-Id: If7e0c2246205377f57f879ccf8bf36ff8b0d92e1
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 90ab473643986316c87f4d6d83f0fb7a56572e1d
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 22 15:07:16 2013 +0000

    heat rename HEAT::HA::Restarter resource
    
    Rename HEAT::HA::Restarter to OS::Heat::HARestarter, which fits
    better with the other openstack-native resources which use the
    OS:: namespace
    
    Change-Id: I40038e64979aca184971b11e83f6ef92a3b54571
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 2ac3e4467a4bbd98517c5819bdece4f04bb1374e
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 22 14:26:05 2013 +0000

    heat engine : make WatchRule state message info
    
    Make log message for state transition info not warning,
    since transitions are not unexpected
    
    Change-Id: I8dc362735f77ab6d9ae35e0c6e9c820597cc29ef
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 039c66b11ad817cf70233866de91b42208261bda
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 22 13:45:11 2013 +0000

    heat engine : make WatchRule initial state NODATA
    
    Initial state should be NODATA not NORMAL, as we've not
    done any metric evaluation until the first evaluation
    period has elapsed
    
    fixes bug 1102446
    
    Change-Id: Ic41df29c00a5df2f3d161bc1b1d054d816c5afa5
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 7e1548516762cf599bf2c720c7d3a46113e3c8b9
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 22 13:37:43 2013 +0000

    heat tests : test_watch add tests for set_watch_state
    
    Add some tests providing coverage for the set_watch_state function
    
    Change-Id: Ia9f418035440c0941e25dd2e1ec85f8c0322d807
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit fa80030eb720e45757e123f386bffd4f1cede8a6
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 22 13:15:20 2013 +0000

    heat tests : test_watch add create_watch_data test
    
    Add test for create_watch_data, note there are some limitations
    on what we can test here due to weird sqlite behavior with the
    relationships defined in the sqlalchemy model
    
    Change-Id: I2616b6dcf163914619321e9ff08e37f3f365d7db
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f1d31b384851af24b203844f3785df0ca808ece5
Merge: 4bb2084 84500c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 21 20:34:05 2013 +0000

    Merge "heat engine : make watchrule actions run in stack ThreadGroup"

commit 4bb208429989a09bb8c96db448ba856ba5792ce3
Merge: 6014ea0 52bea7e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 21 20:33:31 2013 +0000

    Merge "heat tests : Add WatchRule evaluate test"

commit 6014ea066ad4237649d3cd312e0f4c781e20b7d4
Merge: 551a613 4999f65
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 21 20:33:28 2013 +0000

    Merge "heat engine : watchrule save state when actions undefined"

commit 551a613dde3a830dd5894dcb0a5478cca19ba207
Merge: 94a518d b436b03
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 21 20:26:08 2013 +0000

    Merge "ReST API: Don't overwrite webob error messages"

commit 84500c75bcd8d0e7cc6d03f6f12159e8f694e00a
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jan 16 16:21:16 2013 +0000

    heat engine : make watchrule actions run in stack ThreadGroup
    
    Make watchrule alarm actions run via greenthreads in the stack
    ThreadGroup - this allows them to be correctly cancelled if the
    stack is deleted whilst an alarm action is in progress.
    
    fixes bug 1097847
    
    Change-Id: I3190a05e3d0abd492961071d2db59a212bd4d373
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 52bea7e4e508d3f6e52cbfa4e8ef06fcdaa616f8
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jan 21 11:24:00 2013 +0000

    heat tests : Add WatchRule evaluate test
    
    Add test for WatchRule evaluate/run_rule functionality
    
    Change-Id: Ic6994208485d03ec692174dc52d3244d331abe10
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4999f652fbe4d80081c019c4db09aac475d10a3d
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 18 17:34:12 2013 +0000

    heat engine : watchrule save state when actions undefined
    
    We should save WatchRule state transitions, even if an action
    for that state has not been defined in the template.
    
    Change-Id: Iadca203d03b2c2a2a186a4e9574687d8f30ab080
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit b436b0360d0a13e72fcd799be383da1b416c9893
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jan 21 20:04:10 2013 +0100

    ReST API: Don't overwrite webob error messages
    
    We don't want to replace the entire body of the error messages returned,
    just add our detailed description at the end.
    
    Change-Id: I5899854d1ed1766285a5cae2f14c24025ed92e4b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 94a518d2c5749c6567034f52cb5b9e04c7fa7c5e
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 18 16:27:44 2013 +0000

    heat tests : test_watch remove logging
    
    Remove logging, since it's not configured to go anywhere,
    and we don't have logging in any other tests
    
    Change-Id: I50a3e08b0ee65f767e1b7471f1fb9679a4d3271f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c9d565effe016b646628be23682a3d0fae910925
Merge: c9e6034 8a572c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 21 18:25:31 2013 +0000

    Merge "ReST API: Return 400 for malformed JSON input"

commit 8a572c0b887a58df9bace67d567337a08ba3af18
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jan 21 16:36:21 2013 +0100

    ReST API: Return 400 for malformed JSON input
    
    Previously we had an unhandled exception that resulted in a 500 (Internal
    Server Error) result and a stack trace when an invalid JSON file was
    submitted in a POST/PUT request. Change to catching the exception and
    returning a 400 (Bad Request) result.
    
    bug 1102391
    
    Change-Id: I7dde33ae732d9addbf988b1d36d4f06eacb634bf
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c9e6034c519415dbc7f19e278143752c43df272d
Author: Pierre Freund <pierre.freund@gmail.com>
Date:   Sat Jan 19 13:52:40 2013 +0800

    Typo error, "requied" -> "required" in run_tests.sh
    
    Change-Id: I6ee8bdbd26cef373bb4be3bc18397819aa2a877b

commit 55c90321b462a409ffe4db124c31f3a9cec0490f
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 18 11:26:01 2013 +0000

    openstack/common : rebase to latest oslo
    
    Rebased to latest oslo, now at 8837013, note a few interfaces
    changed requiring a some tweaks to the heat code
    
    Change-Id: I7dfc634b7c459edebca19dee522b396e3736aecc
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 54f1b7b8468043b8e140a59fce8ea4e508ffd2cc
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 18 11:22:44 2013 +0000

    heat tests : test_engine_service remove commented lines
    
    Remove some unused lines from test_engine_service.py
    
    Change-Id: I272c77be1d0008da7f5189381ee7a5befd03e465
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit b0af0b1894e40eef4c9a560c85deffcd5df06564
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jan 17 17:32:25 2013 +0000

    heat engine : watchrule don't run rule for every SampleCount
    
    We should not be triggering a run_rule (which is an alarm action)
    for every datapoint when the SampleCount statistic is specified,
    otherwise e.g IHA instances get replaced every heartbeat signal!
    run_rule should only be called in response to a rule evaluate(),
    or an explicit override via set_watch_state()
    
    ref bug 1100719
    
    Change-Id: I91b144f24b542f48aa7fa98d8d8c404479e13483
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 293d7756ad73d261753492dc3f4cfafbf36653a2
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jan 17 14:43:34 2013 +0000

    heat templates : IHA enable cfn-hup
    
    The IHA template mentions cfn-hup in several places but doesn't
    actually enable it, so do so by adding the config file and crontab
    entry
    
    Change-Id: Ie852bba24a57c262a8d813d3b3fc76ba9b5e54b4
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 42f2134ff723be5b3539224ab8f33aac63a71965
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jan 17 11:22:09 2013 +0000

    heat templates : fix IHA HeartbeatFailureAlarm during instance build
    
    The HeartbeatFailureAlarm triggers prematurely while the instance is
    building, because cfn-init doesn't create the files (hence the
    heartbeat cron-job) until after the packges are all installed.
    If we make the HeartbeatFailureAlarm depend on the WaitCondition, it
    won't be created until the instance is fully built.
    
    fixes bug 1100719
    
    Change-Id: Iae73aa0974a3061f56aa3ee52598687f32c0f19b
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 8d5d9a908d614c251da8de56acb088848d8106aa
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jan 17 11:19:05 2013 +0000

    heat templates : IHA HeartbeatFailureAlarm should be Ref
    
    cfn-push-stats reference to HeartbeatFailureAlarm should be a
    Ref not a hard-coded string, or the engine fails to find the
    watch because the name lacks the stack prefix
    
    ref bug 1100719
    
    Change-Id: I0fbec026b883348b674327ae6e097a9452ce375f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d1b3cb40434135cf9fd207effd6397d9aecaebaa
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jan 17 11:13:48 2013 +0000

    heat templates : add missing credentials to IHA template
    
    WordPress_Single_Instance_With_IHA lacks credentials so
    cfn-push-stats can't authenticate with the cloudwatch api
    
    ref bug 1100719
    
    Change-Id: I218eea927a00b6cef58a4a1ee5d930c57ebb8a2e
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit bf4d35cdee7c1ddad46d1d40d8c5ab43452d2b48
Merge: fc025b0 d809301
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 17 12:52:33 2013 +0000

    Merge "heat tests : remove debug print"

commit fc025b0dd822deb3bb700355ae10aba075e6bfbf
Merge: 03b0e72 417b4c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 17 11:16:35 2013 +0000

    Merge "Remove instance in ERROR state after failed create"

commit 03b0e72a31d32c2919cd98a047bdd23f861cfbcf
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jan 16 18:55:58 2013 +0100

    ReST API: Clean up exception-handling cruft
    
    Now that we have explicit exception types indicating when a resource is not
    found we don't have to rely on knowing which call the error was from.
    
    Change-Id: I54ebce7cb68e551852fd87d51b57b26536cde136
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0f902d50e2f180d6bc7667af90b0b98f34c1c0a5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 17 08:48:27 2013 +0100

    RPC API: Add a WatchRuleNotFound exception
    
    Change-Id: I7abda2fb745b84925edf685b7fced3541d94a8db
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 805416ebb17a9af21e9c30cab807cf7815c92856
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 17 11:10:15 2013 +0100

    RPC API: Add a PhysicalResourceNotFound exception
    
    Change-Id: I409f8df9e93809f7267fb09656302082e42753da
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d8be4d0c122a2dddb4c530379be5c5a6175bcd06
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 17 11:10:15 2013 +0100

    RPC API: Add a ResourceNotAvailable exception
    
    Change-Id: I7f535b7823288b74cbe27f43b645a8d0f3180905
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 9c95aec814ed7ab40d6919e8312a7514c8a9c2c9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 17 11:10:15 2013 +0100

    RPC API: Add a ResourceNotFound exception
    
    Change-Id: If55cd6ca0eab8be9d192e76430aedf1d5a1767c3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 2bc41c73208071346f7888ec08eec338e77d27dc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 17 11:10:15 2013 +0100

    RPC API: Add a StackExists exception
    
    Change-Id: Ia8cb5af80abc7570b938c381d51e41eb7aa0629d
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 764f6ace9747d2d240b766bd22256aff16ed35fa
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 17 11:10:14 2013 +0100

    RPC API: Add a StackNotFound exception
    
    Change-Id: Ic109e9f6f5cca3af531ffcd2c9149742442e66d4
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c41ff7e1416fad1b7f198d3c41fd2bf64645deaa
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 17 11:10:14 2013 +0100

    RPC API: Add an InvalidTenant exception
    
    Change-Id: I0bd91c3ba15166d728f9e0570f787fdcc6a1cdc6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 819113b22611ce8f7780ef678792aada4e9be412
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 17 11:10:14 2013 +0100

    Prepare the groundwork for more exception types
    
    We have been abusing AttributeError and ValueError rather than raising
    exceptions that actually describe the problem. This opens the way for
    changes that will allow us to handle a wide variety of specific exceptions.
    
    Change-Id: I05c99601d4e877878195e658908fffa0e126f06c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit bbb87d688b6ae5b9054453791e2880072d964e44
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 17 11:10:14 2013 +0100

    Fix duplicate naming in unit tests
    
    This bug brought to you by the letters C and V.
    
    Change-Id: I375f628f3e36f4b1723dc8ccc99b0475a02c152c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b5214748ec58d9571a491e0d705991225ea5fcef
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jan 17 11:10:14 2013 +0100

    Get rid of unused initialisations in Resource
    
    The clients have all been moved out into the Clients class; these were left
    behind.
    
    Change-Id: I5831198cf3c2a7ef8cb9524960643d4adf310b3f
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d8093014b6b181ca48cc22df9723088d673d5389
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jan 17 10:30:54 2013 +0000

    heat tests : remove debug print
    
    Remove SHDEBUG line which I accidentally left in test_identifier.py
    
    Change-Id: Ic965958e28b1c825408ce5ff44ced1398663bcb0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 2f98ee47b719f5a92fefb69b056c9e786fde2fbb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jan 15 13:42:57 2013 +0100

    Don't inherit from NestedStack
    
    The NestedStack class is intended only to be the implementation of the
    AWS::CloudFormation::Stack resource type. Other resources whose internal
    implementation uses a nested stack should subclass the abstract
    StackResource class.
    
    Change-Id: Ic311c220dbf9bdf539d68f4004c8dc14752e057e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 9cc80fc737f01a61e3d1553b145ab6a432f36b54
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jan 15 13:42:56 2013 +0100

    Move abstract nested stack class to separate file
    
    The class heat.engine.resources.stack.Stack is intended to be an abstract
    class which resources that are implemented as nested stacks may inherit
    from. Rename it to StackResource and move it to the
    heat.engine.stack_resource module, so that other resource modules
    (including plugins) may include it without having to also import the
    NestedStack class (which implements the AWS::CloudFormation::Stack resource
    type).
    
    Change-Id: Ie7c05ec64e1c9632c7a24d96b5d790c9e50b691f
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit aa871513c46a2ff5f19fbf51f93b0ee9e88e2681
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jan 15 13:42:56 2013 +0100

    Add a convenience method for deleting nested stacks
    
    Add a convenience method to the stack.Stack abstract resource class for
    deleting the underlying nested stack.
    
    Change-Id: Ic91b1ebb2f358e40d9e201264944924045a1b044
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 81249ef8adff849e70407f0a7ec6e36dadb1af24
Merge: b39d74f f263f55
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 16 21:18:30 2013 +0000

    Merge "Make pip-requires a little F18 friendlier"

commit b39d74feda9463d83c99d6baa5eacfc24cfc21b0
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Jan 16 08:47:14 2013 -0800

    Only delete the flavors that the script will then replace.
    
    Change-Id: I9e78a1f98c0ba8d449e127a415baac8c469389a3
    Fixes: bug #1100365

commit f263f5581a692e6da263049e4ac4f32815196e08
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Jan 15 18:46:52 2013 -0500

    Make pip-requires a little F18 friendlier
    
    This change also aligns with Nova, so should be fine.
    
    Change-Id: I4b16774e0f79d4cb7519fb831647e835f6ced57c
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 417b4c1c6310cab2e2ea5a014b969e4c095c1030
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Jan 15 13:38:21 2013 -0700

    Remove instance in ERROR state after failed create
    
    If a VM was created but resulted in a nova error, the VM would enter
    an error state and not be deleteable via heat delete.  Instead
    the VM would persist after the delete operation.
    
    Change-Id: I9135aefdf08aba9551f9290bd072906372583ed1
    Fixes: bug #1099634

commit 3c68e9f41bc42fc193704b4c0b5bce4f5ed909c3
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Jan 16 08:58:47 2013 +1300

    Remove extras dependency with a partial oslo sync.
    
    Only service.py and importutils.py have been synchronized.
    
    This change is a blocker for producing g-2 rpms
    
    Change-Id: I692a8f6c9948a7aa75a2f6db7657d6c72e09a772

commit 4c980cde140d562dc2d1051d295cfddebe849760
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 15 11:43:50 2013 +0000

    heat engine : WaitCondition FnGetAtt return correct signal data
    
    FnGetAtt for WaitCondition should return data in the format described
    in the AWS docs, currently it always returns "None"
    
    fixes bug 1097786
    
    Change-Id: Ifb8e89a58fedbab8815fe1197acb138afbc8d2a3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 21c960aca3d44ba598500aaa7b338c746adff5a9
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jan 14 16:59:03 2013 +0000

    heat engine : Implement Count property for WaitCondition
    
    The Count property of WaitCondition is currently ignored, so
    regardless of the number specified the WaitCondition resource will
    always go to CREATE_COMPLETE on the first WaitConditionHandle signal.
    This patch fixes this so the Count property is handled correctly.
    
    fixes bug 1097813
    
    Change-Id: I71348c553702c0282a8826488c953ac3c2c76e38
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d02a9319b5d6268229042f0d41a8804af1980c0e
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 11 13:43:52 2013 +0000

    heat engine : Add metadata validation to WaitConditionHandle
    
    Validate metadata before updating the WaitConditionHandle resource
    metadata, if we raise a ValueError in response to incorrectly
    formatted metadata then the CFN API will map this to a
    HeatInvalidParameterValueError, resulting in a descriptive error
    response to the malformed request
    
    Change-Id: I6fde27066e9e0eaee97b59a7fbbace09ca620b48
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 25f20dc848bbf9b1508039a48bebddcf62696512
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 11 11:08:34 2013 +0000

    heat engine : implement metadata_update per-resource
    
    Abstract updates to resource metadata so they are implemented per-resource,
    with a generic implementation which is a no-op, since currently the only
    resource which needs metadata update via the RPC API is WaitConditionHandle.
    This allows resource-specific metadata validation and update logic to be more
    easily added.
    
    ref bug 1097813
    
    Change-Id: I094e74b6cd8cb2436f05beed9629fc3c3a34e622
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 41a1c8d05f9c8a801a41002f4d8bb2b8670b12f7
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Jan 2 17:34:23 2013 +0100

    Add auth middleware for custom cloud backend
    
    Custom backends will want to provide their own authentication mechanisms
    instead of using the Keystone token or EC2-like systems we have in
    place.
    
    This adds a new middleware and paste pipeline for the custom backend
    that will skip the normal authentication and queries the backend's
    `authenticated(context)` method instead.
    
    Since the backend is connected to the Engine whereas the auth middleware
    is run in the API service (which may sit on a separate box and have no
    access to the engine config or the custom backend itself), we add a new
    RPC call that lets API verify the passed credentials.
    
    Change-Id: I2fc4a19564b1e410adb79bd9266f6b6da07dd6c9
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 714c3f9e7c2e1945e1b3a68a032d8e62b5f35cc4
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Dec 13 18:22:07 2012 +0100

    Add configurable cloud backend
    
    This allows us to use a different IaaS backend (other than OpenStack).
    OpenStack is still used by default.
    
    Change-Id: I1772d57ae583a281204edfb80fbfde220b004a9d
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit ff3fcc9e31575afa2fb82c4407937fba0846437e
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Jan 14 09:33:20 2013 +1300

    Trivial commit to make daily rpm builds work again.
    
    A trivial commit is needed so that the
    grizzly-2 tag is not on git HEAD.
    
    Change-Id: Id671f1e2f39d93e6e9caff644fd9764d9de4f38e

commit 03a5e0061e3650767ceebdcaba8fe495b1e67baa
Merge: 5fedcd1 c975a0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 8 20:02:27 2013 +0000

    Merge "heat engine : LoadBalancer resource delete nested stack"

commit 5fedcd1ce0dac22a947bd1c6d306ef58fb377145
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 8 19:21:56 2013 +0000

    heat engine : DBInstance don't pass credentials to cfn-init
    
    Don't create user/accesskey and pass them to cfn-init as resource
    metadata for internal nested stacks is not available via the cfn API
    so passing them causes an error in the engine logs (and creates some
    unnecessary keystone credentials)
    
    fixes bug 1097362
    
    Change-Id: If2fe484d834e3e5730b21a18c363a5bf5a4c45f6
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c975a0e005612133a8188fa7490f6c3ff1899027
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 8 18:47:05 2013 +0000

    heat engine : LoadBalancer resource delete nested stack
    
    Ensure LoadBalancer resource deletes the underlying nested
    stack when the owning stack is deleted - needs to inherit
    from stack.NestedStack as this implements handle_delete()
    
    fixes bug 1097394
    
    Change-Id: I2002bed361511a495cbdf38cad7b61e148a68ba2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c590b586b9f068f91fdea3b81598efa0bbe42a4a
Merge: cb8c061 69b359e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 8 18:49:58 2013 +0000

    Merge "heat engine : allow NestedStack template validation to work"

commit cb8c06195e6d4d8ce58927c91c047e2f1b9a8421
Merge: f4abb59 fc57ec5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 8 18:48:02 2013 +0000

    Merge "heat engine : ensure create thread exits on stack delete"

commit f4abb59ef0c3f6e23af2a11c5135dcef136d4631
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 8 18:10:22 2013 +0000

    heat engine : DBInstance fix so nested stack is deleted
    
    Currently the RDS DBInstance resource inherits from stack.Stack but it
    should be stack.NestedStack, which implements handle_delete whereas
    stack.Stack does not, meaning the DBInstance nested stack is never
    deleted when the owning stack gets deleted.
    
    fixes bug 1097299
    
    Change-Id: I865611d4de9ea4c3caa43c7a11a28924602a5b0d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 69b359e47daf83e0b620ae248eca3d394e9c05cf
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 8 15:47:55 2013 +0000

    heat engine : allow NestedStack template validation to work
    
    Nested stack templates (e.g WordPress_Composed_Instances.template)
    will currently fail validation because FnGetAtt attempts to get
    outputs for a stack which doesn't yet exist.  So add a fallback which
    returns a string "None" for Outputs.* which will allow template
    validation to succeed, and will still return the actual output when
    the nested stack has actually been created.
    
    fixes bug 1097290
    
    Change-Id: Ic3f48cfc2f047c104946d6dde533143d0d91a32c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit fc57ec50dbbdad5b3916e5bd385c59601d2a5793
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jan 8 14:37:23 2013 +0000

    heat engine : ensure create thread exits on stack delete
    
    Detect GreenletExit exception when creating resources - this may
    happen if the stack gets deleted while the stack is still in
    CREATE_IN_PROGRESS state.  If we don't detect this then the stack
    continues trying to create resources during/after the stack has been
    deleted, with predictably nasty results..
    
    fixes bug 1096150
    
    Change-Id: Ieb6ed38d0000cd6fe3bc1af2eb5d2e5eecc74fb4
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 93c3d93ec481d81e97d4b120384b5e1d93ca6532
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Jan 7 12:36:20 2013 -0500

    Handle different cloud-init versions gracefully
    
    Change loguserdata script to python to allow easy detection of which
    version of cloud-init installed. Some logging was added to
    part-handler.
    
    Took out injecting the command to touch provision-finished in the user
    data. This is now handled in loguserdata.py.
    
    Note that up until cloud-init version 0.6.0, the user data is not
    passed to part-handler. This behavior is why it's not possible to log
    the provisioning process with older versions. (Technically could rely
    on the redirection support added post 0.6.0, but having a separate
    file just for provisioning seems beneficial.)
    
    fixes bug 1072921
    
    Change-Id: I9005a21bfb74f27208f9195a6e10e1d2b474e91f
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 0d683a1fff194f824af086d2b61a26a083eb2cf4
Merge: b82cd9f c357666
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 7 16:17:32 2013 +0000

    Merge "heat engine : map DBInstance DBSecurityGroups parameter correctly"

commit b82cd9fddac9b43879e4ac520381f97d31eb4854
Merge: cdbe947 594cf4d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 7 16:17:26 2013 +0000

    Merge "heat tests : remove unused get_sftp_client()"

commit cdbe94738d41c1689bb84b635c00c04afa24c97c
Merge: 31cfadd 57a75dd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 7 16:16:09 2013 +0000

    Merge "heat tests : remove pointless get_ssh_client"

commit 31cfadd9448e5f10bf6b38b55bb89de337c2018b
Merge: 0cda624 ce1eae5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 7 16:16:07 2013 +0000

    Merge "heat tests : functional tests align eip output with Folsom"

commit 0cda62441f6fd85e6e4bc4b16f44a88591b0aa39
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Jan 7 14:42:34 2013 +0100

    Add missing files to generated tarballs
    
    Fix MANIFEST.in so that all files in the repository are included
    in the generated tarballs. Fixes bug 1096068.
    
    Change-Id: I7ec7e2fcf6951357b58469539a5d552b8df66408

commit 594cf4d33c0afaade12bd623b5bafec160182b50
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 4 15:23:30 2013 +0000

    heat tests : remove unused get_sftp_client()
    
    get_sftp_client is not needed so remove it
    
    Change-Id: I9fb0670730e808c1f2786866ad3451f8e9f38789
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 57a75dddff5a2c8cac3efd2fae507c85e022b9fc
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 4 15:20:43 2013 +0000

    heat tests : remove pointless get_ssh_client
    
    get_ssh_client() doesn't actually do anything, so just reference the
    attribute directly
    
    Change-Id: I6a88b09953a7ca5a0e2675ac1c2c5a99b8cf724a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c357666d74528a19e767b4f3cc6e48e6328c5c2c
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 4 17:21:53 2013 +0000

    heat engine : map DBInstance DBSecurityGroups parameter correctly
    
    The DBInstance nested stack template defines a DBSecurityGroups list parameter,
    which should be "CommaDelimitedList" type, curently it's a "List" type which
    breaks when the template is parsed.  To make this work we also have to mangle
    the property (passed in the top level template) format to match the parameter
    format, because in AWS Lists are not represented in the same way for Properties and
    Parameters (sigh..)
    
    fixes bug 1096099
    
    Change-Id: Ie078d61847d89ea9dcd55f798b808e595c2d2e12
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ce1eae500b446868b80d5d9ab0b2a4b9cd5f0b26
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jan 4 15:18:47 2013 +0000

    heat tests : functional tests align eip output with Folsom
    
    Folsom novaclient floating_ips.list() returns the instance ID as
    instance_id not resource_id
    
    Change-Id: Ie958ada0984f9927cd490f01bd4db3102c53090a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit a5a6ad5a54b6a4d05146051750b193df12da7cdb
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Jan 4 10:48:35 2013 +1300

    Turn off tag_date on branch master
    
    rpmbuild actually requires no date tag in the version.
    
    Change-Id: I8bffff1924b4bc43324346f799d866fcc0f51a55

commit 4c553cdd8476bdd331ac05aca4e0241559bd24a7
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jan 3 16:50:13 2013 +0000

    heat tests : CFN_API functional tests NoEcho Parameters fix
    
    NoEcho is now implemented in the engine for parameters, so we
    need to change the expected ParameterValues to '******' to match
    the API response for the NoEcho==True parameters
    
    Change-Id: I4f50633dc5358e8779bfbaf03dda2f7fe1b7d452
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 1ce6105b3c1cf7ecd911682e874519c1eab85166
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jan 3 14:36:53 2013 +0000

    heat tests : functional tests remove erroneous finally clause
    
    Some tests have had a finally clause added which means they delete the
    stack before doing any tests, even when it is created successfully.  Doh!
    
    Change-Id: I7cefd313b9f810067304fe19f58a038226555b86
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 23d2a61153ba7cc4c698fb3719bff2b08febc068
Merge: a71684e 896f0ae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 3 07:34:53 2013 +0000

    Merge "On master branch, tag tarballs as dev snapshots"

commit a71684e5ef42e89a6341271ce9b5b45f7e52bb2e
Merge: bcea968 d43c331
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 3 07:34:17 2013 +0000

    Merge "Use correct stack_id arg name for metadata_update()"

commit bcea9686f2fce0f33551a2ffdc1b374f902edd6b
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jan 2 18:17:48 2013 +0000

    heat tests : convert stack ID to uuid format
    
    The functional tests still have the old non-uuid format so the regex needs
    changing to match the new uuid4 format
    
    Change-Id: Ic1c1026bc2a11ef108f0d33b14bbead7872836f4
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 0ca356abab47632fbc85edda8fd6af8b70332fb5
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jan 2 17:37:38 2013 +0000

    heat tests : functional tests poll_glance cleanup
    
    There's no point passing self.glanceclient into poll_glance()
    when we can just reference it directly
    
    Change-Id: I8ee873f544f847ca9f203ad9da06244597cdff7a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 1b69bfa039542a9276866795dcf4772d5c245747
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jan 2 17:19:17 2013 +0000

    heat tests : convert functional tests to folsom glanceclient
    
    Convert functional tests to work with folsom glanceclient, also
    remove the conditional essex/folsom module import since this will
    no longer work on essex (this was bogus anyway since this code can
    never have worked on folsom)
    
    Note : this breaks compatibility with essex for the functional tests, so
    any platform running them must be running >= Folsom from now on.
    
    (The essex/folsom glance client interfaces are too different to make it worth
    supporting both for the functional tests, ref heat-jeos..)
    
    Change-Id: I4463bfab7f8acf93b2eafa4bb702bf86d8c78652
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d43c331fe6dd24b4807022b41d2e99dfd3442bc7
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Dec 28 13:23:51 2012 +1300

    Use correct stack_id arg name for metadata_update()
    
    Change-Id: I5e4554aa7670d505f45b1512b7135276079b3918

commit 896f0aee516efd52011b8c043683356f25245790
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 24 10:37:48 2012 +1300

    On master branch, tag tarballs as dev snapshots
    
    Change-Id: Ia0bdad7fdff2a8d0d27b1e703ff20a2a89a102cc

commit 61be8e1ea40ccb2696fba1bf1524d3678bb40f3c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 20 13:31:14 2012 +0100

    RPC API: Simplify describe_stack_resources call
    
    Remove the part with the physical_resource_id, which can now be done
    through the find_physical_resource call.
    
    Change-Id: Idff625014121aaa6ff3697b36fe38facaf54a499
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b8f8167ff98bb2a4fabd84c5ae6f67b589600ec4
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 21 13:47:28 2012 +0100

    Use the new find_physical_resource RPC call
    
    Change-Id: I79890f897912dd75acb6561598bb34862f09a534
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 748391ba2c4647de9a02ca485516fc6033997c98
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 21 17:25:26 2012 +0100

    RPC API: Add a separate find_physical_resource call
    
    The logic for this is currently mixed up with describe_stack_resources.
    
    Change-Id: I14dadfc3ae6cde337dfb1bdee011cb7b32e5e4d9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit bcaed3f7439fc8c9504f2333f3b253c14d5e32dc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 21 17:47:10 2012 +0100

    CFN API: Fix DescribeStackResources with physical ID
    
    DescribeStackResources failed when called with a physical resource ID
    instead of a stack name. Also add a unit test to alert us to any future
    breakage.
    
    Change-Id: I931cd0f74fa225253b06195609ec233ef86353c3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 244d8a21f887913d19b8b92530767d4695d1e224
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 21 17:25:25 2012 +0100

    Handle duplicate physical resources IDs
    
    Because the unit tests create multiple stacks in different tenants with the
    same physical resource ID, the database lookup code must change to
    accomodate this.
    
    This enables us to add a unit test for the describe_stack_resources RPC
    API call for the case where we pass a physical resource ID to lookup.
    
    Change-Id: Id37b15bee595ba10f207235a3ff59526e4423be6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 8bad76c00e3a9a9c5d5fb8a8cd4b50b91f2e16aa
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 21 17:25:25 2012 +0100

    RPC API: Clean up list_events results
    
    Just return a list, rather than wrapping it in an object. The client API
    processes can (and do) do whatever wrapping they need.
    
    Change-Id: Ia77facbc7577ec96d1fa0e6e2784f4e5cff68614
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit ee208680d8924e78dad4e6b5f9e287a31b5940f3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 21 17:25:25 2012 +0100

    RPC API: Clean up list_stacks results
    
    Just return a list, rather than wrapping it in an object. The client API
    processes can (and do) do whatever wrapping they need.
    
    Change-Id: I4a8e64e8e4a0f127e8fa5c12738353a1f3a0c22f
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 1e88faa414da77e2726b22ff0b0892e91a5a85d1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 21 17:25:25 2012 +0100

    RPC API: Clean up show_stack results
    
    Just return a list, rather than wrapping it in an object. The client API
    processes can (and do) do whatever wrapping they need.
    
    Change-Id: Ibb9955a9c3fc25b88cf3914f2a3ea7cedaf2aa9b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 353160f37182da3852206d9b26383442e1c21ec5
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Dec 20 17:36:14 2012 -0500

    Include new doc directory
    
    Change-Id: If5041669717aaa9287bff315b9b6e4f9db7b374f
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 06ed997784469e8c4a571f8cbd5174346a6b05d9
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Dec 20 15:37:29 2012 +0000

    run_tests.sh fixup venv/novenv logic
    
    The section which prompts y/n for creating a new venv can never be
    reached with any combination of CLI options (since always_venv=0 and
    never_venv=0 can never happen simultaneously)
    
    This actually makes the --no-virtual-env option pointless, so we may
    as well remove it and explicitly set it as the default (it was anyway
    previously but by virtue of the never_venv option being undefined)
    
    Change-Id: I3c803533fda55a6814b7536b5c1328312acd3d57
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit e098963e8617d32909795c9b389dee848b637636
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Dec 20 11:28:53 2012 +0000

    run_tests.sh cosmetic, make if/then style consistent
    
    I introduced an inconsistent style with the pep8 check patch, so fixing this up here
    
    Change-Id: I9a1a612172e493e0d2476c7f6613bbb9b9de2878
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ad24068745b82c66946f231f8832ac426302f13c
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Dec 20 11:24:12 2012 +0000

    run_tests.sh cosmetic cleanup indents
    
    fix indents so it's consistent ts=4
    
    Change-Id: I6fb2e7b3670bba00ad45d76d2dbb6b56c25281ff
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f9cf2d751958264f9b7e5c861859e6be7da372f5
Merge: 760a187 58a1fde
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 20 10:59:49 2012 +0000

    Merge "Avoid logging.getChild for python2.6 compatibility"

commit 760a187640ddf1ee6aab41614d7232702eb65a78
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 19 17:27:49 2012 +0000

    update tox.ini to pep8 latest (1.3.4)
    
    Most of the core projects are currently 1.3.3, but since 1.3.4 is
    the current latest it seemed best to align with the latest.A
    Also add a check to run_tests.sh to ensure peoples local tests align
    with the new gate version
    
    fixes bug 1092057
    
    Change-Id: I16dc7e51536781f7a14b7954c24b1aa078b37fa8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 7ebef0b9dcbe815c61e30ecf0a51f0706e11b76b
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 19 17:23:05 2012 +0000

    heat cleanups to align unit tests with pep8 1.3.4
    
    Lots of (mostly whitespace) cleanups to align all the unit test code
    with pep8 v1.3.4
    
    ref bug 1092057
    
    Change-Id: I5c847f20b3516af3dd3d7211b0fc697c59bf914c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 1a4decc02fc2a45e6fdff2c9ce01b9a298b12ed5
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 19 13:45:21 2012 +0000

    heat cleanups to align functional tests with pep8 1.3.4
    
    Lots of (mostly whitespace) cleanups to align all the functional test code
    with pep8 v1.3.4
    
    ref bug 1092057
    
    Change-Id: Ifd6ef02bf3abd0b2f351f63423ab8aa7ff0cbd7c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c1bf924c0f2f18e775d0d75b56b7447410c1eea4
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 19 13:13:30 2012 +0000

    heat cleanups to align with pep8 1.3.4
    
    Lots of (mostly whitespace) cleanups to align all the non-test code with
    pep8 v1.3.4
    
    ref bug 1092057
    
    Change-Id: I444b288444dba4ec1da5854bd276d091c06d8489
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 8936c971722b80c5c39bd689774fece7506aeb29
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 18:48:26 2012 +0100

    Fix DescribeStacks command for all stacks
    
    Fixes: bug 1092196
    
    Change-Id: I05065c08b4072a9c179ebfb36fb15f062de3f06e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a9c0547673a686360d7f7504ce92f56bb6337b1f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 18:48:25 2012 +0100

    ReST API: Improve format of resource_types response
    
    Wrap the list in a JSON object for consistency with other APIs, both in
    Heat and the rest of OpenStack.
    
    Change-Id: I626f1c2446416c8e869fdc7d4f3772ec6c6d191c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit aeae520f6e9c27661287b64707473d8b188ad173
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 18:48:25 2012 +0100

    Return an ARN as the Ref for nested stacks
    
    Change-Id: I32b6b952dcd29ba895fc7b22dd362352068c85bf
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 3ea38ccdb30c94068e5bb9ce39d673d78c8a7c48
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 19:31:32 2012 +0100

    Split nested stack implementation into abstract and concrete
    
    Split the Stack resource class into an abstract part from which other
    resource types inherit and a concrete implementation of the
    AWS::CloudFormation::Stack resource type.
    
    Change-Id: Ie7600b94e17ec31b55bae5c4d9501d3f0cbca97c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 58a1fde2000d998f126eaefcd279c5769cd765a7
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 19 18:01:15 2012 +0000

    Avoid logging.getChild for python2.6 compatibility
    
    Tweaking common.config setup_logging to avoid using the getChild()
    convenience function means we can run on python 2.6, as getChild was
    new in python 2.7
    
    Change-Id: I03698ad09eb16d4f1004512d27b049f22b41c22c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f0d3c6e8466d3376cd81fff97efa7e12c6d5b571
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 18:48:25 2012 +0100

    RPC API: Pass a stack identifier to metadata_update
    
    This brings it into line with all of the other RPC functions.
    
    bug 1088937
    
    Change-Id: Ia45a12d652e96fb6bb03ce90d0b5a5e2ddeeb510
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 972aad8848bbdaa44240c14b2c9c0a548af3bccc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 18:48:25 2012 +0100

    Pass correct types in RPC Client unit tests
    
    Pass an actual identity structure for the identity.
    
    Change-Id: I0930520c8329100ba27aa6db0d977dfcd8a097c1
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d5e13e945ef6136909c3bcd3072a802eae3f7df9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 18:48:25 2012 +0100

    Update links in composed templates
    
    These have changed due to the move of the project repository from the
    heat-api to openstack organisations on GitHub.
    
    Change-Id: Ib11116d7ca48e108e06d1dea9d9decd17bbf25cd
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c4777794e78e2124f788a0b321e15febe71ee077
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Dec 14 14:13:05 2012 +1300

    A new documention structure, ready for contributions
    
    Here are some skeletons for the documentation which will need to be written.
    
    doc/source
    	A Sphinx based document which will be aimed at heat developers.
        	This also contains .rst files which generate the man files
    doc/docbkx/api-ref
    	Docbook and WADL for the REST API, with the intent of moving this
    	to api-site to publish to api.openstack.org
    doc/docbkx/heat-admin
    	Docbook manual targeted at Heat admins, with the intent of moving this
            to openstack-manuals to publish to docs.openstack.org
    doc/docbkx/heat-cli
    	Docbook manual targeted at users of the Heat CLI, with the intent of
    	moving this to openstack-manuals to publish to docs.openstack.org
    
    Dude, wheres my man pages?
    docs/man
    	is deleted, now generated into doc/build/man
    
    Packaging will need to be updated to generate the man pages
    
    Change-Id: Idf2f37086b6f97df18ed57172de2f9e3d4c7706a

commit 083c0cc2b0137f1d0bf8ea03ae312489b7582933
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Dec 18 18:00:09 2012 +0000

    pip-requires PyCrypto should be >= 2.1.0
    
    We need PyCrypto>=2.1.0 for Random which is used in
    heat.common.crypt
    
    Change-Id: Ib951deaca17f972aa70a2a65f6e3ade5fb509981
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit eb7116006978fe7063601b1c6c74c04abc826e33
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon Dec 17 17:57:30 2012 -0800

    Add support for missing Instance attributes PrivateIp and PublicDnsName.
    
    Change-Id: I9d85f00a8ca687ad791be4a9fa6708df3ad67a55
    Fixes: bug #1091497

commit 6e3d20c136e7a2dda610cc663e0e443a148cb997
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 17 19:56:23 2012 +0100

    GettingStarted: Install python-pip package
    
    pip-python is not installed by default, so we need to install it in order
    to be able to use it. (An alternative would be to use easy_install, which
    is packaged as part of setuputils and therefore already present, but it
    lacks any of pip-python's package management capabilities.)
    
    Change-Id: I6a620d0864b6671348bbcf962c3c2cde06f9ed83
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 50cbd80650655338b7563966083388b564f8567c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 17 19:56:22 2012 +0100

    Fix issues with deleting a WaitCondition
    
    Previously we were ignoring the reference to the WaitConditionHandle stored
    in the database by always setting it to None on load. This meant that we
    had to try to recreate it on delete, which would fail if e.g. the
    WaitConditionHandle had already been deleted.
    
    bug 1089354
    
    Change-Id: Ibc4145348a91b455e97ba27748ff72451b0c7bce
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 31899c01ce6b42e98b0ebb95089d5944c3c4950c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 17 17:11:03 2012 +0100

    Fix importing of novaclient exceptions
    
    Broken by 3c702e38e9a51a15a8d1626b60f610c75cb1f8b7
    
    Also, use novaclient's own mechanism for selecting the correct API version;
    don't go fishing in the internals.
    
    Change-Id: I296312f185735026587ba9849343aa79177856a3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f1e1f22c902c1708616629a4b8cb6a60221ab3a8
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 17 10:51:37 2012 +0000

    tools/openstack_ubuntu fix nova-manage network create command
    
    Command for creating nova network is wrong, as tested on 12.04
    
    ref bug 1083507
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I41ae9370c42a0e9b7df4d1810e0f90f32bd87bba

commit a64fc0bc4b3a3104778efcbf5151783922172e49
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 14 22:45:07 2012 +0100

    Handle empty UserData for instance
    
    UserData is not required, so handle the case where it is not supplied (i.e.
    is None).
    
    bug 1090544
    
    Change-Id: If8bfe9ba2aafe3bb2e9de14b01c57d1ddcf9b21d
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d9105f57e1c5dc27c5cd21efa20932cdc9df37fe
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 14 11:05:59 2012 +0100

    Make resource registration conditional
    
    If client libraries are not present for Swift or Quantum, don't register
    the corresponding resource types.
    
    Change-Id: I95a42973775b7f4c1d82caa47dc0660dfe54bb21
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 19402ffe8020ff6b2567a3554e61c0a691786b3b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 14 22:23:44 2012 +0100

    Add a resource type list to the ReST API
    
    Change-Id: I09f5e9fc97ef095c7ab8def8adf4dcc79c6fcd48
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit e2a67113c261c24b975bbb093bfbf64cdc0b9f2a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 14 22:23:44 2012 +0100

    Add an RPC API to list resource types
    
    Change-Id: I0218dcebf9213887e9b7883e6bba9b6b54a6e6ad
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 3c702e38e9a51a15a8d1626b60f610c75cb1f8b7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 14 22:23:44 2012 +0100

    Standardise client imports
    
    Do all client imports once, in the clients module, using the normal
    OpenStack idiom for optional imports where appropriate.
    
    Change-Id: I1186eba21159fe20e80c1947779fd164dada5880
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 55abd364dd35d5ee466d0c7673422a4a6d533024
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 14 22:23:44 2012 +0100

    Fix ReST API documentation for template validation
    
    The user parameters are not used in template validation.
    
    Change-Id: Iba438b2977f8029c0f0f7e6e65e853d23e4d2b0d
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4aa39467068cb1ca0de792a27290e19111db649b
Merge: 32855ed 22c3ac8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 14 19:12:00 2012 +0000

    Merge "Add ubuntu version of tools/openstack"

commit 32855ed499d4dba05282ec3b93088eb88dc61805
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 14 09:49:31 2012 +0000

    install.sh non-root error should go to stderr
    
    The non-root error should go to stderr like the other echo output
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I1d9c51c43f9a2db0b50c4c95fc0a0e4505078c51

commit fc83066295b3a0afcee38f2dd79f8be4b0bedb6b
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 14 09:47:33 2012 +0000

    install.sh add logic detecting rabbitmq
    
    Detect rabbitmq (On Ubuntu and Fedora), and sed the config files
    with appropriate values if it looks like we're installing on a
    system with rabbitmq and not the default qpidd
    
    fixes bug 1090420
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I04a40aab00e7e13d245900aeb384d769d57c4012

commit 59dff06de4364ed1e2e332337f2bb8d3d9e494e9
Merge: afc2a57 2f4bce0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 14 17:15:00 2012 +0000

    Merge "tools/openstack fixup header formatting"

commit 2f4bce00f0172c6fcef0c9c1fd0adadc7e17e37e
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 14 16:11:02 2012 +0000

    tools/openstack fixup header formatting
    
    Current header is abbreviated, so paste in the full boilerplate
    text like in other files
    
    Change-Id: I8675f80f37ab6ea2ba2323f3f87985224883466a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 22c3ac823a92d9c8aafde2ca89958d8500d4709a
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 14 15:33:40 2012 +0000

    Add ubuntu version of tools/openstack
    
    Initial version of the tools/openstack install script to simplify install/
    testing on Ubuntu - tested on 12.04LTS (with the included Essex packages)
    12.10 testing TODO
    
    ref bug 1083507
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I450b20e18dfa3099cfd17152b5ec61cc34122665

commit afc2a57a9ddb2be6e703150f91f753e33850a631
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 14 09:44:03 2012 +0000

    install.sh simplify heat-engine.conf conditional
    
    Minor tweak to the conditional detecting heat-engine.conf to sed in the
    encryption key - this will allow rabbitmq detection to only be done in
    one place
    
    ref bug 1090420
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I9031218796a52efd350c39167ecb112048dad218

commit aaded4d3fa6b57ddbf574c19d5e7aa3bddb8853d
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Dec 13 17:25:46 2012 -0500

    Remove heat-metadata man page
    
    The binary no longer exists.
    
    Change-Id: Ib914f94d091b1388d254c53dc3a7821750266b18
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit ad93b7d5cf29916a1c7d7896995173d7fcb07ce3
Merge: cd6db6d 8ed406a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 13 18:07:41 2012 +0000

    Merge "heat_keystoneclient ec2 user fix"

commit cd6db6d4faae1bea073750dbc6a39dc8b1e772ab
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 13 16:11:54 2012 +0100

    Get rid of naked "except:" clauses in tests
    
    Change-Id: Idec15ef86ff0f9cb57b4a8c522e4f5ed63bad010
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 8d1e6e3ab5fba4d1a813c605142227a53ed211ef
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 13 15:37:25 2012 +0100

    Don't skip watchrule test on exception
    
    There are no circumstances in which failing to import the
    heat.engine.watchrule module would not be an issue.
    
    Change-Id: I6d03ed8f761a24aa69409010390289e387523813
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f531f6fb28198ce964b5281332160c18bdccbd9d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 13 15:02:29 2012 +0100

    Get rid of unused imports
    
    This cruft just tends to build up over time...
    
    Change-Id: I61fd067b431aaa57164c7ff781c9cc8bab04bd4b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b9e5bcb68993c8b51f3955ee691e1f551687da1e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 13 15:57:59 2012 +0100

    Get rid of nose.main() in unit test files
    
    This doesn't actually work and is not universally present, so get rid of
    it. Tests are run through "nosetests", which does actually work.
    
    Change-Id: Ib2d1e857e0aef4eab5fd75ffb1a498d8e9186c01
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 8ed406aac973d9fdbc1c22385d084680d5bc9f86
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 12 17:06:55 2012 +0000

    heat_keystoneclient ec2 user fix
    
    Fix bug where we incorrectly use the request context user_id,
    instead of the user_id associated with the resource calling
    get_ec2_keypair()
    
    fixes bug 1089035
    
    Change-Id: Ibb5e6d11461fb3ff1dd743066a9f7de3ee65b445
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4fc1f27f120d86a1a7872ba07d5b61dcaeab535c
Merge: 5ef68bb 9ceadd6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 13 12:59:34 2012 +0000

    Merge "heat cfn api, format waitcondition error responses correctly"

commit 5ef68bbc45fccc597679f3a05883947a44323c85
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 13 11:20:33 2012 +0100

    Move the cfn client code to a subpackage
    
    This will make packaging easier.
    
    Change-Id: I8e0f0a3d85bdf073a3b3272f920ad60f27e929e3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 9ceadd6730d09707347b077385a36253a94ff258
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 12 15:01:54 2012 +0000

    heat cfn api, format waitcondition error responses correctly
    
    Return errors from the waitcondition part of the CFN API in a similar
    format to other CFN API responses, by catching engine errors and mapping
    the error to an appropriate HeatAPIException.
    
    fixes bug 1089032
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I40486ed53fd4968519f623a3ea5a96f6c3374ea5

commit 772818102cc815186ed44bfb2f78ca6c36266fbf
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 12 14:59:02 2012 +0000

    Override events for AutoScalingGroup instances
    
    Override state-transition events by subclassing the Instance
    resource to AutoScalingGroupInstance, this avoids problems where
    events can't lookup the resource via parser.Stack (since these
    resources aren't "real" resources defined in the template)
    
    fixes bug 1089338
    
    Change-Id: Ia064cd067eefdaa5ca81b0cb822ce2fa443bac85
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 355f03eec21883935f47232b3e00a5cf1de1680b
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 12 14:57:11 2012 +0000

    resource state_set, abstract update/store logic
    
    Abstract the DB update/store logic so the state_set function
    can be more cleanly overridden for AutoScalingGroupInstance
    
    ref bug 1089338
    
    Change-Id: I02dc52068feaeed8ec8210269d9abb7b124f0a19
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4594c44aae197756de4135b6fe6efa39a9a04084
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 12 12:06:56 2012 +0100

    Don't allow identifiers with slashes
    
    Ensure that creating an Identifier with a slash in either the stack name or
    the resource name results in an immediate exception.
    
    Change-Id: I79121a26009b5b7b3eee994f98ba802b239f5f12
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a560d1e206b87ac9d5e51a266dd6327cabe4f2cb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 12 13:47:33 2012 +0100

    Don't allow slashes in Stack or Resource names
    
    There is no way for the ReST API to handle Stack or Resource names that
    contain slashes since WSGI decodes the path before passing it to the
    application, such that even correctly url-encoded slashes are
    indistinguishable from path separators. Therefore, prohibit slashes in
    Stack and Resource names.
    
    bug 1088928
    
    Change-Id: Ie6fa5a1bc7b5ae7054300419644008c5cc42187e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 67fe6165b821c5b9e85a6ec7ac8380dc95859204
Merge: 310204c 60ca97d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 12 08:27:53 2012 +0000

    Merge "Fix race condition in list_stacks"

commit 310204c816c0b4e8aa619d63a38201bb3e03a0fc
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Dec 12 14:48:17 2012 +1300

    Move resolved template comparison to stack update
    
    This partially reverts the following commit
    https://review.openstack.org/#/c/17563/3
    
    Resource comparison is now done as per Zane's last comment in that review.
    
    Change-Id: I1663d262b79603ab86bc5bdb4f2ee75e87c0075e

commit 60ca97d3918a428a5a852e658e93a8c834fd366c
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 10 16:18:26 2012 +1300

    Fix race condition in list_stacks
    
    A stack may be deleted between querying the stacks to list and formatting
    each stack.
    
    This issue was found by concurrently creating and deleting 100 stacks
    while running heat list.
    
    Change-Id: I4a47bbdbde111454672c2579caf28b4675c3cf10

commit f7ebdd863b3fae58ecd810955ffe0aac50189c79
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Dec 11 20:23:36 2012 +0100

    Get rid of glanceclient dependency
    
    We're not actually using it anywhere, and its keystoneclient version
    requirements are causing us not to be able to install. Move it instead to
    the test-requires, since the functional tests are still actually using it.
    
    Change-Id: I74e68ddb4b65235b6c192c619e9e8e85e30beab9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0d10276c911a9f391dd7414de1b238f116c39bba
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Dec 4 16:33:51 2012 +0000

    heat engine : convert WaitConditionHandle URL to ARN format
    
    Convert the WaitConditionHandle URL format to use the ARN format,
    the resulting URL will be similar to the AWS format
    
    fixes bug 1087799
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I04b1f6cd913c54c9f4fa82cc1e76be22a19fe2ea

commit b3d3983bf10e8f9ed73903240460b4e2b03857b1
Merge: 1c95bb5 be33b33
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 11 14:37:28 2012 +0000

    Merge "heat : Add HeatIdentifier from_url function"

commit be33b3364cff9cc3211d93f1575be13f36172c0e
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Dec 4 16:33:13 2012 +0000

    heat : Add HeatIdentifier from_url function
    
    Add method to create a HeatIdentifier from a URL containing an ARN
    
    ref bug 1087799
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: Ie325de9105e85dbf9fd12be5e7b8c3d055e77795

commit 1c95bb5ee20d65c96b754219b76e4c54321928b4
Merge: ed7136d f24a2c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 22:09:13 2012 +0000

    Merge "Eventlet monkey-patch heat-api-cloudwatch."

commit ed7136da9f1d4a2514d182c80869d007202b1a56
Merge: bc70c02 110f8be
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 22:06:49 2012 +0000

    Merge "Eventlet monkey-patch heat-api-cfn"

commit bc70c021564ba31bc33e00ab1cffcdb33270557b
Merge: 6b33a39 c4e73f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 22:05:58 2012 +0000

    Merge "Eventlet monkey-patch heat-api"

commit 6b33a39c72e9b24d30c76142d180c96e2ce459dc
Merge: bd56aa5 8bd7e0a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 21:43:21 2012 +0000

    Merge "Add test to simply run a few binaries"

commit f24a2c27c59b78b3c7f5fded9f73e15b6e607fe9
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 10 15:19:53 2012 +1300

    Eventlet monkey-patch heat-api-cloudwatch.
    
    Tested by getting responses from cloudwatch, but not with a full
    end-to-end cloudwatch validation
    Change-Id: I2d81adc8e63b9be7dec02083509ab706ae0c5a7f

commit 110f8bea28aa4eca9e9dc2f1bd462e9ae6764fb0
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 10 15:19:20 2012 +1300

    Eventlet monkey-patch heat-api-cfn
    
    Tested by running bin/heat-cfn commands
    Change-Id: I158a0d8d9b545191001ecdabfa9f331cf937bf4e

commit c4e73f1f559a79567e94435830bcc77ac34eca54
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 10 15:07:40 2012 +1300

    Eventlet monkey-patch heat-api
    
    I have a stress test which uses python-heatclient to create
    an empty template, list the stacks, and delete the created stack.
    
    Running 100 of these jobs concurrently takes 64 seconds without this patch,
    and 17 seconds with it.
    
    Change-Id: I8963da477aa8fcec724e2e5afcd5ec92ff5b07d1

commit bd56aa58cc67b86440d9bed05c880641afce3108
Merge: 46aac23 7abb73f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 18:38:37 2012 +0000

    Merge "Don't pass -1 as a stack_id in unit tests"

commit 46aac2380eef8011e26b7b88d276305d1a663c7e
Merge: 6f74587 c0a9518
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 18:33:46 2012 +0000

    Merge "Make Volume tests independent"

commit 6f74587b956045c2faf4267560573c132374e507
Merge: 0e90ed6 53d4e6a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 18:29:30 2012 +0000

    Merge "Clean up the volume test"

commit 0e90ed6366952535417c4f84364719d0932d73de
Merge: 65b02b2 a057d58
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 18:26:48 2012 +0000

    Merge "Fix Instance unit tests"

commit 65b02b2b3dee01c3022d0fd9bd849a7a9f621222
Merge: 4510ecc 10d23ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 17:08:12 2012 +0000

    Merge "Switch over missed file in version switch"

commit 8bd7e0a8f1b3bd69faf454dd8a779fd5b4d4acbd
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Dec 7 23:18:31 2012 -0500

    Add test to simply run a few binaries
    
    This is not really a unit test, but it's so fast that I think it could
    be considered as such. And it would be nice to gate on such blatant
    breakage.
    
    Change-Id: I8ff4ca27a912c30bd962168418ac44217ea9e54d
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 10d23ef1d7babe7b3571c3ee3f953c71bba40144
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Dec 10 11:45:28 2012 -0500

    Switch over missed file in version switch
    
    Bug 1078480
    
    Change-Id: Ic196086467c68bfe718ba6845711da172b237688
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 7abb73f36b663818ffb1291f6e6912106377ed79
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 10 14:47:17 2012 +0100

    Don't pass -1 as a stack_id in unit tests
    
    We now use UUIDs as stack IDs, but in most cases even that is not
    necessary.
    
    Change-Id: I0ef4efb5c3289c6c3d0fd3d0232118c0e906f8b5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c0a95188a181df75608949729e27e679b83a5272
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 10 17:03:14 2012 +0100

    Make Volume tests independent
    
    Previously, the VolumeAttachment tests relied on stuff left in the database
    by the Volume tests.
    
    Change-Id: I8ff63cb6dac0968e63a83fb5c2f78e2a9024dd7c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 53d4e6a936f35f9a37bd9687712b89a7d5383079
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 10 15:24:34 2012 +0100

    Clean up the volume test
    
    Various renaming/reformatting done while debugging an issue of the tests
    not being independent.
    
    Change-Id: I65f2f6ba2f5af2f5a233ea15faa62a7e087e2bd1
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a057d58c84e12ca33277dea21e7915fdb468460e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 10 14:36:51 2012 +0100

    Fix Instance unit tests
    
    These were all kinds of broken.
    
    Change-Id: Ib219886f5d8e0fea3ee9c71a78b6c7603d1adc98
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4510eccddc5fbb7fef16a4702112545346d171f3
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Dec 7 16:56:49 2012 -0500

    Add back catch_error which is used for CLI errors
    
    Change-Id: Ib8b975d22950d5ba6aa9d5f150403a64356a8aa3
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit ba5957d0cf28f77d137ac444f0bae918fd084a78
Merge: 3a03a51 4e99d4d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 8 02:48:47 2012 +0000

    Merge "Switch to openstack style versioning"

commit 3a03a51df7ea29893ee3a7968c2f8804e358c5a1
Merge: 4259970 14d8a7a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 8 02:46:52 2012 +0000

    Merge "heat-db-setup read engine config file for DB connection details"

commit 4e99d4d0bb4ed4dc6bea9330a63ab53975b3ebf6
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Dec 6 17:15:05 2012 -0500

    Switch to openstack style versioning
    
    Bug 1078480
    
    Change-Id: I32471acc16e7ca6f60672474c9bf70537ba76fd2
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 42599700a75b1b6b4d65707209a08df3ef35b73d
Merge: 4867bd9 ca22f0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 8 01:48:47 2012 +0000

    Merge "Update openstack-common to get newly fixed version.py"

commit ca22f0e44323c511866cf45006cbc8095433444a
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Dec 5 16:44:08 2012 -0500

    Update openstack-common to get newly fixed version.py
    
    Now at oslo-incubator version ea7ced276d2f080718cd89f3a77378cdf24fabf5
    
    Bug 1078480
    
    Change-Id: I0569a1c0b8af42ceb768095d4b852b557b238e61
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 14d8a7a19f89bbafe9a5017dbb581051708ce58a
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 7 17:16:04 2012 +0000

    heat-db-setup read engine config file for DB connection details
    
    Currently heat-db-setup, or rather the underlying python -m heat.db.sqlalchemy.manage
    has a hard-coded database connection URL, so DB setup will fail if a non-default
    configuration exists in /etc/heat/heat-engine.conf.
    
    This attempts to read the sql_connection from the DEFAULT section of heat-engine.conf
    falling back to the old default string on failure.
    
    bug/1087741
    
    Change-Id: Ieb41503a58ee0804d79a32a8286268803c9f456c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4867bd965891e5e58877422211420815428295ca
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 17:40:26 2012 +0100

    Don't get nested stacks by name
    
    Don't return nested stacks from stack_get_by_name(). This prevented the
    user creating a stack with the same name as a nested stack, and was a
    temporary workaround for the metadata server (see
    be3c066ab87cc6e1a2ca8c097eeccd9217d7329a)
    
    bug 1072954
    
    Change-Id: I1e3d0289476377f5b4169835119052f4fa573f86
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0b19eea189e1eddbf1e72a8935dc7a4c42b1deeb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 17:12:41 2012 +0100

    Fix exception handling in AccessKey fetching
    
    bug 1087527
    
    Change-Id: I3de5b27e927ac18aa91f124cd5ef0333c1a83fe2
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0c8416537bb26e975b340ae75a0388cf8c0cd712
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 15:38:51 2012 +0100

    Move utils.py to a more appropriate location
    
    It's only used by the database code.
    
    Change-Id: Icd81fdb950b84bcbd365dd80f701a4992f695ea7
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d7437715af4a7b440ab9760e2eb089f4150d5819
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 15:36:54 2012 +0100

    Get rid of leftover heat-jeos code in utils
    
    This code, including the Glance client dependency, was left over from when
    what is now heat-jeos was part of the heat codebase.
    
    Change-Id: I35081fb7911ad1ea3284cbb6e3f83dd8c6a1807f
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b06b42455e5440773f9ef24d9cb8d925361766e7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 15:27:58 2012 +0100

    Get rid of pointless cloudformation.py file
    
    Change-Id: Ib75cf51903029f7ba38a48acb62eb35d3ccbb763
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c83783b414f93c59961f4cff59964b8b8a459ce3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 15:04:15 2012 +0100

    Get rid of the cfn_helper tests
    
    The code this was testing doesn't even exist any more, so we will always be
    skipping it.
    
    Change-Id: Iac8352094e82ce168e621dc8b9a5833247aa5275
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 019149c06ee602c667677f782ea13a8b56047473
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 15:04:15 2012 +0100

    Enable VPC unit tests
    
    We don't need quantumclient because the tests use a fake client anyway, so
    don't skip the test if it is not installed.
    
    Change-Id: I7cd2447b5a68072d2b43228ab85c53d0124496e5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 705469b5a5a307e48817cae99f5c69e1e977b4f3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 14:55:21 2012 +0100

    Enable Quantum unit tests
    
    We don't need quantumclient because the tests use a fake client anyway, so
    don't skip the test if it is not installed.
    
    Change-Id: Ib350dca6eb8ea27c8b1980eba15b3c9c48738d87
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit ab22396cb3a5b317b58cca8938e1d06baeca2edb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 12:22:53 2012 +0100

    Get rid of naked except: clauses
    
    The only time it is legitimate to catch all exceptions is when the
    exception is rethrown.
    
    Change-Id: If72243d7a2c73b42de01d2a59514ead76c20d034
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 07dce8c41e96b8e91a9d81fdef18bbeb648cf41a
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 7 10:20:36 2012 +0000

    heat : Update getting started wiki links
    
    Getting started wiki links need to point to the new wiki
    location on wiki.openstack.org
    
    Change-Id: I2a0e711fc59dcee303b787662dd9ddef0bf344b7
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 10118dd356cbeda524c0f36ff3e7375fad1520ad
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 7 09:48:51 2012 +0000

    heat : Clarify openstack versions for Fedora releases
    
    Update getting started to clarify which versions of openstack are
    expected to work with each Fedora version - I tested F18 alpha and
    things worked OK, so now F18 is beta things should work on F18, and
    I've been running F17+folsom preview for quite a while with no problem
    
    Change-Id: I0610e69ec22ca399cec21bc67f72dc10cb6c4597
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 592f0f3b9964db27705e72febddb4aac5e9e7d0c
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 7 09:39:07 2012 +0000

    heat : Update repositiory in getting started guide
    
    Getting started still points to the old github location
    
    Change-Id: I6437285b0a095e4e0ef25ca065c396a5517192b6
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 51f55baf971b8d7cd8077e09a3d34470f1aab8b5
Merge: 7e73e2b ac534da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 7 03:08:28 2012 +0000

    Merge "Add version.py from openstack-common"

commit ac534daf02499e4b6232919972b8210e116f2b92
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Dec 3 17:30:48 2012 -0500

    Add version.py from openstack-common
    
    Bug 1078480
    
    Change-Id: Ia5d4ff63db2907271b8f0ec7fec76ca4cad257d2
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 7e73e2bd41b2fb6c87ab8f699548dfdf62c4abe8
Merge: f696b79 97b898b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 6 22:52:25 2012 +0000

    Merge "Update openstack-common"

commit f696b795115f3035cf7ad962697a67ac5a1edf69
Merge: 105ea22 621175e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 6 22:43:33 2012 +0000

    Merge "Do not wrap exceptions during quantum resource delete"

commit 621175e38ba170e499a621a850ef127f6bc39d17
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Dec 7 11:33:16 2012 +1300

    Do not wrap exceptions during quantum resource delete
    
    The stack should go into the DELETE_FAILED state, and a delete
    is attempted on all resources regardless of failures.
    
    Change-Id: Ib707c8112d9053a8627c733f4323f514d30628e9

commit 97b898b6c7820da9df424b2cef27539139b9514f
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Dec 3 17:31:40 2012 -0500

    Update openstack-common
    
    Now at oslo-incubator version e2fdbd38da576edfd40aeac3956eb48ae1d0e08a
    
    Change-Id: Ie0360fc666718c809cddeb9904af35c929dededd
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 105ea22295c3b547e9a7122a7d0e72cd97de342e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 6 20:12:06 2012 +0100

    Use common implementation for fetching templates
    
    bug 1072908
    
    Change-Id: Idad06e8c28cbaed121604bb0de5f79edfacb1efb
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d7568d08b23488e9651b4fe1fc57815348c4f45c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 6 19:35:05 2012 +0100

    Add a common implementation for fetching a URL
    
    There are multiple implementations of fetching a template from a URL, so
    add a common one where changes can be shared.
    
    Change-Id: I9c834efa71f97360dafb741e26713e3f3c124b6f
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 28ea091448efaeb26839845e4655f5fdd6ff8833
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 6 20:15:27 2012 +0100

    Pass string to template_format.parse()
    
    Since template_format.parse() attempts to guess the type of the input
    instead of using yaml.parse for everything, the input must be a string and
    not a stream, even though yaml.parse() can handle either.
    
    Change-Id: I07dc13a54492f3f6db17bfca3cc9e129c765eed5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 842e6cc31da7e060aba9409a91bd46149223d61e
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Dec 6 11:53:45 2012 +1300

    Resource.__eq__ allow resources in different stacks
    
    Doing a stack update was incorrectly replacing identical resources
    because Refs in the new resource were evaluating to None in the new stack.
    
    This change allows an alternative template to be passed to parsed_template
    and modifies __eq__ to compare the two templates in the same stack.
    
    __eq__ now also checks that the name of both resources matches, since a stack
    could have multiple identical resources with different names.
    
    Change-Id: I7e09ee1238dd01490cdfe186c51b7fada9546a63

commit 8a3a8d6fe4a8680126a62f90f619da5093c937e4
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 5 11:15:42 2012 +0100

    Fix importing of quantum resources subpackage
    
    Apparently pkgutil.walk_packages(path) will return packages outside the
    given path if they have the same names as the ones inside - so having a
    quantum subpackage results in importing the global quantum package from
    Quantum itself instead. Fix this by passing a package prefix to give a
    fully qualified name.
    
    Also make sure that submodules are added as an attribute to their immediate
    parent package, not to some grandparent package with '.'s in the attribute
    name.
    
    bug 1085725
    
    Change-Id: Ie571100898a33ed4fe15d1878c7b16db4caf4fa5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 93688df4404afbf521b70700e92bb77d3259ba41
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Dec 5 14:14:48 2012 +1300

    Do the same install_requires as other projects
    
    This will pull in tools/pip-requires on devstack start
    
    Change-Id: If93319c82a5e3499391e8624582929d4f1adc9ec

commit 7e94df10bb9fbbd16b1f15eaac5df01b77630f1d
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Dec 5 13:58:22 2012 +1300

    Install extras during pip install; fixes devstack
    
    Change-Id: Ia1252d95fa7023d440b293245fe15d2c4ebfc047

commit c5e64e2e84eba6f8f796063dde6d2d9a2397478c
Merge: 64e35d4 0461e0d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 3 23:11:24 2012 +0000

    Merge "heat getting started, add pip install extras"

commit 64e35d432af48a16485231e61133311fa4518cf1
Merge: c44e852 cfa38e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 3 20:01:14 2012 +0000

    Merge "heat remove unused config options"

commit cfa38e03e8b498df645e5446050b14d5d30df857
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 3 14:53:59 2012 +0000

    heat remove unused config options
    
    Remove metadata* config options - these were actually never used by
    the metadata service, and look to be cut/paste artefacts from the
    nova codebase.
    
    Change-Id: I50b7d48bfaf82d4b1af7ad269ef329ec455c0f04
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 0461e0d41b024c50b96ccccdec5c63b751b22be8
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 3 14:43:14 2012 +0000

    heat getting started, add pip install extras
    
    Add install of extras via pip, as we now depend on it via oslo
    and it's not yet packaged for Fedora
    
    ref bug 1085970
    
    Change-Id: I08f2962e091e0bdb0c9bdc6d25f319e042f858f5
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c44e852103af82edee980e3475dbd41939ab459c
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 3 11:06:56 2012 +0000

    heat engine : remove KeystoneClient get_user_by_name
    
    Remove get_user_by_name as it's no longer used, and we want to
    avoid this style of name->id lookup because it requires keystone
    admin role.
    
    Change-Id: I234a235864ac7537df09cae2f07d99ed9d53acd2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 960a76ba4464423440c9f497bb1126b88fbd1ca8
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 3 11:04:12 2012 +0000

    heat engine : Rework AccessKey to avoid keystone user lookup
    
    Rework the mapping if AccessKey UserName property to keystone
    user_id - the recent refactor reintroduces a keystone.user.list
    call, which requires admin role, which we want to avoid or the
    in-instance user can't request their own secret key via cfn-hup
    
    ref bug 1085049
    
    Change-Id: I456dff67f56336a9052180dc3c59cea8b7a173bd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit b938070a1a5f01a7a9d7eca60d8c819910035daf
Merge: a955f61 91e7e3b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 3 04:35:45 2012 +0000

    Merge "Make sure heat uses its own control_exchange"

commit 91e7e3b141adedea01a78fa2819f2b0c7a9069bf
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 3 17:26:34 2012 +1300

    Make sure heat uses its own control_exchange
    
    Due to this recent discussion
    http://lists.openstack.org/pipermail/openstack-dev/2012-November/003578.html
    
    And the commit message in this change
    https://review.openstack.org/#/c/12518/
    
    Change-Id: Icf7ee0475045a3d0a19b8d176162bd7286a39ddc

commit a955f612c348555816887167465083cbeaf10ebe
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 3 15:14:16 2012 +1300

    Make default encryption key long enough for unit tests
    
    Change-Id: Ibef2eabfa50b56c12975222d6073a243bcb0dfef

commit 2033ee2b9e1243d14a8c2566501e2828d3e7db5d
Merge: 277118a 89bfe5e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 2 23:15:05 2012 +0000

    Merge "Update the README with more current links"

commit 89bfe5ef5e203502df39c57e7180bc6c174e6226
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Dec 3 10:08:29 2012 +1100

    Update the README with more current links
    
    Change-Id: I14cb327b75053f478b1a0bf1d463488601420390

commit 277118a794cde1271f87f5af99961e7eeb054ff6
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 20 16:27:20 2012 +1300

    Add VPC resource implementation
    
    This implements the AWS::EC2::VPC resource.
    
    Change-Id: Ib50897d692292c42b21cffb7d8f6758f2d1a5f1f

commit eaa18014339ad48dc0943ee5b4c9b5fc32fb2652
Author: Jeremy Stanley <fungi@yuggoth.org>
Date:   Sun Dec 2 17:44:24 2012 +0000

    Update .gitreview for org move.
    
    * .gitreview: The heat project moved from the heat-api org to
    openstack, so this updates the gerrit remote URL accordingly.
    
    Change-Id: I17051b17e2f319ebd3df5e415a9a9742d5b6704e

commit 7d166abe460dda339816554c8e0e677a746e79c6
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 27 16:40:31 2012 +0100

    Use pkgutil to load cloudinit data
    
    Unlike reading from the filesystem, this will allow the data to be read
    even if the package is installed as a gzipped tarball.
    
    Change-Id: I1972f2b6a1b6cee12521480ed774468bb3444780
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit aa3ab22520fafca720842b2e98e636b404c8521c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Nov 28 15:19:35 2012 +0100

    Use module names as logger names
    
    Automatically use the current module's __name__ attribute as the name for
    its logger, instead of hardcoding it or (worse) using __path__.
    
    Change-Id: Ic089e0829e5fb93c3debd21e7715ee4c95f84d4c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 8083a534fe86ccbf866ecd0be000b2b6b595c0ac
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 10:01:49 2012 +0100

    Add a plugin directory for Resources
    
    bug 1072903
    
    Change-Id: I0f218c47620d50dc52bd931ee266f4dc19d701ed
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 180df199fe33137a403763e0c1a904e3804ceb27
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 10:44:46 2012 +0100

    Automatically register engine options
    
    Register the engine options as soon as we import something from the engine
    package. This means we do not need to explicitly do it in all of the unit
    tests.
    
    Change-Id: I8fb0c8665d0e0255521e21a6aac223ad1e3b1b25
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 6f31e49f69abf891d0fba3393b01ddd9aba48a37
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 16:35:22 2012 +0100

    Move db crypto code out of the engine
    
    Move it to heat.common instead, and change the module name to better
    reflect what it does.
    
    Change-Id: I14a8cdcea8e16607f10464e07fcab3da4f01fe10
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 97135b8f608e8ff64cba5e77384ada4e9fef626c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 11:05:41 2012 +0100

    Create a new heat.rpc package
    
    The definition of the RPC API is common between the engine (server) and the
    clients, so move the client and common definitions out of the heat.engine
    package.
    
    Change-Id: I5fd2ba26f09c86ba1adecab4f9e06e69a694fe90
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit cd2fd324a044f8762613793206216cf73617c2ad
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 14:12:38 2012 +0100

    Move template-format parsing code into common
    
    This is used mostly by the API (but also the engine for composed
    templates), so it doesn't belong in the engine package.
    
    Change-Id: I79cf8cc619a6988013a58eb4d46c014c3dcac4a3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b35cc6d06e9d744134197591e890e3d0ec8af3e5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 11:38:44 2012 +0100

    Move the identifier module into heat.common
    
    It is used by both the engine and the client APIs, so it doesn't belong in
    the engine.
    
    Change-Id: I45306fd8293d1d859fde5fda9cdcf5fb0588aa2d
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 07b312329eb1fbd90ff91970d8ebbbb4a1df211b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 15:57:48 2012 +0100

    Remove gen(erate)_uuid from heat.common.utils
    
    We now use the version from openstack-common.
    
    Change-Id: I0ff86c73f2de1fa6e2455e2c59d1e5859634d1e9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 61303fb7770af94f8d56e2ad527eb0247901dd63
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 15:59:23 2012 +0100

    Remove is_uuid() from HeatIdentifier class
    
    We now use the equivalent functionality from openstack-common.
    
    Change-Id: I915cdb92b89d3548fa03e1820d8b90b2aac4e44b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c985e7996037e52894e467a6512b6c0d6ea98113
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 15:47:56 2012 +0100

    Use uuidutils from openstack-common
    
    Change-Id: I6fdd1bf59562a3dbef96da8d30c2733a801acd58
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 04fe836b82d70a9e3932debf1fbdd4af8efa4cc5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 14:56:06 2012 +0100

    Add uuidutils from openstack-common
    
    Change-Id: Ia4a8e18f9a2383c09bdd9d59af3df8c057c8d35e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b3e5647339105883d178470a7700700199c13772
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 14:54:07 2012 +0100

    Update openstack-common
    
    Now at oslo-incubator version 1fd7694e96da4c7e461d3c966fab1e81ee57c315
    
    Change-Id: If6ca594185cdaf6f2b279185cb4a4f62391aa828
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 6ae3ff0a4e8503acd6ceddbe87878c0d3cdfe9bd
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 28 15:50:41 2012 +0000

    Remove heat-metadata service
    
    Remove heat-metadata service, since the last remaining function
    (waitcondition handle notification) is now handled via the CFN
    API
    
    blueprint metsrv-remove
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: Ie36c86ce86f6c47e8d9f8accf8ec17084fb8cffd

commit 6689711bfd59a15f04802503dc596a6ff2998baf
Merge: 3eeeeba 17dd71b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 29 22:35:11 2012 +0000

    Merge "heat engine : Convert WaitConditionHandle to pre-signed URLs"

commit 3eeeebaaaa94c9bcfb9750e50e0905be842069a7
Merge: 658a839 d4bb435
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 29 22:31:18 2012 +0000

    Merge "heat engine : subclass keystone client to encapsulate common code"

commit 17dd71b01775430b8dbc5c3b2ced65a11fd647e1
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 26 11:26:00 2012 +0000

    heat engine : Convert WaitConditionHandle to pre-signed URLs
    
    Change WaitConditionHandle so it provides a pre-signed URL which
    allows authenticated wait condition notification via the CFN API
    
    blueprint metsrv-remove
    Change-Id: I5c1c3a17ade35c810e49b1f27d80bcfea9e89485
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d4bb435ed2baa143c1b9affccd958957b8c74f30
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 23 10:41:03 2012 +0000

    heat engine : subclass keystone client to encapsulate common code
    
    Encapsulate the keystone client in a heat-specific wrapper subclass
    so we can put heat-specific implementation related to keystone in
    one place.  This will allow easier reuse of common code between
    resources which need to manipulate stack users and ec2 keys
    
    blueprint metsrv-remove
    Change-Id: I3d9751023c52cb75ab5e1f62415b1db4e4361dec
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 658a839665f78dd19804917774e3d175265628bd
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 29 20:51:01 2012 +0100

    Process engine config before initialisation
    
    Don't import the heat-engine service module until the configuration options
    have been initialised. This will allow us to read the configuration during
    initialisation of the engine.
    
    Change-Id: I2bc70d903434eac1fa248640018f038c5ef2bead
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 89714b36d444e564b14640e6b4d5b82b6c0912b6
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Nov 22 17:11:15 2012 +0000

    heat api : add waitcondition to cfn api
    
    Add a new path to the CFN api, which implements CFN style waitcondition
    notification - this means we can move away from the separate heat-metadata
    service for this purpose, instead using the authenticated CFN API
    
    blueprint metsrv-remove
    Change-Id: I62cff7cb4c7a009fea2c8f62ea446d8d758f5429
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 38100845aaa27ba1a0d08553944a0bd96e9c41cf
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 29 12:50:48 2012 +0100

    Add documentation on plugin_loader module
    
    Change-Id: I55a6c90c8bacee8a3bfed297b150cf5554cfabba
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b6711c12e3dd8b7f8dbf8c654379e0d8fa8912d2
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 27 15:13:55 2012 +0100

    Lookup the class for an Instance in Autoscaling
    
    Instead of hardcoding the class for handling instances in autoscaling,
    look up the class for the AWS::EC2::Instance resource type using the same
    mechanism used for creating resources normally.
    
    Change-Id: I37b9aff9a83b89cdc782467720970a04549d7b1e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4b6f1b8ad0ce6490927d4de6d922e2ffc915fef4
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 27 16:36:50 2012 +0100

    Refactor autoscaling Instance creation
    
    Change-Id: I5d545500f1bc71222ce2c599f57d2d373990da73
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b487adbf8b52485bd804a3713235453bdbcf4cd7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 27 16:15:56 2012 +0100

    Load resources dynamically
    
    Automatically load all resources as "plugins" when importing the package
    heat.engine.resources, instead of having to list them explicitly.
    
    Change-Id: I9d11ab9a5b1dd21bc5f9c2f0aad95c035a9c9aa0
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit faca9953c0d412944a23dfbc62e5634a509c51e8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 27 15:41:57 2012 +0100

    Add a module for dynamically loading plugins
    
    Change-Id: I662b5989941b467c78a392098db0cd19ff86201c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a0cf5dfa5c7eb070ee6aefcdfb23c04ece7c0b70
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 27 15:38:44 2012 +0100

    Distribute resource mapping to individual modules
    
    Define the mapping from resource names to classes locally in each module
    and then aggregate them. This moves the mappings near the definitions, and
    provides the format for an eventual plug-in resource architecture.
    
    Change-Id: I3e70d495c5a490ae20d38bf1aec7e28080a55520
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b0026981a5855ec0a9427f7787570d4de903512d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Nov 28 14:43:40 2012 +0100

    Move the resource module out of the resources package
    
    Leave only the actual resource implementations in the heat.engine.resources
    package. This is the first step to implementing a plugin-style architecture
    for resources.
    
    Change-Id: I8a63da4f54b087ee792969678f92da8e31787a3e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 965618ac42b0b62c3c836ba02120674fe763c07d
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 27 15:23:40 2012 +1300

    Remove YAML template trailing spaces
    
    Change-Id: I36ae27a44bd9863df63bdff144f1773c774661b4

commit 9058be757fbd64267bbd9a4dfb9864a7da5857d5
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 26 13:07:51 2012 +1300

    Convert some existing templates to YAML format.
    
    This is the result of running:
    python tools/cfn-json2yaml templates/
    and then cleaning up by hand to be more consistant, readable and
    maintainable.
    
    The following templates are enforced to parse to identical stacks
    in the unit tests so any fundamental change to one must be made
    to the other.
    
    Quantum.template
    Quantum.yaml
    
    WordPress_Single_Instance.template
    WordPress_Single_Instance.yaml
    
    Change-Id: Ibe05a5c5a7a5bb1861c5f84a3dc41e2d632852fd

commit b10898a7a277cf4ca107c5641f6fde88f5ae5636
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 27 13:50:20 2012 +1300

    For Fn::Join join strings in resolve_static_data
    
    Fn::Join now has some preprocessing in resolve_static_data
    where contiguous strings are joined into a single string.
    
    This will allow equivalence tests to pass when comparing
    JSON templates to hand-tidied YAML
    
    Change-Id: I49fb2456388b3fd554ccec00920d7e84f6998183

commit 0f1a11473c37cd6253dbbca45dbc1813816e7bbc
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 27 12:48:05 2012 +1300

    Set default empty dicts for missing sections
    
    So that the YAML format can be more terse, make empty version and
    sections imply the lastest version and an empty dict for the
    section content.
    
    Change-Id: Ic8b86065534930852fff1488849dbbbbb6b85243

commit c55a2ea232a9bdca8d4d75b513772f109d0dffd0
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 26 13:52:34 2012 +1300

    Don't assume parsed JSON in REST API.
    
    This checks to see if the 'template' attribute is a dict.
    
    If not it uses format.parse_to_template to parse it.
    Change-Id: Ic9b9ef3e88a33a93d5896277cc3d4da4fd55fc25

commit f1e77c0a658bd3eaf152583f55f75e77f3533650
Merge: 549d26f 11d026d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 26 19:28:14 2012 +0000

    Merge "pip-requires fix boto version"

commit 549d26feb26ac1ffd6ecb8bfedfa4e7d4e1f4eb5
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 26 18:14:16 2012 +0000

    cfn-json2yaml file-mode bugfix
    
    file-mode wasn't working, also add missing header
    
    Change-Id: I75d15fd73de4ab3ce679ae3a274ec1c402802267
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 11d026dd95c17267ebfb0722920d356441522276
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 26 13:51:03 2012 +0000

    pip-requires fix boto version
    
    Boto version added to pip-requires is wrong - we need a version containing
    the commit discussed under https://github.com/boto/boto/pull/742, which is
    only included in boto>=2.4.0
    
    Change-Id: Iaaa61f306d4035e63ca3f7a0eafe2d5715585f16
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 87e56e36167e810ca15be825df5a5e1537934f6b
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 23 08:15:15 2012 +1300

    Utility to convert JSON template files to YAML
    
    Accepts a directory or file path.
    
    Change-Id: Icd51db5484283372a2b5fb8c681b0e88c7a9c1d5

commit 9b05e2429ff70bea4380da9d1ab2e8c8c64d00da
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 26 13:04:35 2012 +1300

    For tests, Parse all templates with parse_to_template
    
    Change-Id: Iedb6929f46dddbb888a7248034864855b5cd0205

commit 94784dd8f77bd863cc8d3f74da4e3bba55db7a05
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 26 13:01:11 2012 +1300

    Parse all templates with format.parse_to_template
    
    It can no longer be assumed that a template string is in JSON format.
    
    Change-Id: Id43b82a25e62f7c7868c1c51556c5bde94e7b132

commit f1c762b110100903121e13afc7870737161d2828
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 26 12:52:47 2012 +1300

    Module for converting JSON to YAML, and parsing both
    
    convert_json_to_yaml is a utility function used for tests and file conversion
    utilities.
    
    parse_to_template will take any string, infer the format, and parse to a
    python structure. Currently it assumes the file is JSON if it starts with '{'
    otherwise it attempts to parse it as YAML.
    
    Change-Id: If15ccdaf912693f76b74bb1fe879145af1cb36b1

commit 60531b4ca53379a7cb0124d47ce2028e3d475e94
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 26 14:34:38 2012 +1300

    Add packages and versions in response to grizzly-1
    
    - Paste is now PasteDeploy
    - boto is now an explicit requirement
    - python-glanceclient replaces removed glance client
    - added PyYAML for new YAML format
    
    Change-Id: I59e11a45f7cc77007e259e5dd1b216e691c5f116

commit 1b2a2d7d7ee5ff522f8880311cf2a7106bb1dbe2
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Nov 22 21:17:13 2012 -0800

    HAProxy example had incorrect descriptions
    
    Change-Id: Ibc14297159e6e0c0b159d214539a5030d4af573e

commit cbef4bef028df3d5868e98ae2c55e9dd88149ef0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:57 2012 +0100

    ReST API: Add Events
    
    Change-Id: I716dc2ad1c9294a7a9df27fbb77e32926b1ba307
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f454e5ac3ac593711f370faec1ace83004592311
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 14:09:56 2012 +0100

    CFN API: Rename ID formatting method
    
    It now formats event IDs as well as stack IDs.
    
    Change-Id: Iec288eec68cbbebd911a4cf5bfdad96c20dc60f0
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a5cef837fdfff5963a1c2ef5ee5fdc7367299db5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:57 2012 +0100

    RPC API: Return an identifier for events
    
    Change-Id: Iae2f08014e28997e499771ba9d89feb3954540da
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 7054f55824ec51032ef1c989b024103536028548
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:57 2012 +0100

    Use the new class for database access to Events
    
    Change-Id: I6c02cf47869aaa1d293cb1b528ed967397c47208
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 7867fe23510e170efdeb2f8644c81a09c53bf1e7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:57 2012 +0100

    Add a class to represent Events
    
    Change-Id: Ie360343a264f2348af518c8f8eb8cfa0763ad18c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 248d87801188cfcc464f8f1b4503cf3d2be18b28
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:57 2012 +0100

    Add a method for querying a resource's type
    
    Change-Id: Ie07a01668c5958494631806ffc0748f659eb8a1b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit ab71a7e0aa5665e8c34d3d6311ffd3e3d2207608
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:56 2012 +0100

    Add identifiers for Events
    
    Change-Id: I54b2d2bb56129314218f36889f0f525e88c9f146
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit fada8b3b938c5f4b8107adfeef3c8b8b0a0c4702
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:56 2012 +0100

    Improve the identifier class for Resources
    
    Enable the resource name to be retrieved from an object. Also allow a
    ResourceIdentifier to be constructed from only the data passed through the
    RPC API. This means we can use a single format for identifiers, but still
    be able to extract important information such as the stack identifier and
    resource name.
    
    Change-Id: Ie9122cb1a835b30eb8e0713a9d5cdcb4a386eda7
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 18010f923b3860a16f2da485d5ac6380badec9e0
Merge: e973659 67f4f60
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 21 19:46:31 2012 +0000

    Merge "Get db session from the context."

commit e973659c743579db093ddac7aaab778773b6cd10
Merge: ddd5a10 b1787bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 21 19:31:19 2012 +0000

    Merge "Use a real context for tests."

commit 67f4f608153048ec3cb566d63d4df7b1d7fe05e4
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Nov 22 08:15:05 2012 +1300

    Get db session from the context.
    
    The aim is to use a single sqlalchemy session for an RPC request.
    
    The context object passed to EngineAPI methods is actually an RpcContext
    which contains the same data as the RequestContext. The @request_context
    decorator turns this back into a RequestContext which can now have other
    behaviours added to it.
    
    RequestContext now has a lazy loaded session attribute.
    
    Save calls on created entities need to be passed the shared session.
    
    Change-Id: Ied4e66deaca205362b84fb698f75cc872886607d

commit b1787bd43e6c7a56523d0bc246008815fb508454
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Nov 22 08:13:33 2012 +1300

    Use a real context for tests.
    
    No more DummyContext.
    
    Change-Id: Ifbb7cea17b9fa0df90c15867712a74f4d8a5115d

commit ddd5a10f3771e0cef4c7f48faa9012a8b1d2d3f2
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 21 11:34:51 2012 +0000

    heat engine retrieve credentials every periodic task interval
    
    Avoid saving a session context, instead retrieve the DB stored
    credentials for every periodic task trigger, and create a new
    session context for each periodic event
    
    Change-Id: I24ca70b478f06be26ca6cc74385b37d1a0cf098d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ee9e31fb1fd502ed0ddee74d6f41b65a7e6ecf91
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 21 11:31:14 2012 +0000

    heat engine Add admin flag to dbapi stack_get
    
    Add a flag to the stack_get dbapi call, defaulted to False,
    which allows us to specify that the admin context is being used
    hence we don't want tenant-scoping condition applied.
    This is needed to allow the admin context to retrieve stored
    credentials per-stack (e.g for the periodic per-stack tasks)
    
    Change-Id: I55e307b7940f7da13bd169271744e80d95ea0bd9
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 66ef27527d7765c2d6b3898a11425c58ec69911c
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 20 16:24:23 2012 +1300

    Tool to download all Amazon example templates
    
    Templates are saved in templates/cloudformation-examples which is ignored
    by git.
    
    Its probably time we're exposed to a bit more template diversity.
    
    Change-Id: I667c4f08fced353201ab9234a51526bcbeb0761b

commit 879d813efc45a4c07fc99a3c53941cfb9768dd4d
Merge: 339ca7b 34c1b9c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 19 22:57:31 2012 +0000

    Merge "heat engine allow WatchRule load() from DB object"

commit 339ca7bf068900be81489f06e91624fc8b055fea
Merge: 19ac89d d89f6c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 19 22:55:30 2012 +0000

    Merge "heat engine move to per-stack periodic watch threads"

commit 19ac89dd72b225a66de0f779651ad2099a731991
Merge: cc8b423 1563f30
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 19 22:54:53 2012 +0000

    Merge "add watch_rule_get_all_by_stack dbapi call"

commit cc8b423f56ffac8e94ce47b7fd2d4bd6ea65cc35
Merge: bb8298d f96f15d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 19 22:52:49 2012 +0000

    Merge "Make CloudWatchAlarm names unique per-tenant"

commit bb8298d316fd79f867788bf9c0254e3855952d61
Merge: 1f5fac7 deffe8a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 19 22:51:58 2012 +0000

    Merge "WatchRule refer to stack by id not name"

commit 1f5fac70558d2ca440b04a88b5a1e1e9d740c504
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 19 15:18:54 2012 +1100

    r1 not defined
    
    Change-Id: Icd1135f17512248d5c212ba88add386212510641

commit ab302c9ed8be1753d1e41a593eeabee5e3fffd16
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 19 15:08:53 2012 +1100

    Remove unused statements/local assignments
    
    Change-Id: Iabc1932ef4f851567c30719de127e1165f23dd90

commit 34c1b9cc334dc3c67c773dffc188413296fde92f
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 19 22:23:24 2012 +0000

    heat engine allow WatchRule load() from DB object
    
    Allow WatchRule.load to initialize an object based on an existing
    sqlalchemy DB object, similar to parser.Stack, avoids doing two
    DB lookups when running the periodic watch tasks
    
    Change-Id: I280942b81e5fdee17acf5582e3d319045afa7914
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d89f6c0ba1c0da0bbd42e08b44cfd74e412d2143
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 19 16:55:23 2012 +0000

    heat engine move to per-stack periodic watch threads
    
    Use the stack thread groups, so a separate watch thread is started
    for each stack - this avoids some of the context scoping problems
    previously encountered since we can pass the correct context to the
    periodic task when starting it
    
    Fixes bug 1078779
    
    Change-Id: I56e6a4b126199587e91548f450956d77ab2158f3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 1563f3039f3335d53891da055dcbb2b2334a234f
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 19 16:26:12 2012 +0000

    add watch_rule_get_all_by_stack dbapi call
    
    Add option to retrieve all watch rules for a given stack, which
    will be required to move to periodic watch threads per-stack
    
    Ref bug 1078779
    
    Change-Id: I350e2ee72c7eec0b91bf85ac52bb04e3cd00b4db
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f96f15d2edb379d93c999f8d92f1d636ab87910e
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 19 15:31:01 2012 +0000

    Make CloudWatchAlarm names unique per-tenant
    
    Use physical_resource_name to ensure CloudWatchAlarm resources
    are unique per tenant
    
    Ref bug 1078779
    
    Change-Id: Id37393decd8d4f89e79af5c7e9eeb21f4e494699
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit deffe8a1679b2fd0af803de9fa3aee46d41d5d84
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 14 15:41:17 2012 +0000

    WatchRule refer to stack by id not name
    
    Rework WatchRule to refer to stacks by uuid not name, this will
    help us move to allowing non-unique stack names containing WatchRule
    resources
    
    Ref bug 1078779
    
    Change-Id: Idbbbd65a05d7036860cc2feb044d568210071d21
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 90b747061c7bf8efe624eeb7842789ac98a45709
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Nov 19 12:10:12 2012 -0500

    Provide more information with template URL error
    
    Previously a generic read error was given. Inform the user with proper
    exceptions for: the case when a resource is present but non-responsive
    and when a resource is present but the requested data could not be
    found.
    
    Fixes bug 1072951
    
    Change-Id: I35b92cea38358691015f8752e80efc6720e34e48
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 05a90503228f829f73bd1017b530a28cefa1a0d4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 19 15:05:42 2012 +1100

    Add missing logging imports
    
    Change-Id: Ide1d0a27337bfaf767cf85d59deef1752724fbcf

commit 722bb8a259762d0da4a76e5b078f0b1b266b07e7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 19 15:04:44 2012 +1100

    Use jsonutils in ec2token
    
    To get access to to_primitive()
    
    Change-Id: I9a09609b5469870a217386be9fbad9261ef0c815

commit 1e07e38d0b17a962bd78d3b63f77444927d38410
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 19 16:11:50 2012 +1100

    Remove unused imports
    
    Change-Id: I4977a34b758f3dd2b5a4772dc074af2f0c715175

commit e65020423b0607edf50cdddb0168f8ab7ecb468f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 19 12:12:35 2012 +1100

    Fix ppetit.template parameter type Integer -> Number
    
    part of bug 1072896
    Change-Id: I47011d14330f8d8015876a88529a399a1cee98b6

commit 1300ced209f7382ed476503d6d27eacf7af49625
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 16 15:50:03 2012 +0100

    RPC API: Get rid of event_create call
    
    Nothing is using this.
    
    Change-Id: Id97ce0af1e176463b92288022765f80e1b5152ed
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f844bf35119f77a56bdbc6215c961aff64440be9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Nov 14 17:51:26 2012 +0100

    ReST API: Add a convenience redirect for resources
    
    Since the path stacks/{stack_name}/{stack_id}/resources exists for each
    valid stack we can safely redirect to it from stacks/{stack_name}/resources
    without having to perform any further checks in the engine, so we may as
    well allow it.
    
    Change-Id: I0169493479f8c6840de3edad271cf98e8fd5d1da
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d892d8166cbb002effc9518793d114406ae59112
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 12 17:42:37 2012 +0100

    ReST API: Add API for Resources
    
    Change-Id: I860349d03a2d7d034c600a129aead59964930b02
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit e743158e7a61c00e2a32c340d3f268d0835f4c69
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 16 12:10:21 2012 +0100

    RPC API: Include less detail in resource list
    
    Since the stack_list_resources command could be returning data for a large
    number of resources, avoid returning the metadata and description (which
    are not needed) to save space.
    
    Change-Id: I4e3a46315952f8dd451410622de0d68423abbbf2
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 8118aebece8d141a0f675ee6302160a8a38b483a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 16 11:36:39 2012 +0100

    Refactor unit tests for ReST API
    
    This makes it easier to add tests for different controllers.
    
    Change-Id: I549295ebdd9a41ca4c184c0ff242c805399656c5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0e0189e4c8ccf12ba04cbd2460422cd28c813035
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 16 10:58:34 2012 +0100

    ReST API: Move remote error handler to utils module
    
    Change-Id: Id3b99c62c01f1c22aa39518bb0f650d41f5975f0
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4c57678486e33ee3a0f91e7f0801b5132c91141e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 12 17:42:37 2012 +0100

    RPC API: Return a resource identifier
    
    Change-Id: Ica33a82a8a201f625f293292e1ae7e5ca26559ef
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 16159b75d96197d857c46b57ebef34038e37a8e1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 12 17:42:36 2012 +0100

    Add identifiers for resources
    
    Change-Id: I5d0477ba8ee681f14b0f54cf8fa4d8569d541f88
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 83bf4291d7ee08fd7371dc2120b5b27027807375
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 12 17:42:36 2012 +0100

    ReST API: Refactor routes
    
    Change-Id: I2ab3c266ea814e791bc7fd955f8502ca862a92d5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4ab04a5ffde7034459b0aafba0b1dc8a63a82ea3
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Nov 15 11:28:30 2012 +0000

    heat engine : remove now-unused metadata rpc calls
    
    Remove metadata_(list|get)* calls, as these are no longer used by
    heat-metadata hence are no-longer required
    
    Change-Id: Ia67b9f329f628e3172bba24ff1b1192e8ec18079
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ad1e45573ece5bb5ca5d6b2273d0d3ab8faba806
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Nov 15 10:03:46 2012 +0000

    heat workaround for HA/Autoscaling regression
    
    Interim workaround for HA/Autoscaling regression, caused by change of
    scope for stack_get_by_name to be per-tenant, meaning we need to do a
    brute-force lookup to find the stack entry when using the stored admin
    context.
    
    A better, more comprehensive (but more intrusive) fix is in-progress
    but this at least returns us to the same functionality we had before
    
    Note this means that all stacks using WatchRule still need to have names
    unique accross all tenants.
    
    bug 1078779
    
    Change-Id: Iad1830d38262d1afb63cee16a3e366d9fd09acb4
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 27c5ea86f3c888be909788e40688624cc9b71b10
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Nov 15 09:12:31 2012 +0000

    heat dbapi rename stack_get_by_tenant
    
    Rename stack_get_by_tenant to stack_get_all_by_tenant
    This aligns better with other dbapi calls and better describes
    the actual purpose of the call
    
    Change-Id: If410220f8423f31718e6bcbfeca62a45c94c4d18
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 6ebde1b8f902be7a3ac71b5b85f5060d10f16a8c
Merge: bd8edd2 2622c2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 14 21:58:20 2012 +0000

    Merge "Allow stack.owner_id to store a uuid."

commit 2622c2ac4ecfc499f947d749b76ea1538148d4bb
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Nov 15 09:11:47 2012 +1300

    Allow stack.owner_id to store a uuid.
    
    Fixes bug 1078854
    
    Change-Id: I3dae1502968853d563ba52bc1d6656c48d5d18ba

commit bd8edd25fa8423ded878b4f3d0d0403e64c3cd17
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 12 17:42:36 2012 +0100

    ReST API: Split utilities into a separate module
    
    Change-Id: I140193db16b999255912f7013827b87b9ceb26e5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 40ed0ade378bb0289c546e7c2cc16891275c3e2b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 12 17:42:36 2012 +0100

    Actually validate properties of resources
    
    Properties.validate() returns an error on failure; it does not raise an
    exception (and never has). So we should look at the return value when we
    call it.
    
    Change-Id: Iaa0deb9f54055b4b1f73c0b37d26f5ac2c00d683
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0ffcb049c62348d33734aac88ac450996f80715d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Nov 14 15:16:54 2012 +0100

    Getting Started: Fix formatting errors
    
    Change-Id: If174fe7f54caa227996d0d779b28be8eb2050888
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4f30eecf3d445a044a13206f81ec451431447907
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Nov 13 09:54:40 2012 +0000

    heat templates : align autoscaling alarm descriptions with values
    
    The description doesn't match the actual values for the alarms
    
    Change-Id: I46201b75be075f4e4ac32d40031bc17b0786bb1f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ba00a025d4a5b72638a002ce4e123f6e824d9aa9
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Nov 13 09:48:49 2012 +0000

    heat engine : create boto config via instance userdata
    
    Create boto config via instance userdata, which the instance
    cfntools can read instead of /etc/boto.cfg, avoids messy post
    install sed-mangling in the templates
    
    Change-Id: Ic94bfc2e362a3a3f93b9bdeaad6a5f988371346e
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit a425ae02af7a25aa3654e644dc966d07f408a60c
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 12 18:31:16 2012 +0000

    heat engine : append watch server url to instance userdata
    
    Append url for watch server to instance userdata, which avoids
    post-install sed mangling in the template, and will make it easier
    to transparently switch to a different metric service
    
    Change-Id: I59b9b7efcd75d44e88ebe0a116a9ce1e3ef20c14
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit da712e0ccd4100fdffee6ee6543ac96c4b357d40
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 13 18:19:12 2012 +0100

    Don't use OpenStack plugin in tox
    
    This plugin provides syntax colouring of the tox output, at the cost of no
    longer reporting errors in test setup (instead it just reports no tests run
    -> success).
    
    Change-Id: Idf4f71a54af6303090d464b0846e563ac3776e4a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit bc2c6dbcfe097b45f53b162f6433e6fdd2ca9fa7
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Nov 14 16:23:12 2012 +1300

    Always filter by tenant_id in stack_get_by_name.
    
    This means that all calls to stack_get_by_name need to provide a context.
    
    Without this change, 2 tenants cannot create stacks with the same name.
    
    Change-Id: I98c35a5d51c5c7d66e0b8a0fddc04f221d1d6ab7

commit 18564e60e063dac98348f00aa91c7eb5de98996b
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Nov 14 11:17:52 2012 +1300

    Align pip-requires versions with nova
    
    This should also make the unit tests run again by preventing
    SqlAlchemy 8 from being used
    
    Change-Id: I6fa92540dc3369b85d135232b10701937071cbd6

commit 9096b586e2246cbc13b13141216a775720770c80
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Nov 13 08:47:44 2012 +0000

    heat align openstack/common with latest oslo-incubator
    
    Pull in the latest oslo changes, we need the threadgroup fix
    Fixes 1078064
    
    Change-Id: I58cc94979558663d101a1a7b42446d1a9face6cf
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 89caca42d693a686fc190bfd9e35606b4a21f208
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 13 14:30:15 2012 +1300

    Modify identify_stack to check for uuid.
    
    If the passed name matches a uuid then lookup by uuid instead of name.
    
    Change-Id: I2058616ce0191aab4d364b652f1b20d072f6b258

commit 75fc3c9bcae6b28c5ff9aa39b2afcd4891b326c4
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 12 19:59:58 2012 +0000

    heat engine : Don't wait() for killed greenthreads
    
    We don't care about the return value of any killed threads on
    delete_stack, and the greenthreads will all raise a GreenletExit
    exception after being kill()'d anyway.
    Also see related openstack-common fix : https://review.openstack.org/15906
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 8f2993610d0f12f7e711107eaf56db3d28b112b0
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 12 08:38:38 2012 +1300

    Pass a Stack entity to Stack.load().
    
    Every call to Stack.load (except one) is loading models.Stack then passing just
    the ID to Stack.load, which then loads models.Stack again.
    
    As far as I can tell, SQLAlchemy doesn't have a 2nd level cache, so this results
    in the db being queried twice.
    
    This change makes it possibe to pass a stack *or* an ID to Stack.load, and
    converts all calls to pass in a stack if it is available.
    
    Change-Id: I501ebd403a241cc3b4a5c1e3070137cfc360bbda

commit ec8d548b88d94695c847ec5887f916a7f80dcca5
Merge: e848c08 afd1b9a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 9 11:16:05 2012 +0000

    Merge "Switch to UUID for the Stack primary key."

commit afd1b9abdbf9b7b037ef144b5915818b4624bc83
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 9 15:45:06 2012 +1300

    Switch to UUID for the Stack primary key.
    
    For the migrate upgrade, existing integer keys remain and any subsequent stack
    will be assigned a uuid.
    
    For a migrate downgrade, it should work fine if there have been no stacks added
    since ugrade. Added stacks will have their IDs 'truncated' back to an integer
    which will require some manual fixup after downgrade.
    
    Change-Id: Ib882bece911fcbc96fffab16a9f0e5ce3cb55fed

commit e848c080790996e85fbbe0080e50b51d9deab46c
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 9 08:43:23 2012 +1300

    Add a list_stacks RPC call.
    
    This differs from the old show_stack(None) by not resolving stack data.
    
    heat list does not display any of the resolved stack data. Resolving outputs
    can be especially slow since FnGetAtt may block while it calls out
    to another service (such as with the quantum resources).
    
    Without this change, running heat list on a single Quantum.template takes 1.8s
    vs 0.7s.
    
    In the future, list_stacks can be made to support paging of results.
    
    Change-Id: Iae30338b66912d660f1cf48119893b1ab593b67a

commit a09a9a2c21e0278ab8e59f28f2a1d653d4317f3a
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Nov 8 16:39:18 2012 +1300

    Rename instance_id to resource_id.
    
    The current naming gets increasingly inaccurate with every new resource ;)
    
    Change-Id: I98629c7f8fd9c391f58c16ae1f6f2a7a232a2802

commit fb5fe068660319d079da6c44aab7d7e639c8a015
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Nov 8 15:49:19 2012 +1300

    Move client connection out of resources.py.
    
    Client connection references are currently cached at the resource instance
    level, which doesn't seem very useful.
    
    This change moves the client connection and caching to clients.py, then puts a
    Clients instance in a Stack. This means that (for example) all requests to nova
    in one stack will come from the same client instance.
    
    Change-Id: I22519f8ae4278ad128d3785d090294285f3a1b89

commit 6048c0dd6b056b396597c027a463ba2ef42133ee
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Nov 8 15:41:25 2012 +1300

    Fix FnGetAtt id test

commit 9e31cb53779984f9f201d6fdf3640d59da0a2562
Merge: 7381f16 e5ec6b4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 7 21:18:54 2012 +0000

    Merge "Fix cloud-init runcmd to be exec friendly"

commit e5ec6b4b5dccdbf9de4fe274a3e2d48658140900
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Nov 7 15:53:45 2012 -0500

    Fix cloud-init runcmd to be exec friendly
    
    Can't use colon builtin apparently, or you'll get this:
    /var/lib/cloud/instance/scripts/runcmd: line 2:
     {setenforce 0 > /dev/null 2>&1 ||:: No such file or directory
    
    Added cloud-init debug output to get the above, copied from:
    http://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/view/head:/doc/examples/cloud-config-chef.txt
    
    Change-Id: I341cf73bc9a0f843d7ab8c99a9d15e1d514654e7
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 7381f16c2ba558dcf8295fb4152f262d548babe4
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Nov 7 12:59:56 2012 +1300

    Replace KeyStoneCreds params with X-Auth headers.
    
    Username/password are now in X-Auth-User, X-Auth-Key

commit 8c1931b68225bb99008a1b4b1e7edf3c8929efb0
Merge: e4e4089 6d43f58
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 22:57:06 2012 +0000

    Merge "A template which associates an instance with a Quantum port."

commit e4e408986d6883bc686fcd5eaf099d994c1e001e
Merge: 1d66f9b 8014cf3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 22:55:42 2012 +0000

    Merge "Type is now mandatory. Boolean now exists."

commit 1d66f9b94375c3f0725b5b0d9c0209820934eed9
Merge: 66dbd41 39a9721
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 22:54:01 2012 +0000

    Merge "Make Boolean property a bool type. Since json has a native bool type, allow bool or string as the property value. Validating a Boolean type value will now convert a string to a bool."

commit 66dbd413acf437ca57e41a7fdfe34476f58e7b7b
Merge: 0f29c45 02d3313
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 22:52:52 2012 +0000

    Merge "Quantum template to demonstrate floatingip."

commit 0f29c45e4ff8ae123b3ce06163801446c69d6153
Merge: f8f6bf2 eff1af8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 15:44:34 2012 +0000

    Merge "Cleanup runcmd to exit 0 and not use 'type'"

commit 02d3313401af8b0b47590cba41b3b5fa94b54c6e
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 6 15:40:38 2012 +1300

    Quantum template to demonstrate floatingip.

commit 39a9721232649664cf0c96d2c58ad718efe88ce1
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 6 15:38:53 2012 +1300

    Make Boolean property a bool type.
    Since json has a native bool type, allow bool or string as the property value.
    Validating a Boolean type value will now convert a string to a bool.
    
    Change-Id: Ia1843e0f56e5afb2914708e42b62f2063279317f

commit 6d43f58669b8b9b873e3b44a982ddaeba3d3cf18
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 6 12:51:01 2012 +1300

    A template which associates an instance with a Quantum port.

commit 8014cf3bb73e7c531f204002f13d8ecee3242716
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 6 12:49:48 2012 +1300

    Type is now mandatory. Boolean now exists.
    
    This is required for Quantum resource types to work with new Properties.

commit f8f6bf2a57dcf144a3360b9085d970b62372c06a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 30 21:50:00 2012 +0100

    Handle list properties that do not contain objects
    
    The previous implementation of schema verfication on properties required
    that the schema for the contents of a property list always be a map. Now
    this is specified explicitly, so that in theory a property could also be a
    list of Strings or Integers.
    
    Change-Id: Icdd9a6c9f9b1e884f959c74f0803b7f3bd2aecc4
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 8e16b5168cba7765ccd3bbbdbcdff922e3769c13
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 5 14:42:42 2012 +0100

    Remove the CheckedDict class
    
    Its functionality has been completely superceded by the new Properties
    and Parameters implementations.
    
    Change-Id: I33a1990ee543a189dd3ec8f22eec27e2b0514d09
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 275eb17e973b2f684ad01583f3e9a252b2e9c1cb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 5 17:55:05 2012 +0100

    Use new Parameters class in unit test
    
    This test was still using the old CheckedDict implementation for
    parameters.
    
    Change-Id: I2ade5a81867d6b9f7517061e520da99575e8fbbd
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 33b09448c14468b768d2d4da4f756e8132065d81
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 5 17:30:57 2012 +0100

    Get rid of Resource.calculate_properties()
    
    Use the new Properties class to lazily load property values so that we
    always get the latest data, and get rid of the stateful hacks.
    
    Change-Id: I02a1b927606da217d4adab1ca04b659abadda2ce
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 6a19ccb7b82bcf6f371c3fbbd49177986b91f0fd
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 5 14:28:14 2012 +0100

    Add a Properties implementation with lazy loading
    
    This will allow property values to be calculated on demand, rather than
    stored as state.
    
    Change-Id: I93fefa911b96c931cbf48b82b5a7ccc13ad99168
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c44c27404f8e47dd400357f1866a18fff57515f3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 5 14:37:36 2012 +0100

    Avoid modifying the Properties of a Load Balancer
    
    Properties are defined by the template, and should not be modified. In this
    case it was just as a convenience, since the value does not actually need
    to be persisted beyond even the current call.
    
    Change-Id: I6ca07989d246ec618b2ca5f051f8e614e24c81ae
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 9c13216d2b4e777d6dc2399bb1b3a8784da7d3ec
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 5 12:06:11 2012 +0100

    Fix schemata errors for properties
    
    In particular, Integer refers to a literal integer in the JSON markup:
    
      {"IntegerProperty": 42}
    
    So use Number to refer to a string-encoded number:
    
      {"NumberProperty": "42"}
    
    Change-Id: Id285ae6145ba888f59529207343d016fba3825eb
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 2162b8047be83875e3f226140dfade88517371a1
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Oct 30 08:41:13 2012 +1300

    Add a set of native quantum resource types.
    
    The properties schemas map directly to the Quantum REST API, which makes
    the implementation (and documentation) simpler.
    
    The base class QuantumResource contains some default methods and
    common utility functions.
    
    templates/Quantum.template can be run without any parameters and only creates
    network resources, no instances.
    
    More example templates and tests will come later.
    
    Change-Id: Ia270294440eeec5163e35009f6be0b5db9ad78c1

commit b3a57062ade24b9fbfc1f02f130ad353fffc49d4
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 2 17:07:47 2012 +1300

    Recursively replace all : with . in Output keys.
    
    This is needed so that some Quantum properties with colons in the keys are not
    interpreted as xml namespaces.
    
    Change-Id: Iba5290a408595b2f028744c10315daac29da055e

commit 499e492d946a5c456cdb7087f62497464649bf34
Merge: 5f60499 f77c09c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Nov 4 23:51:39 2012 +0000

    Merge "Rename heat client to heat-cfn."

commit f77c09c2a5749a199028316ceb821ab9907b3e51
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 5 09:29:35 2012 +1300

    Rename heat client to heat-cfn.
    
    This is to allow python-heatclient to eventually become the default heat
    client.
    
    Documentation in heat.wiki will be updated to refer to heat-cfn when this
    change is pushed.
    
    Change-Id: I2209c36adf41fa5d0df0caf9200f7fedbdd51805

commit 5f60499602139d2bca727033e7390f784c14af88
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 5 11:05:04 2012 +1300

    Update openstack-common, add network_utils.
    
    This is required by impl_kombu.py. The engine failed to start without it.

commit 8135da2fb42a8f34d530369dde6f3ddd216ffd97
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Nov 2 22:02:00 2012 +1100

    Use openstack-common service.py
    
    Change-Id: Idbc145209c039e9362cf97c9926e050f809ef0fa

commit 9874dec669a937e8b844e9e304e65f311ca4cc82
Merge: 183bad2 589b4a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 2 09:47:52 2012 +0000

    Merge "Add service.py from openstack-common"

commit 183bad2534d8352ddadb6a77ba8ca509347505d7
Merge: 77069ee c6a624f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 2 09:47:33 2012 +0000

    Merge "Update openstack-common"

commit 77069eefd54b291b28edce2fcd275bb2bcf619d2
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 2 08:57:52 2012 +0000

    heat templates : Align AutoScaling template with cfntools
    
    Updated cfntools require authentication for cfn-push-stats,
    so the AutoScaling template needs the user/key and boto.cfg
    additions, same as in the HA templates, otherwise cfn-push-stats,
    and hence autoscaling doesn't work
    
    Change-Id: Ib3ef4a932bb656f29e25ef745409f5fe3e82c356
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 589b4a76161ada22faefd39195340f5177b2e934
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Nov 1 14:17:15 2012 +1100

    Add service.py from openstack-common
    
    Change-Id: Ia4996d89d0fdba6dbeb44ae4cf3ca202c78886ee

commit c6a624f3ab73a5b1770e69d35713c92a82ecb54c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Nov 1 14:00:41 2012 +1100

    Update openstack-common
    
    Change-Id: I3abd011729f413dbd20806f54c9ae6963641d59a

commit f4c34c56285ba17005fb413d8f32f11d4d44332b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 31 20:18:43 2012 +0100

    Implement NoEcho for parameters
    
    Change-Id: I60ce651367479205e0d456e2ac0ec3f949766383
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d918f3919f46ab1663d065e81c12819a8624c7a8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 31 20:18:43 2012 +0100

    Use new Parameters class for validation
    
    The Stack.validate() method is no longer used for the validate_template
    feature (since it requires the parameter values in order to parse the whole
    template), so move the code for outputting parameter metadata to where it
    is actually used.
    
    Change-Id: Ibf2ad7cb485bff75953c952f34ea4a597ea5e2f8
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f605bcc812e2f0eaeca7c62da759f16a7478a6b0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 31 20:18:43 2012 +0100

    Separate Parameters implementation from Properties
    
    There are only 3 types allowed for Parameters (String, Number and
    CommaDelimitedList), but we are currently allowing more due to a shared
    implementation with Properties (which is an internal implementation
    detail). This creates a separate implementation for Parameters with only
    the allowed types.
    
    Change-Id: If51ec538893a582da2caa0356c25e515e9d8004e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a5485ad10d3a0336b1f92c1938d3b87ce15bdf82
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 31 20:18:42 2012 +0100

    Clean up hacks for parameter passing in unit tests
    
    Don't rely on the internal behaviour of the Parameters class.
    
    Change-Id: I14f11e6ead1c49cf540bba453200fdec7f2ce7a3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d806f727dbebe6bc1616ed4723f967c94f1349a8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 31 20:18:42 2012 +0100

    Put the Template class in its own file
    
    Change-Id: I5e3a9ef79c1c4f893720cfa529066d49a7c83ad1
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit e0bb98d4f5ec918cec8514b8bc5c39057aaaf6d2
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 31 16:28:19 2012 +0000

    heat-keystone-setup : fix error on folsom first-install
    
    When running heat-keystone-setup for the first time after (re)installing
    openstack folsom, it fails, because the user-role-list is running *as* the
    heat user, not reading the roles assigned to the heat user, which fails
    because on a new install the heat user does not have the admin role.
    Using the credentials from the environment means we run the command as
    admin, but --user_id selects the roles for the heat user.
    
    Change-Id: Ib2733e63f664d75be1e2e3bd43038bbd1dbebde8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 0ba94dcc7a2d6fac0579331beb0e6ca267ee8c81
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 25 14:50:28 2012 +0100

    heat engine : add heat_waitcondition_server_url
    
    Add config option for waitcondition server, since metadata
    and waitcondition notifications are no longer handled by the
    same API
    
    Change-Id: Idc1b39c6c60b8473316fe4861f0f060568540b09
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c8ec051a67fcdeecccefa5b911e42cef5fba5713
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 25 14:40:47 2012 +0100

    heat metadata : Remove all non-waitcondition related logic
    
    Remove all logic except that required by cfn-signal, since both
    cfn-hup and cfn-push-stats have been ported to use the CFN and
    Cloudwatch APIs respectively
    
    Change-Id: I087349ff3ab901c880a248bd124396a1383c0a5e
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 997a2165e7d64d295de0b92d8261cde3fa5ac53f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 25 14:30:31 2012 +0100

    heat metadata : remove metadata_url logic
    
    Remove logic where the heat-metadata server registers a
    URL on startup with the engine.  The instance metadata is
    now served via the CFN api, so we just have a config-file
    option specifying the URL of the CFN API.  We don't want to
    preserve the "register on startup" logic, because we need the
    engine to have access to this information even if it is
    restarted independent of some other service (avoid reliance on
    services coming up in a particular order)
    
    Change-Id: I690170977227ec96451d2a2fd25f7e507370b604
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 763cf3142b2d68285a7f1a59e12fd5f1031c3ac0
Merge: ffd410d c629b24
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 26 07:28:13 2012 +0000

    Merge "Format stack_identity as id *and* links."

commit c629b241c1380424805cd909b1e839cc50502c6f
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Oct 25 13:31:52 2012 +1300

    Format stack_identity as id *and* links.
    
    Here the id is defined as {stack_id}
    
    Change-Id: Ieadda61d608e2d3e7125b42758cf80588178c042

commit ffd410dab5bd5d8a05c8eb1772765af45a602792
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Oct 25 20:44:20 2012 +0200

    Move resources into a separate sub-package
    
    Change-Id: I5a6d74949b6f39a9df6c5077c2ff768f50fb3ac1
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c31d2426a4f2b3ca3bbe96a9d6c280f521f0fc46
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Oct 25 22:18:27 2012 +0200

    Move Timestamp code to separate file
    
    Change-Id: I57627f5b9048bbbcda0a07ac274fd1e579348496
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 70b609567d72fa22d645df0665308af98418e4fd
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 25 14:04:49 2012 +0100

    heat-keystone-setup : change role to heat_stack_user
    
    Change heat_instance role name to heat_stack_user after discussions
    
    Change-Id: I14e95df0e02d82566f4758510ae38f6b26ccb532
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit cd9a3a7c95f560551214c10784590111537ff3f1
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 25 11:33:20 2012 +0100

    heat engine : add template-defined users to keystone role
    
    Add all keystone users created by the User resource type
    to a special keystone role, which can be used later for
    defining RBAC policy for these users, and also works around
    a keystone bug (1060959) on Folsom
    
    Fixes #279
    
    Change-Id: I94931e427ed51f4332bcb506220925b7ce8097bc
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 92c985191b907096b1cb2aa8c77efa9773596a35
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 23 21:59:38 2012 +0100

    heat engine : Allow instance users to view their own details
    
    So that cfn-hup can read instance metadata via the DescribeStackResource
    API call, we need non-admin "instance users" to be allowed to read their
    own AccessKey resource details (since it can-be/is referenced in the
    instance resource metadata).  The change in this patch should allow non-admin
    users to read *only their own* secret AccessKey, and leave existing admin-user
    visibility of the AccessKey resources unchanged.
    
    Change-Id: Ic26d614d8e30104fbb354a67d3376b5d995ae8cc
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4743749b80593878ac85bc1aa2d844b606cda6b0
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 25 10:16:29 2012 +0100

    heat-keystone-setup add instance role
    
    Add "heat_instance" role which we will assign all "instance users"
    to in the engine when we create them
    
    Ref #279
    
    Change-Id: If7cc07c605f7696c1e9f617dbfca1b81d5b04196
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f5099e02d5b2f1312f10dd255c11d951c75ce34e
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 24 13:48:22 2012 +0100

    heat-keystone-setup workaround keystone arg syntax
    
    Keystone user-role-add syntax is not the same on essex
    and folsom, so try both formats so we can work with either
    Removes potentially unreliable approach to detecting keystone
    version, and also avoids error on folsom when the user already
    has the specified role
    
    Fixes #272
    
    Change-Id: Iece52223a29069a1fd517018cc49613be6fac318
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit b3b56ff59d1402ba2188778e683d5b3725fb941e
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 24 13:41:34 2012 +0100

    heat-keystone-setup workaround keystone output reordering
    
    Folsom version of keystoneclient orders the columns for
    keystone user-list differently, so we need to detect the
    new format to extract the correct field
    
    Fixes #273
    
    Change-Id: I46f653dd3a8f7b5a68648fbd72671f95b386a547
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 29b7ae7c1be059ef5b8b457329c453189417a175
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 23 14:20:37 2012 +0100

    heat tests : StackBoto fix _check_*_result functions
    
    The _check_*_result functions don't actually check anything
    so make them check the response format, which should be a stackid
    
    Change-Id: I6b22cdc64409846caadbd2ebca5e8a81eccc81a6
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit fd66a93cc77e7c719b710496c8eeba23f7f60482
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 23 14:16:39 2012 +0100

    heat tests : refactor stackid check into utils.Stack
    
    Rework utils.Stack._check_stackid so it can be used in the
    tests to verify stackid format, avoiding maintaining multiple
    copies of a stackid regex
    
    Change-Id: If7fbd7b35626c377b42a43ffa03ee8067540963b
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit dd6a3781520004cec56cb8f87aafd762e9322430
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 23 13:42:15 2012 +0100

    heat tests : fix CFN_API_Actions test fix state reason
    
    state reason is "state changed" not None now we commit
    the IN_PROGRESS state transition to the DB
    
    Change-Id: I4c6641cd489de13ee9575fcdf879cae95ad7df4d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 445a1fdf783b2521c528265a9c10a5c8b516befa
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 23 13:07:57 2012 +0100

    heat tests : fix CFN_API_Actions test stackid regex
    
    stackid format has changed since move from tenant name to
    tenant id
    
    Change-Id: I5e8304f33d49133bc1b7e5530ae1a8323e2986c5
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit b0661fdc8cb289a4d0d531809fcfc399936d3f18
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 18 17:13:02 2012 +0100

    heat engine : kill running greenthreads on stack_delete
    
    Add logic to track running eventlet greenthreads and kill
    them when we start a stack_delete.  This should avoid errors
    where long-running greenthreads end up referencing stacks which
    have subsequently been deleted.
    
    Fixes #261
    Ref #223
    
    Change-Id: I0d10b6f2dad0efa1caec18a67a3cc66cc693ea24
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 320999bf804869e6579c2d555bf211e17c86858d
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 17 14:38:08 2012 +0100

    heat engine : Store all resource states to DB
    
    Resources should be committed to the DB on transisiton
    to CREATE_IN_PROGRESS state, otherwise resources
    which take a long time to go from CREATE_IN_PROGRESS to
    CREATE_COMPLETE (e.g WaitConditions) are invisible while
    in the CREATE_IN_PROGRESS state to all except the thread
    creating them.
    
    Change-Id: If1563505e854c216c0f6a5ce84b613e1ccb74386
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit aa9f26b00041761e35fd205faf482d58819bbc1a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 23 11:49:47 2012 +0200

    Bump version to v8
    
    v7 has branched
    
    Change-Id: Ib8d3471576e0d408b18f4ab4d04ffdeafba234b5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d65ae5b3133c72bd6bde013ace36bcfbbc1e51a9
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 22 18:38:06 2012 +0100

    heat engine : Make Resource::swift handle auth_token
    
    Make Resource::swift() handle auth_token so the S3
    resource will work with AWS auth
    
    Fixes #271
    
    Change-Id: Ie5aca026dea25045e42aab677a2c793c79de1658
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit eff1af8ae03461892fb432ebd0394f8fd88eb4c7
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Oct 19 17:23:49 2012 -0400

    Cleanup runcmd to exit 0 and not use 'type'
    
    Change-Id: I37313a772839f56a015431bbb004ad767da0815e
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 7036a387f48fb0cd5266f57fa148a32d98cd7270
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Oct 18 15:50:27 2012 +0200

    ReST API: Add a keystone endpoint
    
    Change-Id: I2770279ec50822c106d3ae23ce2f736a49139443
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 567128f594bf45748528e610f01d90255ff0eb60
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Oct 18 16:50:53 2012 +0200

    Handle %(tenant_id)s in endpoints when updating
    
    Change-Id: I61112f02b60b6bb63f33d5459edec1f44a49bdd5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 2e7e7c44cf52191cf54222c8256c6afcc6f00aa5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Oct 22 11:24:59 2012 +0200

    Change the service user to match devstack
    
    The user which authenticates keystone tokens should be the "heat" user in
    the "service" tenant. This changes the default configuration to do this, as
    devstack already does.
    
    Ref #269
    
    Change-Id: I89978ec0b490f6d404c568197dd4208097a4b695
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 3bc725b5bd1ec82cc5e307d08803836d83a9e143
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Oct 22 11:20:07 2012 +0200

    Pass the correct tenant for the service user
    
    Previously, the service user (which authenticates tokens passes to the
    engine by the APIs) was paired with the tenant of the end user to do
    authentication, which worked only when they were in the same tenant. This
    should not be the case, since the service user should only have an admin
    role in the "service" tenant.
    
    Fixes #269
    
    Change-Id: I99b764fc489429dd6d081485bd89d5dde737c124
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d75075cf35907530f8211d53d89b4ffd186fe251
Merge: 5d7ebba 0816b29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 19 20:45:14 2012 +0000

    Merge "ReST API: Format output as JSON"

commit 5d7ebbaa06fa348e1e50121316580811c3f15105
Merge: c2d262e 0f108b7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 19 18:37:58 2012 +0000

    Merge "Start and enable libvirtd."

commit 0f108b72dea71d9667a573d5661a301bdeec99cb
Author: Ian Main <imain@redhat.com>
Date:   Fri Oct 19 11:30:27 2012 -0700

    Start and enable libvirtd.
    
    Just did a fresh install on fedora 17 and found libvirt was not running
    by default which caused nova to not start.  Explicitly enable it.
    
    Change-Id: Id244af934007020d1a9f263dd71f04e5950dd2c5
    Signed-off-by: Ian Main <imain@redhat.com>

commit c2d262e6b26d0dd14c6f6c76100e78a4154fef08
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 19 19:11:51 2012 +0100

    heat engine : Resource.keystone handle auth_token
    
    Handle auth_token as well as username/password
    
    Fixes #268
    
    Change-Id: I7015556d74e026977fdd04f4ce9a378c0fac7695
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 13ec48afe3aa12804cf15ad02557b1949cd52cdc
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 19 19:02:33 2012 +0100

    heat engine : Rework auth.authenticate
    
    engine.auth.authenticate is really creating a novaclient
    connection, so move this into Resource.nova
    
    Ref #268
    
    Change-Id: I15d9c0537b3af9e65cd1ea5bd667bde0c89dc4c2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 52968f4a16b1af85770f532f734143add807c53b
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 19 16:12:15 2012 +0100

    heat engine : remove unused EC2 style auth from engine
    
    We handle EC2 style auth at the heat-api-cfn level, so EC2
    style authenticated requests simply pass us an auth_token in
    the context, so remove this duplicate/dead code.
    
    Ref #268
    
    Change-Id: I17708cb6ef4b0eb4989d47c116b6211f0d419dcb
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 0816b2963c4c334efe65f2a0cf2748ae6bc708c0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 19 17:14:12 2012 +0200

    ReST API: Format output as JSON
    
    Eventually, both XML and JSON will be supported, but for now make the
    output JSON, the same as the input.
    
    Change-Id: If0f00b182c27616a9a6f08b468d732c718b7635a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 5658f9d4dbe759fe26a7b820058b8e257f796f35
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Oct 19 11:20:04 2012 -0400

    Do not assume host has selinux utils installed
    
    related to #265
    
    Change-Id: I4a6cff1f05b6f4f88d672cc0d4ce5e8f62a58e47
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 6ea813be339f8218cef6ceaa61bbe3a698783e09
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 19 16:15:13 2012 +0200

    Identify stacks using tenant UUIDs
    
    Tenant names may come and go, but UUIDs are universally unique. Therefore,
    ownership of the stack should be keyed on the tenant_id, not the tenant
    name.
    
    Change-Id: I7ec410aeaeceb6319299935b5f34d7c4e9c63d67
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit debeccde8f9d3e99d2addc843d718eaf1e588dfe
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Oct 18 14:53:26 2012 -0400

    Make default distribution U10 for deb template
    
    Change-Id: Ifcfc7d1fbb6fac2a785a0dc5a4e6ba09cf898ed4
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 0ee9371f0c67d2334ced2a5bec171864a4fa7374
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 17 13:37:57 2012 +0100

    heat engine : Make wait-condition poll interval better
    
    Remove rising-rate sleep-time logic and replace with a bounded
    poll interval derived from the timeout - this should avoid ramping
    up to a really long interval and delaying stack complete status
    
    Fixes #264
    
    Change-Id: Id53b87a988299708c29fc853f2801f527fd825dd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 0c81d9dbef675c666ba1bb9d659457b3acc05e78
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 16 16:31:59 2012 +0200

    Handle upgrades in heat-keystone-setup
    
    Handle upgrades of Heat by removing any outdated endpoints that exist in
    keystone and adding any existing "heat" service user to an admin role in
    the service tenant.
    
    Change-Id: If6393417b5404a56b4723f42fb1a1b394d01cc6a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit bae47db46091c7ee2840abb264818731ed4ae099
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 17 10:33:45 2012 +0200

    Rename CloudFormation service to heat-cfn
    
    This is consistent with what is implemented in devstack.
    
    Change-Id: If47c28ddbef1d6c61e2d741f359d850e4ecffaa9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 453854cdf697453376364eae51d65e3e58d82f51
Merge: a97c6d3 3308e27
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 17 08:33:13 2012 +0000

    Merge "heat tests : Remove utils.Stack getter methods"

commit 3308e276481a7160adb58b9c1cad7327543c47cc
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 16 17:24:53 2012 +0100

    heat tests : Remove utils.Stack getter methods
    
    Remove the get_*_client getter methods, as they aren't
    actually doing anything, so just access the attributes
    
    Change-Id: Ic6740bdfe7d44c40b9fdf9fc4d03f8eddaf9a740
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit a97c6d3181a3d09751c3f88eee5a43e9eed0ad37
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 16 16:33:55 2012 +0200

    Use password in preference to token if both supplied
    
    Fixes #263 - devstack is providing a token in the environment, which was
    causing the wrong path to get hit.
    
    Change-Id: I9aae346e57fdfe156e52d4696e8f2f859884ff2f
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f3ab48b64e13d681ff4d07aae67c31fb6c266683
Merge: 74b207a cd512f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 16 14:16:50 2012 +0000

    Merge "heat : heat cli pep cleanups"

commit 74b207a332d67fd530f3a87fbf83f6981e75d113
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 16 14:16:17 2012 +0100

    heat tests : add ValidateTemplate test to CFN_API_Actions_Boto test
    
    Add test for ValidateTemplate test to test_CFN_API_Actions_Boto.py
    
    Change-Id: I1fff55cd9aaa0c62c2a1e05050695bcd3f96664a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit da5406a043512dbc47064794d6ab1ab1e0ba228b
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 16 13:45:24 2012 +0100

    heat tests : Add ValidateTemplate test to CFN_API_Actions test
    
    Add test for ValidateTemplate action to test_CFN_API_Actions.py
    
    Change-Id: Ia7a377f952d096e7b728a7151906ab2781695008
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 3cbbafd3c2fd321941722eea598aead1dd3d481b
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 16 13:19:27 2012 +0100

    heat API : ValidateTemplate fix response format
    
    Fix CFN API ValidateTemplate response format, missing the
    ValidateTemplateResponse wrapper, required by boto to parse the response
    
    Change-Id: I89464df402346ff87041496652d2b4d39cc35fc6
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit cd512f5e915ff7de89c4829e45e367f9b201a3db
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 16 14:34:38 2012 +0100

    heat : heat cli pep cleanups
    
    Fix some pep whitespace issues, which were not picked
    up by the jenkins gate for some reason..
    
    Change-Id: I9a3488d61a3cde4bb8038f3f1927eb0c1ad0f60c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 98b6c2a566812abdb1c89e9dec51331baea5ae14
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 8 13:48:27 2012 +0100

    heat : boto_client_cloudwatch allow credentials override
    
    Allow the AWS key/secret to be passed in when making the client
    connection like boto_client.py
    
    Ref #222
    
    Change-Id: Iee24120eb52c8ffb97b1b421b0a27313e5f5cbdd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit b1c97d145531ba3aeff055d7028ff49df13cad9e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 16 13:35:23 2012 +0200

    Catch SSH Disconnection errors in functional tests
    
    Change-Id: I24f959cbaa36138bafeda70a3966000673c80c56
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 46a41590fb8ebbec565e0d007c429a17d0d7f5eb
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 16 10:38:17 2012 +0100

    heat : add template-swift-url option to client
    
    Add option to bin/heat to retrieve template body from swift
    
    Fixes #216
    
    Change-Id: I425d7cd0f01875d85d97906f4f91c3a3b2fcf851
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 84ddb9fb654ee8cd57273110f4760f44af43be3a
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 15 16:42:52 2012 +0100

    heat cli: encapsulate template arg-parsing
    
    Encapsulate template argument parsing in a helper function
    cleans up some duplication and provides a single place to add
    swift-template-url logic
    
    Ref #216
    
    Change-Id: I36515f318ed79899a2710899ffca83e4452c61f4
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4bd5c4a9dde0afbcd31438604c3aa05799c472ce
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 15 17:01:39 2012 +0100

    heat engine : remove unused validate_template params
    
    Remove unused params argument to validate_template, since
    it is no longer passed by the CFN API meaning the validate
    action fails
    
    Fixes #262
    
    Change-Id: Ic2a5ede02649f2d6dff86595efb0127e07fbf253
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ac38cae7f5352a0c2592d6789bdd5e35ca5aa900
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Oct 15 16:33:19 2012 +0200

    Obey the passed in distro value in HAProxy template
    
    Change-Id: I7e1dad654746329763bb575a09611aa0b827ec24
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 64965db9de997d55d7599073d2a310251fc355e3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Oct 15 16:13:12 2012 +0200

    Use --script option to parted in templates
    
    Provisioning scripts should never expect user input.
    
    Change-Id: I0099cee6a920313c2b5c8e86ddb18de11bab8329
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 65496df4a9c08d0ef7fc191f192b19df39447198
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Oct 15 15:46:49 2012 +0200

    Reduce timeout periods in functional tests
    
    Many of the timeouts were absurdly long and delayed reporting of test
    results by many hours at a time.
    
    Change-Id: I9a70442548097d607eab87471a8037b566127ac9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit fdf285f4df7b4589e8801c77bdd3c3b2f57c9812
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 12 22:32:54 2012 +0200

    ReST API: Add unit tests
    
    Change-Id: Id815c7d5d08e912f64268529b4bdbdcd06c1c47e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b3fba7da803d3c0239f7d3a27a69cd099fb6552e
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 15 11:34:52 2012 +0100

    heat : Getting started updates for Cloudwatch
    
    Update GettingStarted.rst:
    - Add heat-api-cloudwatch section
    - Add firewall rules required for heat-metadata and heat-api-cloudwatch
    
    Change-Id: I3b232f378a23b6c334c7e8e5af3ab067ffd50381
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 47c79a2051f7738a482bad090b894c6e480dfe7a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Oct 15 11:57:11 2012 +0200

    Getting Started: Fix IP address determination on F17
    
    The format of the output of ifconfig has changed between Fedora 16 and
    Fedora 17, so starting the metadata server failed on the latter due to a
    missing IP address.
    
    The change makes the script work with either format, and also now fails
    with an error if it breaks again.
    
    Change-Id: I7012af7bd7c15f6a962d19e66c8a0d8401243895
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b53436bf402a992cc9c135dd833bdb15465d4244
Merge: 2f2c5e7 4d262e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 15 08:57:10 2012 +0000

    Merge "heat : Remove cloudwatch functionalty from metadata server"

commit 2f2c5e7494270c9877d92b66dc6f7131ad31c710
Merge: 737f4f4 318f233
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 15 08:55:04 2012 +0000

    Merge "heat templates : Add boto config to HA templates"

commit 737f4f4320510371ceaab0ef6e528aa567e52eec
Merge: be39298 ebc3129
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 15 08:43:19 2012 +0000

    Merge "heat engine : Move watch logic into WatchRule class"

commit ebc3129e44d5762756d28133880b07a13f6e0be3
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 28 08:02:20 2012 +0100

    heat engine : Move watch logic into WatchRule class
    
    Move engine/manager.py logic into WatchRule class so watch-
    related DB manipulation and related logic is encapsulated in
    the WatchRule class
    
    Fixes #217
    
    Change-Id: I5405ab631de17efda7eefb45dadad55ee12c533c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit be392980ce9c450cc92a6a57ddbe2b09693e1273
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 12 22:32:54 2012 +0200

    ReST API: Report template validation errors
    
    Use a different HTTP Status code (Bad Request) for validation errors.
    
    Change-Id: Ie1097dfbbe920a2efb641b343114d7b4decac473
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a5c7b42e23add65e4f990674f24aa9bd90725a72
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 12 22:32:54 2012 +0200

    ReST API: Return appropriate error codes
    
    Change-Id: I769366dd164199c3b7d16ca8bf4c4d99d21dbb7b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 238187ee0a9d075d1e86534a72ae2eb8e53cce26
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 12 22:32:54 2012 +0200

    ReST API: Separate out code to fetch template from a URL
    
    This will make testing a bit easier.
    
    Change-Id: I8f9d63e3ff68174bb9f1284c21f52696ec5ac006
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 8be0906b7aa3162d9d1435eb8ed0d8ba9c226066
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 12 17:18:11 2012 +0100

    heat : db API add watch_rule_get_by_name
    
    Add watch_rule_get_by_name, and move the previous
    watch_rule_get to look up rule by ID, which is consistent
    with the other api calls.  Lookup by id is required for
    WatchRule rework
    
    Ref #217
    
    Change-Id: I4b5d08ffcd31b6b522c65edd0a202e8cf5a367b8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit db0a268f414e963d73ded7449662385f8e5435c1
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 12 10:49:13 2012 +0100

    heat : db API add watch_rule_update DB API action
    
    Add watch_rule_update DB API call, needed for WatchRule
    refactor/rework
    
    Ref #217
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    
    Change-Id: Ie8321d390ab96e987bfa4c97c26f1e0305f6bd48

commit 4d262e3b29faeb6499ca2befe52d81aea3583ef7
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 12 13:45:11 2012 +0100

    heat : Remove cloudwatch functionalty from metadata server
    
    Remove the cloudwatch metric functionality from the heat-metadata
    service, since all stats should now be sent via the CloudWatch
    api via the PutMetricData action (ref cfn-push-stats update)
    
    Note that after this change you will need to rebuild your jeos
    images to get the new version of cfn-push-stats from heat-jeos
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    
    Change-Id: I5eec60d3dd0abfb32e2b4777635f1b0e2714a2c2

commit 318f233c54c4f2046052a4a70411600e53aa847f
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 10 10:03:11 2012 +0100

    heat templates : Add boto config to HA templates
    
    Add boto config to HA/IHA templates as it's now required for
    authenticated cfn-push-stats which uses the CloudWatch API
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    
    Change-Id: I8670f6774834e9f41870240496fe74728306cf17

commit 5df2d6f7020c54fc7e5c9c8e68662708791e3f69
Merge: e690324 64fc539
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 10 22:17:18 2012 +0000

    Merge "ReST API: Add some simple API documentation"

commit e69032415cdaec1b9594eccaca839181d398ee43
Merge: 3e196ee a553fc2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 10 22:16:56 2012 +0000

    Merge "ReST API: Use JSON documents for data input"

commit 3e196ee0062c1084730b1429e04571761cfd4221
Merge: a7babbd 4fca773
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 10 22:14:02 2012 +0000

    Merge "ReST API: Refactor handling of input data"

commit a7babbd61f738687f5c2a0eb0b487655d2bc8e5b
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Oct 11 08:18:04 2012 +1300

    Unit test for load balancer resource type.
    
    Change-Id: I2386419563f02bcb509a8547fd587b9af6285c5c

commit abafede828fff481912bb1044e0683536468eb64
Merge: d41fe6f c0ec1c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 10 18:17:25 2012 +0000

    Merge "heat : Add missing calculate_properties to user resource"

commit d41fe6f6f018fc15fa578692b145aac4707edf63
Merge: 96c9b50 73b19cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 10 18:15:07 2012 +0000

    Merge "heat engine : Avoid printing credentials to logfile"

commit c0ec1c1dd4aaba11b11f21877e57ee113abd1fdf
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 10 18:20:25 2012 +0100

    heat : Add missing calculate_properties to user resource
    
    Adding calculate_properties to user AccessKey resource, or
    we get a key error when trying to list resources in stacks
    using this resource type
    
    Fixes #194
    
    Change-Id: I905c162dd6bc3557825610f046e6ee8228d5225b
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 73b19cb666d70f2288a96c95cfab4bf8ed391faa
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 8 17:16:42 2012 +0100

    heat engine : Avoid printing credentials to logfile
    
    Avoid printing the AWS secret key to the (world-readable)
    engine logfile
    
    Fixes #258
    
    Change-Id: I26d809064c603421c4bbe4a060de5d4776fec4b8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 96c9b50778ab3fc36d33544e6d6510d75e09c044
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 10 18:51:20 2012 +0100

    heat engine : only attempt stack update from valid states
    
    Only attempt to update a stack if it is in CREATE_COMPLETE
    or UPDATE_COMPLETE state
    
    Fixes #260
    
    Change-Id: If47a628f1602d5d8783b3f0e90fd7e76ccef46ba
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 64fc539afcd2adfe8d8698bb6a838a22fc3a132e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 10 18:22:01 2012 +0200

    ReST API: Add some simple API documentation
    
    Change-Id: I6b3ff5a46e0ba836634cc21cf7ee8945a18a6a3a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a553fc2ba55170fc27f2d4e6c5b44d6570523bda
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 9 17:55:37 2012 +0200

    ReST API: Use JSON documents for data input
    
    This is more in keeping with how OpenStack resources are manipulated than
    the previous implementation, which used WWW Forms encoding.
    
    Change-Id: Iba7a6b83a65637cf999c67ef3f4dea7b3e64100d
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4fca77337a4a491cb1e340d515fabc36b09ee860
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 10 15:38:04 2012 +0200

    ReST API: Refactor handling of input data
    
    Create a separate class for dealing with the data associated with a
    PUT/POST request.
    
    Change-Id: I054bc74cf65055d23eb716738c29e751a32f3022
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 454b2dffb6b988ca6381c9ef1a973be654921b2b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 10 15:38:04 2012 +0200

    ReST API: Fix template validation
    
    Also move the URL to be local to a tenant. This is because keystone will
    automatically fill in the tenant id in the endpoint, so all requests will
    use this as a base URL.
    
    Change-Id: I3fbd5a7d256426079824f8a26fdcd41eac083146
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit efd529408659110806aab6de4d37b705bc840143
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 10 11:57:33 2012 +0100

    heat : workaround engine error with version code
    
    Work around lack of git sha in vcsversion so we don't get an
    engine error if the version dict doesn't contain the sha key
    
    Fixes #259
    
    Change-Id: I25d2cfb008a5a9e0e1a60e7360e58608d2d8e9c0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit a34b9ef5ab0aa3590fd28cb9f8088a3e0896947f
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Oct 10 13:21:47 2012 +1300

    Change endpoint service type from orchestration to cloudformation.
    
    This is required so that the REST API can take over the orchestration service type.
    
    This will break exiting setups until heat-keystone-setup is re-run.
    
    There will be a corresponding update to devstack, which may be out of sync to this one.

commit afe93704f327a4514fa826b06d275729cf214073
Merge: 2e3bdd9 4651be7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 9 16:19:50 2012 +0000

    Merge "Remove unnecessary keystone scripts"

commit 2e3bdd951028f8d0b201b9ddb2553b194a1b0941
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Sep 28 20:00:34 2012 -0400

    Fix versioning code
    
    Removed cruft from OpenStack common versioning code that was removed.
    Added optional git SHA information if module is available. The
    intent is to have the additional git revision reported only when FINAL
    is set to False.
    
    Change-Id: Iae94b84027e7428cd394726e07845d2bad631586
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 4651be78386832b8fd1f931f9574f7566d976198
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Sep 28 20:08:35 2012 -0400

    Remove unnecessary keystone scripts
    
    Make remaining keystone script check installed version of Nova and use
    proper arguments to keystone.
    
    closes #252
    
    Change-Id: Ie4709891c7ca89d73390a3474e3d10beab449395
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 9cf1c6f269ac10c2493653c646bbef9271cf7122
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 9 10:37:01 2012 +0200

    Fix bugs in ReST API stack creation
    
    Change-Id: I39277224305465cc951e397f340012563c0f7174
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 3e603825a8c743e9a1e2f6f4362669cb6d187c47
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 9 12:06:44 2012 +0200

    Allow authentication to Nova with a Keystone token
    
    Change-Id: I3ca90169559cc167ff51db5fe47ceec8c917f04b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 5f7ccf6129f669a757253db8ce2ce88e8f3cd228
Merge: c6ad01b 8c9bd2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 19:42:08 2012 +0000

    Merge "Make sure to remove python-glanceclient too"

commit c6ad01b6b31e08a792cf7d5cad33f01bcaa8e88e
Merge: 703693b dd6975e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 19:09:37 2012 +0000

    Merge "Fix hash-bang directive in nova_create_flavors.sh"

commit 703693b03e5cfb39a71a337e1d97a121a914a951
Merge: 0fa2903 cdd392b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 16:02:04 2012 +0000

    Merge "heat tests : add functional test for UpdateStack"

commit 0fa2903fac98b31d46e546714ea9f2c71f130837
Merge: 0549320 f8f0fac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 15:57:25 2012 +0000

    Merge "heat tests : functional utils support for UpdateStack"

commit 05493200445075782c8d5ed009ef8989d0f71ef6
Merge: 49ce173 8c191d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 15:56:55 2012 +0000

    Merge "heat tests : Add new boto API test"

commit 49ce173820ec8bd1928252a8eacb85d4373711dc
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 8 16:21:25 2012 +0100

    heat engine : workaround lack of no_cache on essex
    
    no_cache novaclient fix doesn't work on essex, so try
    both the essex and the folsom compatible novaclient
    prototypes
    
    Change-Id: I0749f821981550d7a5f5a95e2f5951c77d8e1529
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c491afaef6c5af6e28382eaadb6fe584061f9702
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Mon Oct 8 15:20:37 2012 +0100

    Avoid create_stack RPC call timing out on precise
    
    The create_stack RPC call times out on Ubuntu as novaclient
    blocks expecting stdin when prompting for a keyring password:
    
        Please set a password for your new keyring
    
    This probably does not occur on Fedora due to the version or
    presence of the python-keyring package differing.
    
    The problem can be avoided by ensuring the no_cache flag is
    set on the novaclient.
    
    Change-Id: I3ac9e74571ff837cd07fc3f36ecf706180f4dc46

commit dd6975eadc7720c4dcd8624a1fb43c9ccb820259
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Mon Oct 8 12:51:17 2012 +0100

    Fix hash-bang directive in nova_create_flavors.sh
    
    The script employs bash-isms, so the directive to use the
    Bourne shell causes some predictable failures:
    
      nova_create_flavors.sh: [[: not found
    
    ... etc.
    
    Change-Id: I60f3de55d2ebbfa47d444ec72c07728bbfa38be6

commit f912bfc4d03f8c801c2b4d29bd1c9fa1a3396ced
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Oct 5 10:07:53 2012 +0100

    import gettext to fix db migration execution

commit 8c9bd2a71b917d89cdb131669b581c0ce59e9683
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Sep 28 20:04:16 2012 -0400

    Make sure to remove python-glanceclient too
    
    Change-Id: I44c39824f5b1d96ac69e6972506fc865718b3c59
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit cdd392ba816bfda1c866b590be051111035ab2a4
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 27 14:12:59 2012 +0100

    heat tests : add functional test for UpdateStack
    
    Add new API test to prove UpdateStack action
    
    Change-Id: I656f3965a222ee1dcd890d4e4491f5550fada461
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f8f0fac96ec086f1b2ebc6c780155a0a0caa56e7
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 26 14:37:07 2012 +0100

    heat tests : functional utils support for UpdateStack
    
    Add Stack.update method so UpdateStack API action
    can be tested
    
    Change-Id: I2fdc37b15eab9b7d786153877755a631fda0ad2a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 8c191d49a1082e712dec24856f47835fcdd5b26e
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 24 17:41:23 2012 +0100

    heat tests : Add new boto API test
    
    Add new test_CFN_API_Actions_Boto.py test, which
    tests the CFN API via the boto client
    
    Change-Id: Iad796da35009fbad0ce21ba0d7ab73c2fd16cd7d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ed998e8c287ee7290246178e0b8feb98eec95096
Merge: 2abd571 9e237f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 28 01:42:09 2012 +0000

    Merge "Add the beginnings of an OpenStack ReST API"

commit 2abd5713e1b519610a595bda31945b9c7e6dc852
Merge: 00faf05 988092b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 28 01:32:49 2012 +0000

    Merge "Unit test for DBInstance resource."

commit 00faf05e5c47c751a2118a913c967181a6ba2f6c
Merge: f26b218 642d740
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 28 01:30:34 2012 +0000

    Merge "heat tests : API test fixup for ResourceProperties"

commit 9e237f5a665042db2d592a4a0977cff933062590
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Sep 25 16:13:35 2012 +0200

    Add the beginnings of an OpenStack ReST API
    
    So far only access to stacks (not resources and events) is implemented.
    
    Change-Id: I9655e9441087ef60c06e67e2d6ae68ec4a3b2d11
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 642d740b86e07ec2fc60119cb62c0dabd2a28314
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 27 15:00:50 2012 +0100

    heat tests : API test fixup for ResourceProperties
    
    Fixup CFN API functional test after ResourceProperties
    format change
    
    Change-Id: I91d88443bc885163cffafc83615aa0cfa8d3ff83
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f26b2188319a293b4dff6a88c571215798634e85
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 27 14:40:52 2012 +0200

    Allow separate versioning of each API
    
    Previously, all APIs used single versioning definition. Since these are
    likely to change at different rates (AWS APIs are unlikely to change at
    all, but OpenStack APIs probably will), give each their own version
    definition.
    
    Change-Id: I6985205dfcb5baf6f49ad32b091d811f97d1552a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 3c85e1941f95e30b2c592117b4b6b23cecb87bbd
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 27 14:43:34 2012 +0100

    heat API : return ResourceProperties as JSON
    
    For boto to correctly parse the API DescribeStackEvents
    action, the ResourceProperties key in the response
    must be a string, as per the AWS spec, so we encode the
    properties in a JSON blob
    
    Fixes #245
    
    Change-Id: Icd38984836a941ed4a012b06382933bb46f43c4f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 715a62d2b4fd2fd9169254835234e7861027579e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 27 14:57:50 2012 +0200

    Move CloudFormation API to heat.api.cfn package
    
    Change-Id: Ib0adf6f38da298b0b87d80272904767066b41087
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit e890e7d422fd07dc022b9b755a575519d849b1f8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 27 11:49:07 2012 +0200

    Make the keystone service type configurable
    
    We will eventually need to have clients for both the OpenStack and
    CloudFormation-compatible APIs, and they will need to have different
    service types.
    
    Change-Id: I06ae727c17c245ae60934bbed6e1631c7ad5fd77
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 988092b70b3b53c6f9277c3a208f50395b4a7e16
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Sep 26 15:53:03 2012 +1200

    Unit test for DBInstance resource.
    
    Coverage is 100% assuming you don't count the
    nested template as code.
    
    Change-Id: I846ed736d75eeef8723c33db7cae889a26049d9a

commit 5208008db047d8cda231100db817c6f0e1c190a5
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Sep 26 10:08:05 2012 -0700

    Add a Folsom specific heat-keystone-setup binary to bin
    
    Fixes issue #253
    
    Change-Id: Ie223c43c15ac806da393e3d532ef410526ac16ce
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit ff10a55f16f4579ad3ec9e600b8448606242fd50
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 26 16:21:33 2012 +0100

    heat engine : format stack outputs for updated stacks
    
    Fix bug where stack outputs are not formatted when
    stacks are in UPDATE_COMPLETE state
    
    Fixes #250
    
    Change-Id: I8936c8e62b8c9b1f28f09eb5b8c50eb79cb76eb2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d9f63269f1a0205811cd84487787c8c1291a952b
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 26 14:51:08 2012 +0100

    heat : fix glanceclient deprecation warning
    
    glanceclient module name changed for F18, so do
    a conditional import which should import the correct
    version provided one is available (tested on F17/F18)
    
    Fixes #251
    
    Change-Id: I095560f29a408949a7d54795fc000c094b1d63b9
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 8f1de0c11ae7d2c357656f73590f9e3b3f73c990
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Sep 25 11:46:08 2012 +1200

    Fix test_waitcondition.py race by converting to mox.
    
    Eventlet calls and metadata state changes are now
    mocked, so there are no sleeps, and in theory no
    chance of races.
    
    Change-Id: I05fee73a8cefafe1f2bb5a4ca65c585933497475

commit adb6adb516be589f090a15488b81c1f5ee64821a
Merge: 6e3505e aab5902
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 24 14:57:28 2012 +0000

    Merge "Rename heat/cloudformations.py to heat/cloudformation.py"

commit aab5902a1b485a27cc0a1c83559ee70fa5de76fc
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Sep 23 21:34:20 2012 -0700

    Rename heat/cloudformations.py to heat/cloudformation.py
    
    Change-Id: I1db2e5b191b35a07aa51113829d95085bfbfc8e7
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 6e3505e33b40fa72715dbe7c200b76b8e4d5b7c2
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Sep 18 14:31:57 2012 +1200

    Trivial unit test changes
    
    - rename assertEquals to assertEqual
    - fix the swiftclient package import, which was broken
      for testing
    
    Change-Id: Icbe80ded918b9b2d089797645bf8d46a9efaf619

commit 54d53d307d5378a15c627b642fae6246fe33a13d
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 24 15:26:56 2012 +1200

    Switch to in-memory sqlite for unit tests; 1500% speed improvement.
    
    All unit tests now run in 4 seconds, instead of 64 seconds on a HDD.
    
     _ENGINE global setting had to be moved into get_engine() so that migration works, otherwise get_engine() creates a new isolated in-memory database for
    every call.
    
    Other unit test speedups in this change are to stub out some eventlet sleeps
    which saves about 5 seconds.
    
    Change-Id: I3643b73dd9bd86c414934b7c78db67402587f570

commit 71324379f93c255f852d24e989b07aaf08358dc2
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 24 09:08:20 2012 +1200

    Move test skipping on import failure from package to function.
    
    This gives a better test output on what has been skipped and why.
    
    The unittest2.TestCase class has been removed because it is unused and
    unittest2 is not available to the gates.
    
    Change-Id: I1b5ae0845b2ef8dadc5cff42770ef062ea4e862f

commit 2ae14776f1378fae928a83f085124b02ffb7e75b
Merge: 79e2e76 b879228
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 23 22:24:47 2012 +0000

    Merge "Get rid of gratuitous params in RPC API"

commit 79e2e764aaf31521002107978595051e94be31fa
Merge: c663b63 312ff2d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 23 22:17:15 2012 +0000

    Merge "Stop deprecation warning when creating resources directly."

commit b87922862f031483c781562cfb1bef5433bdb7e6
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 21 17:12:46 2012 +0200

    Get rid of gratuitous params in RPC API
    
    For historical reasons, we were passing all of the parameters from the query
    string received by the AWS API to the engine as "params" in many calls.
    This is not required, since all of the relevant information has already
    been extracted.
    
    Change-Id: Iedec5b442ccb0b358afc8a4e06f60672890aba05
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c663b6381d28303116152df02d870bf7de2b6514
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Sep 21 15:18:36 2012 +1200

    Unit test coverage for user resources, plus some user fixes.
    
    - User 'Policies' attribute removed since it shouldn't exist
    - fixed 'SecretAccessKey' attribute in AccessKey
    
    Change-Id: Iff7cf0bda074cb615045e7236f274cafa56909f6

commit 36af6c7a3067ddfa893dcd4ae03830556407a9fd
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Sep 20 17:11:47 2012 -0400

    Change file to executable to get rid of rpmlint warning
    
    Change-Id: I5274c04bca9c5f089c39a241cc2ba4ea96e279ac
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 580b0d667d318b58e584b1ee0d86cbce0a4a9ecc
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Sep 20 14:15:49 2012 -0400

    Version 6 about to be announced for release, time for v7
    
    Change-Id: Ie85008bc7acce7535268fec0a62a0fda7bbbd1ec
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit d2c8b97015352da73c2dc9463f8d20c6a98dea04
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 20 18:10:29 2012 +0100

    heat : HA functional test missing import
    
    Change-Id: Ife9b85c321b41f9d838bf413734a803f858d93c8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f5033cffb6ec4de1d055079f6f4cfe29e507c52f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 20 17:59:11 2012 +0100

    heat tests : convert HA test to exec_sudo_command
    
    Use exec_sudo_command to ensure sudo command works
    
    Change-Id: I9e4b25de04112f860c40604f6152f86efd937468
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 89b052aee4dd7d4399bc0f137739a2a0f86f098f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 20 16:02:27 2012 +0100

    heat tests : Fixup IHA functional test
    
    Add more prints to monitor progress and ensure
    the halt sudo command works by using the new utils
    function, workaround paramiko SSH issue
    
    Ref #246
    
    Change-Id: I656925e61b878a9f2eabfbd65bee796d9d8ee54d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 0991ed88f25771d5adde2119c5b967cd4b397816
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 20 14:37:41 2012 +0100

    heat tests : functional tests add exec_sudo_command
    
    Add new method in the Instance class, which uses paramiko
    invoke_shell instead of exec_command, so sudo commands can
    run despite requiretty being set in our sudo config
    
    Ref #246
    
    Change-Id: I3be691167d4c757b68e589261d6f3a1263d77e69
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 2652832ef3594329fd0afb66ec1c5d8836987c18
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 20 11:14:53 2012 +0200

    Don't fail to delete if VolumeAttachment not found
    
    Change-Id: If12b7ebbee2d71e39e49152d971c11f55badca18
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a974326cd7b72518178fa077b842b96867515aea
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 20 11:14:53 2012 +0200

    Improve debugging ability for functional tests
    
    Use proper assert*() functions so that we can get some information out of
    any failed tests.
    
    Change-Id: I92d937015562371c2b39bbcf5b9cbd2b6ca19d52
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4dab6823640d51ab01d191194c98d5fcf1a46e35
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 20 11:14:53 2012 +0200

    Fix typo in test file name
    
    Change-Id: I6c55e9ca8deaab41f8ed47e09553d1ad4811d879
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4cb19b8f437b6cdd4effed274bca51aa088787ff
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 20 08:51:02 2012 +0100

    heat tests : fixup test_CFN_API_Actions.py
    
    Fixup CFN API test following API keyname change ref #244
    
    Ref #243
    
    Change-Id: I6c235949ee6bb950d0cc5fa39391ee2b6073b0a0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4f558eb479eefbde404a1b422f96877d59868d23
Merge: 377a133 1721bac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 20 03:05:06 2012 +0000

    Merge "Unit tests for autoscaling resources. 100% coverage!"

commit 312ff2dfeec87aad98c0383ab465d8cc30cd7ef1
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Sep 20 14:51:48 2012 +1200

    Stop deprecation warning when creating resources directly.
    
    This change stops the following warning from being logged:
    heat/heat/engine/resources.py:141: DeprecationWarning: object.__new__()
    takes no parameters
      return super(Resource, cls).__new__(cls, name, json, stack)
    
    Change-Id: Icf6187fdcc460d9cd732ebfc0cf14390dc240c5c

commit 377a13308a43bb7caf2635bf0da0c7e9ab05800e
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Sep 20 12:05:48 2012 +1200

    Unit tests for volumes and attachments
    
    Change-Id: Id8f1bab9d4cb782830e38a30a6411095d3710273

commit a1ff5662bfa1e3e3c8f53d47ac6b6d18f00d556c
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 19 15:56:26 2012 -0400

    Update another embedded template to F17
    
    Change-Id: I4244c98f72bd38afe6d6cd0c7a64aa69b79b578d
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit ed64506fcf4df813bef01f047fe64f5c6276f116
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 19 14:56:37 2012 -0400

    Changed embedded loadbalancer template to use F17
    
    Change-Id: I7d06045198add18b020736c9e019e848592c7d60
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 722da7e22c2c9263fd3d4d5a8dd2c0c88d8fc4b2
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 19 16:12:52 2012 +0100

    heat API : fix wrongly named key for stack events
    
    We return a key of "ResourceStatusData", should be "ResourceStatusReason"
    
    Fixes #244
    
    Change-Id: I692825b0c800815777e9f73bd7060a108e16e45a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 89a3cf01e8211df96a0e58d31d73746c1d8b6d84
Merge: 09f2744 ed282f0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 19 15:10:45 2012 +0000

    Merge "Fix scoping issue"

commit 09f2744c8e8eb9e31b91176acaa63957163b5be0
Merge: 73a8743 9c2bd62
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 19 15:09:21 2012 +0000

    Merge "Make instance match expected name"

commit 73a87433678f04b99a566340934b2f3f2557c8bc
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 19 11:48:29 2012 +0100

    heat : ensure DB user creds aren't written decrypted
    
    Return the decrypted user_creds record as a dict copy
    and do not decrypt the credentials direct into the
    sqlalchemy model object, or we can inadvertently
    end up committing decrypted credentials to the DB
    
    Ref #218
    
    Change-Id: I0df9afcb271804557c94cdf0c913f7a26affdc83
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ed282f09ccb1ebbe56f5bfd1366099424633bd0d
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 19 00:41:37 2012 -0400

    Fix scoping issue
    
    Change-Id: I03ed3e503b7888591dd10c647296792f24679743
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 9c2bd6216f7cfb1215dadcda3a6e15795006fb50
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 19 00:01:12 2012 -0400

    Make instance match expected name
    
    Change-Id: Ic94cf389306ac45679601bcdcfbef98bc83e2453
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 52f5d7c7fed085d695089cd8fbba8b70c7142964
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Sep 18 22:19:59 2012 -0400

    Look for instance name that matches template
    
    Change-Id: I8963b36fa4c4530cfec9c388c5758812d7d1bddc
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit cd47a395afce13d060434540f1900fec9753d631
Merge: 71eeb88 77a31d3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 17:14:24 2012 +0000

    Merge "Implement test_AutoScalingMultiAZSample.py"

commit 71eeb8882537e0daee8daf74fd593cdf84a07e82
Merge: 31c1eb9 66aa7c3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 17:11:38 2012 +0000

    Merge "Tag functional tests with the JEOS required"

commit 31c1eb907c5c7e484017c4e5bd15593f2e9bd708
Merge: fa9905d 3a850df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 17:06:31 2012 +0000

    Merge "Make automated scripts quieter"

commit fa9905d87a51fb1ff8bf311c31ba1621c67a9046
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Sep 18 09:49:46 2012 -0700

    Provide full URL address in AutoScalingMultiAZSample.template
    
    Fixes issue #242
    
    Change-Id: Iafcf32f22f7a59ce08473981c7ff332bb1eb47f8
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 66aa7c33692399c96834915b99ad805b99b7f670
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Sep 18 17:59:51 2012 +0200

    Tag functional tests with the JEOS required
    
    Change-Id: Ie0204d5382d402058b5538884d42512e724e94db
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 3a850dfe3287b82fc0850ef9056a5a9de6cfd6d9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Sep 18 18:01:56 2012 +0200

    Make automated scripts quieter
    
    This eliminates a lot of not-very-interesting stuff from the test logs.
    
    Change-Id: I20bd90f8875645ef02ce3423a555c523b62ca4e3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 77a31d31b226e081b6dc9a1681f61aeb22a0926f
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Sep 17 17:49:32 2012 -0700

    Implement test_AutoScalingMultiAZSample.py
    
    Fixes issue #200
    
    Change-Id: Iaea2d01a9659c703986d009fb9c0605ba6d0279f
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 2af388ae9c6fdad8972f036b5bcdeb79ca05a8df
Merge: 15e02a2 28b4d3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 16:01:32 2012 +0000

    Merge "Remove unnecesssary nova constructor calls in each manager API call path"

commit 15e02a245e719d440d0152e0ea264e362536fb3b
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 18 15:59:04 2012 +0100

    heat engine : loadbalancer add missing calculate_properties()
    
    Add calculate_properties() call to ensure the user defined parameter
    values are correctly updated in self.parameters
    
    Ref #241
    
    Change-Id: I7f4ec0ac546a5599359b6aa2e713ea1b6051ff34
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 84c04e38731d2d49e55f754e5ffeeb117c8b74f2
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 18 13:28:49 2012 +0100

    heat engine : convert stack resource to physical_resource_name
    
    Covert stack.Stack to use physical_resource_name or nested stack
    references are not fully-qualified
    
    Ref #241
    
    Change-Id: I6e38a7de5af5fe79ddc62cfee9dfe26cae30df6c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit fd2c75938abbcb2eb434efaa4d3114c76288d7d6
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Sep 18 13:15:06 2012 +0200

    Return exit code rom run_tests.sh
    
    Change-Id: Iddec2eb8e552f88bd04657536df094355b96b804
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 84da9d441df3edbc0ae0fb2f46fcdd31aa413362
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Sep 18 13:31:37 2012 +0200

    Avoid test runner crash when we have no tty
    
    Change-Id: I6dac94a98b9125d3371c19fa14a0de9b4e766820
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 1721bac83097291b52d05e1fa9ba8c713ab93551
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Sep 18 14:30:00 2012 +1200

    Unit tests for autoscaling resources. 100% coverage!
    
    Change-Id: Idff792aa4898b14f3a55b5b44e6133cdcf496e97

commit 86c76940078506aa5b6610511f6763a1b2267733
Merge: 85cd0f0 f309e51
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 00:42:28 2012 +0000

    Merge "Use stack_identity where it has changed from stack_name."

commit 85cd0f09743c42f4ba05cb8a8db7185486a48db5
Merge: fbcf37f 2080423
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 00:41:37 2012 +0000

    Merge "Tests EIP resource creation and association."

commit fbcf37f17a9c244e4e18f736f4fc0c701d952e2e
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 17 23:23:49 2012 +0100

    heat tests : New wordpress IHA functional test
    
    Add new test_WordPress_Single_Instance_With_IHA test
    
    Fixes #213
    
    Change-Id: Ibacfe4d5eb57c470a3e2a000ec794adfb432c081
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 2080423d2eaab34b804cdab6f8a24828979ba2b0
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 17 14:07:08 2012 +1200

    Tests EIP resource creation and association.
    
    Change-Id: I3af9556930a447eeba6e3152d004ddae7999d638

commit d81d3406ba375b1ad35d2330b0b1015e16436c8e
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Sep 17 12:57:27 2012 -0700

    Allow linux distribution to be passed to multiaz template for test case
    
    Change-Id: I054c3ad72cea2727dd8f5956166d753fff7363e7
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit c5d512465979d0c3851352736ca0acc7091722a6
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Sep 17 12:51:21 2012 -0700

    Fix backtrace when using loadbalancer
    
    Loadbalancer incorrectly tried to reference a string as an integer.
    
    This resulted in the following typeerror which is repaired by
    thi patch:
    
        timeout_check = 'timeout check %ds' % (health_chk['Timeout'])
    TypeError: %d format: a number is required, not unicode
    
    Fixes issue #240
    
    Change-Id: I7e2697200d3fa9b0cb009f3a7898d487b70fc23a
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 77864991de744096976936eebaf61d0f7fd4440e
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Sep 17 12:09:59 2012 -0700

    Fix spelling errors in loadbalancer which resulted in template not launching
    
    Fixes issue #239
    
    Change-Id: I20f685598b90a40ed0452af8b7c018a1bf7e0492
    Signed-off-by: Steven Dake <sdake@redhat.com>
    Signed-off-by: Tomas Sedovic <tsedovic@redhat.com>

commit 28b4d3e37ccf1adffa0d3327736964d03dc6c472
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Sep 16 12:40:02 2012 -0700

    Remove unnecesssary nova constructor calls in each manager API call path
    
    auth.authenticate() creates a nova client object.  This nova client
    object is never reused introducing a 40msec penalty for each API call.
    The heat-api-cfn module authenticates incoming requests.  In a
    properly secured environment (one where RPC is secured), the
    auth.authenticate() calls serve no purpose.
    
    Change-Id: I847af259f521a32a7bf3fda0ce3f72735f762a0c
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 37def2b2df7d945fe4300de893489c9364e2762b
Author: Ian Main <imain@redhat.com>
Date:   Mon Sep 17 12:12:24 2012 -0700

    Fix up tags
    
    Fix the remaining tags to include the template.
    
    Change-Id: I307d2a7a2678617f38ad3329b51855d5ca6614c2
    Signed-off-by: Ian Main <imain@redhat.com>

commit e32feeb448b388d31ac27e76e5bbad82b0e2d112
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Sep 17 10:41:41 2012 -0700

    Fix test_WordPress_2_Instances_With_EBS.py
    
    Change-Id: Iee70c20b4dc771da5cc84bcfe7bb1cd1ba5280d1
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 754fe2861ef4a739830de1a95fe27ed701ca8b69
Merge: a7a9fe5 e1c0b4e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 17 16:41:34 2012 +0000

    Merge "Change templates to launch F17 (not F16) by default"

commit e1c0b4eafcbefc441b105298afca69450bb13694
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Sep 17 17:46:45 2012 +0200

    Change templates to launch F17 (not F16) by default
    
    Change-Id: If8b97e85f2dca5251145a8eebb184e43e25a34ea
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a7a9fe515cecc44fde6864a4e6c5e257f68b46a2
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 17 16:57:46 2012 +0100

    heat tests : add HAProxy functional test
    
    Add new test_HAProxy_Single_Instance.py functional test
    
    Fixes #202
    
    Change-Id: I34818756dc5d8ac1f42302118eaa630348946d38
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 96af1144b08d9d08d54528c37e9dc0d5e0c23bb5
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 17 16:56:36 2012 +0100

    heat templates : add LinuxDistribution parameter to HAProxy
    
    Add LinuxDistribution section and mappings to HAProxy template,
    to align with other templates and for compatibility with functional
    test infrastructure
    
    Change-Id: Ib86ac4f587aebf712df1c9ad09cebc44f853e114
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 81e835841c9f63a5c6f5a7dc1ef0732493fce3d4
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 17 16:54:23 2012 +0100

    heat tests : functional tests allow non-default stackname
    
    Allow the default "teststack" to be overridden, so multiple
    stacks can be created in one test
    
    Change-Id: I09a4128b98df7af6c6b85552ac2175919a697c50
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 0ad5ab9748e49196b4105528b6634213b4e596c2
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Sep 17 16:53:09 2012 +0200

    Switch to Fedora 17 on guests in Getting Started
    
    Change-Id: I24ff5305876d91828e15f89e363d03bbf6bed923
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c53b4fb733407c92f076faae6629a608aa3f26a2
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 17 10:59:56 2012 +0100

    heat : Show user parameter values in heat describe
    
    Return an agregate set of stack parameters via heat describe
    and underlying engine show_stack call, so we see the template
    parameters, and any user-overridden values (ie don't just show
    the template defaults, which is not really very useful)
    
    Fixes #238
    
    Change-Id: Ia2cc3271f0dcf8c986e968bc21775d31ecbe6228
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit fdbd64dd2d0f364c0fd4a510ae4e124855a17eae
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 17 10:45:53 2012 +0100

    heat tests : expose keyname from Stack object
    
    Expose keyname via Stack.keyname so it can be acccessed in tests
    
    Change-Id: I7bca1acad150647d525c0a51f4ce75b0ba21050d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 42f2fd86f3942529afe5c21a128c30fe7cf76c89
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Sep 17 11:46:11 2012 +0200

    Work around nova-network launch issue harder
    
    Change-Id: Ia1bf8cb2f0e23755100713c1289baa371bbfb956
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 397488959fca2fb74c9d6851941dae601fa3e1c1
Merge: 8df32a9 1a98136
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 17 07:46:00 2012 +0000

    Merge "Use openstack.common.timeutils.isotime()"

commit f309e5190062f938e0fdcc14b433c87d858b52de
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 17 13:11:59 2012 +1200

    Use stack_identity where it has changed from stack_name.
    
    This is causing my test_rpcapi to fail.
    
    Also, attempt to enable test_rpcapi by setting
    @attr(tag=['unit', 'rpcapi'])
    
    Change-Id: Ie831ddddaccc4245a18e5bc754cbf413cea65741

commit 8df32a93d2efa66905ab85260ee03c6f2ba0b227
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 17 12:03:05 2012 +1200

    Unit test S3 Bucket resource with associated fixes.
    
    Change-Id: Ib23ed500385c299247bf80062a7a4342f5afe1d2

commit 1a98136a64be413f63044312df40ad459b5a0262
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Sep 16 17:00:56 2012 -0700

    Use openstack.common.timeutils.isotime()
    
    Remove heat_utils.strftime() and replace callers with
    openstack.common.timeutils.isotime().  They do similar activites, and
    since its carried in common, makes more sense to use that version.
    
    Change-Id: Icd919fb218a5f97be103eda7814a5fb56e1b0a02
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 77700c10bf6187b4cf0f84d82309d499134d0a7c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Sep 16 20:49:05 2012 +0200

    Work around nova-network launch issue
    
    Launch nova-network *after* nova-cert to work around the SELinux error in
    https://bugzilla.redhat.com/show_bug.cgi?id=857747
    
    Change-Id: I2ca4af4b950cca92cdd2785c493d8453648ccbb0
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 137e3592223f5a4f4591cf30e1bc197b4058da8c
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Sep 14 21:52:15 2012 -0400

    Change rpc cleanup to occur before killing engine thread
    
    This bug only manifested itself after a heat request was made to the
    engine. Once a request was made a Qpid connection handler continued
    to wait in a select call, presumably for a subsequent request. Closing
    the connection immediately after detecting a keyboard interrupt and then
    terminating the thread yields a clean shutdown with no traceback.
    
    Closes #176
    
    Change-Id: Ifdb82d33a6c52a004bbd6b08c564264f4140e800
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 1650f849fb09bbb521360b352248f63c26b1752e
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Sep 14 01:44:37 2012 -0400

    Add new OpenShift test
    
    New utility functions added to add/remove host file entries.
    
    Closes #204
    
    Change-Id: I182b451a25e22a558d1b4073e981cdc826ab836d
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit e5ce50eaf39feda335d2c5d620297aeb4ea9fbe1
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 13 18:11:10 2012 +0100

    heat tests : new functional test for CFN API
    
    Add new test which tests most actions of the CFN API
    note UpdateStack, ValidateTemplate and EstimateTemplateCost
    are still TODO
    
    Change-Id: I814508871ddd81495f5d41d38e8e724ab4d03765
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d0c394542c1d5ba96da98c47a7468f0e92c678e2
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 13 10:59:17 2012 +0100

    heat tests : Update test_WordPress_With_RDS
    
    Update test_WordPress_With_RDS.py to use new test infrastructure
    
    Change-Id: Iea78e4d2507f0f59db3528b475e6981ea027a617
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4481b66624904e9d04bb91a02b658c4690dedfac
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 14 13:36:45 2012 +0100

    heat tests : remove duplicate cleanup Wordpress_Boto
    
    Remove the duplicate cleanup call, should only be in tearDown
    fixture
    
    Change-Id: I43cbe28694b248550689be08522d9774a38e6f64
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ef809d370a4c28a77d7d28fe54124d06075ceae2
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 14 11:59:58 2012 +0100

    heat tests : bugfix utils cleanup function
    
    end state for stacks is DELETE_COMPLETE, but then they
    are deleted, hence we need to test for either DELETE_COMPLETE
    or a null result to avoid false failures
    
    Change-Id: I7e35c5a734d1005fa38d587353cbca5b911ec77b
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 8357920281c017f316b1fc214ddb621efa5bc667
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 14 10:34:35 2012 +0100

    heat tests : bugfix utils cleanup
    
    Initialize tries variable or we get a referenced before
    assignment error
    
    Change-Id: Ic8eb68ced893fb89844e81e895c766e8f8b04bee
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f397d7ad5292689ce106dd7de9579651a6d2be4c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 13 21:40:49 2012 +0200

    tests: Wait for delete completion
    
    Wait for the stack to actually be deleted before ending the test.
    
    Fixes #233
    
    Change-Id: I4f2060ff73615bcb16ac9cba3d7062117cca08dd
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit ab754ba493a282c0790e72a73d0f09d26cb50cf3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 12 16:12:45 2012 +0200

    tests: Clean up after a failed functional test
    
    Ensure that whenever a stack is created, we delete it after the test by
    putting the cleanup() call into the tearDown() method. For this to work,
    we must also move the actual creation into the test itself, since an
    exception during setUp() will mean that tearDown is not called.
    
    Change-Id: I481e691f07c1af9e931258d7ba4453b2037c62ad
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit e7bd43657d7f0f881b66ae1eec4c87cfbe57923c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 13 17:42:34 2012 +0200

    tests: Make StackBoto inherit more from Stack
    
    Change-Id: Ie2b6f2e6dd7d3f75622422d68449972ee7eceb00
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f5dfdff4b8eedc25af8c329ecc5e5490aec9a5ff
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 13 20:56:48 2012 +0200

    tests: Fail promptly on stack creation failure
    
    Fix the functional tests to report failure as soon as stack creation fails,
    rather than waiting 80+ minutes to time out.
    
    Change-Id: Ie48a84c7bb3ab274337297cc740b78d58d8ed4a6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit ed33a8dc90468f2873a4a581c22027f10d9393d4
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Sep 13 11:36:31 2012 -0700

    Add Wordpress_2_Instances testcase
    
    Fixes Issue #205
    
    Change-Id: Ic7a08b2ac278a032033bec47bbfe53aeb11b253e
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit d17039840e171370bfd7e233c49719f0cd76d4bb
Merge: ec0f4ef 0660460
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 13 17:56:15 2012 +0000

    Merge "Add test_WordPress_2_Instances_With_EBS_EIP.py"

commit 06604600fbdb6d69ebe7e2e13a647ba3915e7b91
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Sep 13 10:13:58 2012 -0700

    Add test_WordPress_2_Instances_With_EBS_EIP.py
    
    This work is based upon Tomas Sedovic's work.
    
    A floating ip checker is added to instance() in util.py
    
    Change-Id: I138a5f7bc0c5d04bc5308a80113f3057440578b9
    Signed-off-by: Steven Dake <sdake@redhat.com>
    Signed-off-by: Tomas Sedovic <tsedovic@redhat.com>

commit ec0f4efd32b66a883680c707e5c0c32f82f7d847
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 12 12:07:51 2012 +0100

    heat tests : functional test utils add response_xml_item
    
    Add response_xml_item method to Stack, which allows stack
    API XML responses to be more easily parsed base on xpath
    prefix and keyname
    
    Change-Id: I96437bd7ff4575e9262d46c4c21f4408041e147d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 411656a5d6b29ccbbf4bf1157c0c89e7f3cd6b4e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 13 17:50:29 2012 +0200

    Fix timing issue in starting openstack-network
    
    Change-Id: I31f3092f95b140015d661ebd86bd1567c607f3d4
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit dad88e25b1abcb7e123c1a13205107fb793ac4a2
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Sep 13 07:17:24 2012 -0700

    There is no spoon take 2
    
    ugh
    
    Change-Id: I746c721ed779b1c63592fa0e07053d27ef4231a0
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit a4fdfd41195efcadc67f598b223f3691b63848bc
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Sep 13 06:59:03 2012 -0700

    There is no spoon
    
    There is no name, only resource_name.
    
    Change-Id: I1455d497c68fb650d3aef0f1232872f441005c0d
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 5553ac7ad6e0951cd8b31474eaf25c2512c71e4b
Merge: 4063e2d 614287a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 13 13:19:07 2012 +0000

    Merge "heat : Revert "Make sure the properties are defined in all cases.""

commit 4063e2d70f0a864f011a0d998b3585974f7701bd
Merge: b4287c2 38e3b5a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 13 13:18:58 2012 +0000

    Merge "heat : bugfix convert User resource to physical_resource_name()"

commit b4287c209ec53e6ae6209fc203cb928b4b03fb20
Merge: da37711 61ba35b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 13 11:56:15 2012 +0000

    Merge "Update openstack-common"

commit 614287a9645ab6b32fe9fc71a99a1a7308bf61d3
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 13 12:01:03 2012 +0100

    heat : Revert "Make sure the properties are defined in all cases."
    
    bugfix : backout #194 fix as it breaks RDS (or maybe all resoures
    implemented as nested-stacks)
    
    This reverts commit ae0b853499296763dae77aa5c1e4c22225674489.
    
    reopens #194
    
    Change-Id: I349a1625a040e33e080549a137824d1d2cfca9f8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 38e3b5a24a026e0fa087db9ade14182af752d377
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 13 11:27:15 2012 +0100

    heat : bugfix convert User resource to physical_resource_name()
    
    engine user.py needs the self.name references changed to
    self.physical_resource_name() to align with the recent resource
    naming changes.
    
    Change-Id: I4620a4afc5e9c11d7b6d9348aaac35bcfa31bbac
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit da37711c68d885bf883b49aec3ce05917e9c5bbd
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Sep 12 22:43:30 2012 -0700

    creating instances failed as a result of regression in last commit
    
    The previous commit to the tree organizes resource names by
    stack.resource.  Most of the openstack APIs take resource ids
    but the instance create operation requires text identifiers.
    
    Rewrite the text identifiers for the nova security groups before
    starting an instance.
    
    Change-Id: I8a842868781ecb353f66b5a4e3d022766a4c8a0e
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 61ba35be90d0241b066badb0149b0a5dd8c5528b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Sep 13 13:50:24 2012 +1000

    Update openstack-common
    
    Change-Id: I002574a60b4f59543bc6aa73256c2f0b3b79d378
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 04701a275f9712865bc5b7ea458bb7123f3a34d7
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Sep 12 15:12:50 2012 -0700

    Make physical resource names unique based upon stack name
    
    Some templates use the same resource name when registering with
    nova.  Nova will not allow mulitple resource names to register
    with the same name in all cases, and in those it does, it often
    becomes confused (in the case of EIP).  This patch creates a
    dot notation
    
    For the LB test, an example of the resources would be:
    teststack.LoadBalancer.LB_instance
    teststack.DatabaseServer.MySqlDatabaseServer
    teststack.WikiServerOne
    
    Fixes Issue #160
    Fixes Issue #136
    
    Thanks to asalkeld@redhat.com for helping sort out the unit
    test cases.
    
    Change-Id: I14f4551feb41c7f98caa30dd98f997da6d00c467
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 640c0a3e5f5ccca02d152d101e150d87b51e14eb
Merge: 7044fc5 d24e8c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 12 22:41:25 2012 +0000

    Merge "Add 2 instance with EBS test."

commit 7044fc5edc2ecc448775891628706ca41405fe0a
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 12 16:25:25 2012 -0400

    Change Stack to support user defined parameter
    
    This change allows tests to specify DBUsername/DBPassword if necessary.
    The keyname is still looked up in nova and the distribution is retrieved
    from the already existing Stack parameter.
    
    Change-Id: I3732ffb685d68c8a72a83247f74ed11a50a74cd1
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit fe95bd633a6b6d341052cd58814372551c75dc89
Merge: f2817a7 8da4ddf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 12 20:47:20 2012 +0000

    Merge "Make S3 import except on ImportError rather then all exceptions"

commit d24e8c746359169058e9c0577c2f843695ca3b55
Author: Ian Main <imain@redhat.com>
Date:   Wed Sep 12 12:12:31 2012 -0700

    Add 2 instance with EBS test.
    
    Seems to work even.
    
    Change-Id: Ie09d97dc86a68525783f1f9c080fed13e651ef78
    Signed-off-by: Ian Main <imain@redhat.com>

commit f2817a79d3fa6e08fcf0c98314e2ea8df6b72f8f
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 12 11:36:43 2012 -0400

    Change VerifyClass to have a generic verify_url method
    
    Change-Id: I0e1298e7852e336d6271c4014b11935ac3ce6689
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 14fe52e0e632e45657bcf1cef1dca397cc9a9e4e
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Sep 12 09:34:21 2012 -0700

    Update WordPress_Compsed_Instances to new test infrastructure
    
    Change-Id: I08a175d28b99b861ce29b2278e415896e79cf72a
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 8da4ddf51fedefdb1601baf7359e128f22f396e2
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Sep 12 08:11:30 2012 -0700

    Make S3 import except on ImportError rather then all exceptions
    
    Change-Id: Icb98aed65ccba825f8402fdde95ac38b2a12c1a6
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 1ba219d38df61ab4b0807c5fa730287ec903ccca
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Sep 11 13:49:09 2012 -0700

    Make S3 optional since swiftclient is not available in all distributions
    
    Change-Id: Ic5f61ac41090fd599f01b3eaae4ffb03aac2ebdd
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit e49050a87db1452907782b3d515d157c4c75248d
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 11 19:23:27 2012 +0100

    heat : test utils, extract ec2 credentials from keystone
    
    For StackBoto extract the ec2 credentials from keystone and
    pass them into the client, so the functional tests don't rely
    on ec2 credentials from config-files and only need the currently
    provided keystone credentials
    
    Change-Id: Ifc959011cc5b9ee77ebf04e380dc6a4059903c6d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ff352a0d10dbac6864bff65cb98b100107fb5060
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 11 19:07:00 2012 +0100

    heat : allow boto_client to accept credentials
    
    Allow ec2 credentials to optionally be passed in to boto
    rather than purely relying on config-files
    
    Change-Id: Ib821f2bca9bc3f61af521955a9ed52f0059e70e4
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 89bedcb4d2b7b67b55ccc551a1cb53a00d172e7e
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 11 19:05:36 2012 +0100

    heat : move boto.cfg to correct location
    
    boto.cfg needs to be under /etc not /etc/heat
    or boto won't find it
    
    Change-Id: I0981bb3bd46dd1630633576fc77d085410bf6362
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 455bb8889f66513c55aa60e189be3e7965a49fa9
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 11 19:03:41 2012 +0100

    heat : comment credentials in template boto.cfg
    
    Comment out the credentials section in /etc/boto.cfg
    this allows us to pass the correct host/endpoint without
    having world-readable credentials.  This can then be used
    as a template for per-user ~/.boto files if desired
    
    Change-Id: I4cea0cb3b790186ddc041edad0ab4ee4b7e8f956
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 33bfcd36d5c0e430eacc51c2693ee56d0c8dad36
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 11 13:08:22 2012 +0100

    heat tests : add new Boto wordpress functional test
    
    Add new test_WordPress_Single_Instance_Boto.py, which
    does a wordpress single instance test using StackBoto
    
    Note, this will require a valid /etc/boto.cfg to work,
    and probably a recent (git) version of boto
    
    Fixes #220
    
    Change-Id: Ia95de35dc9d1d52ba6b9f4fae333e4fad02762ca
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4c672508dd893d6d1094c4347201afbfe9765cae
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 11 13:06:09 2012 +0100

    heat tests : functional test utils add StackBoto class
    
    Add StackBoto, subclass of Stack, which implements stack
    setup using the boto client wrapper, allows us to test
    AWS auth and boto client libraries
    
    Ref #220
    
    Change-Id: Id5cb5ab72c7ba2e7accd76a73a94ff8fe45c62fa
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit a5510ea245b9f291a2a4a496c06aeb3c71322c9c
Author: Steve Baker <steve@stevebaker.org>
Date:   Tue Sep 11 14:58:34 2012 +1200

    Implement the AWS::S3::Bucket resource type.
    
    An attempt was made to make created bucket names readable and unique.
    Names are of the format heat-<resource name>-<random hex>. eg:
    heat-S3Bucket-b420d12d02e5d6e46f13
    
    Only the swift v2 auth is currently supported, which means swift will need to
    use keystone for auth. This may be a valid assumption for any environment that
    is running Heat.
    
    When DeletionPolicy is Delete then an attempt is made to delete the container,
    but the stack will still be deleted if container delete fails.
    
    Run the template S3_Single_Instance.template to give it a try.
    
    Functional tests will be coming in a later change.
    
    Change-Id: Ifa2c3c4fcbdb00a44f8c6b347a61f8e1735e8328

commit 1ef28a37068323a531da445815271f2b2e73ef65
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Sep 10 22:13:07 2012 +0200

    Update documentation on configuring metadata server
    
    The docs need to reflect the fact that the metadata server cannot be
    configured and launched until after Nova has created the virtual bridge
    interface.
    
    See issue #196
    
    Change-Id: Ia1a004106fa2b535b54c7b88e8ed177e47e72844
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 2e0dfbab47470e91fdbdbcfc81387692a5523fa3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Sep 10 18:04:34 2012 +0200

    Handle verification errors in create/update in cfn API
    
    If a StackCreate or StackUpdate call fails verification in the engine, we
    get an error message returned rather than a stack identifier.
    
    Fixes #224
    
    Change-Id: I5f47f5d0e25e8bc05633d29605adcc8827edd379
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a080c9465833049c691fb3d50d7cf4e591dbf4a5
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 10 10:52:13 2012 +0100

    heat tools : nova_create_flavors.sh additional retry logic
    
    Add retry logic in order to make creating flavors more
    robust.  Nova rate-limiting frequently causes actions to fail
    so wrap all requests in retry/sleep logic and check we can
    connect to nova before attempting to change anything
    
    Ref #225
    
    Change-Id: I1b1014df04602935f561c08ba29287061224b5f3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 15a88d03e5b187b31d17a00f1b845e5a8a749502
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 10 11:03:37 2012 +0100

    heat tools : add ephemeral disk for all flavors
    
    Add ephemeral disk for all flavors in nova_create_flavors.sh
    as it's currently not possible for EBS to work without a fixed
    mapping to a specific block device name, meaning the EBS templates
    will break for micro/tiny if there if no ephemeral disk defined
    
    Change-Id: I801f00aba5b431d30362cd4b34da2f66457220c5
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 0ca10d3e6a41d01435595defa33a7582f57dce68
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 10 10:49:45 2012 +0100

    heat tools : check services running after openstack install
    
    Check all expected services are running after starting them when
    doing tools/openstack install, should avoid possible racy behavior
    when we assume everything is up and immediately call nova_create_flavors.sh
    
    Ref #225
    
    Change-Id: I87ec0ca31579173cb9218fa79e027fd5b15031f0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c292ddb164bceab5883aa585a6a2357c0e33b7aa
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Sep 7 13:22:42 2012 -0700

    Rework functional test case infrasatructure
    
    To support multi-instance, two new classes were made:
    Stack - represents a stack
    Instance - represents an instance
    
    For multi-instance stacks, create multiple Instance objects
    for each instance in the stack.
    
    For each instance in a stack, an instance object can be created which
    helps validate the individual instance sets up properly.
    
    test_WordPress_Single_Instance_With_EBS.py fails - see issue #226
    
    Change-Id: Iddec87cd1332a9b5796c5c7e7d382ef723c3544e
    Signed-off-by: Steven Dake <sdake@redhat.com>
    Signed-off-by: Tomas Sedovic <tsedovic@redhat.com>
    Signed-off-by: Ian Main <imain@redhat.com>

commit 489ed4cab4410a2cc727a904bc53dfdd3b19e270
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 7 14:55:54 2012 +0200

    Add a string representation for identifiers
    
    This makes debugging in unit tests a lot easier.
    
    Change-Id: I320cdf754e405377abfeb61496b017809d25d719
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 48bac6ac6f4d6c5a90f2662c0f29427ffebccda7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 7 14:57:13 2012 +0200

    Add unit tests for EngineManager create/update/delete_stack
    
    Change-Id: I25aeb43ea3f5a9426b8f742a605b9699dc2b9851
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4793a68e3abb6f2e02ec8037d573f93c287ca985
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 7 14:54:55 2012 +0200

    Fix update_stack call in EngineManager
    
    This was broken by 38f886947c91ebf610ab2972649a06bec630746b
    
    Change-Id: I134bee2df35d6b025f0ac88334ab30a9a22c7922
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 55eb1746aa3fcf3c7ca85cb67d8ee09585773be9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 7 15:09:54 2012 +0200

    Reorganise etc directory for easier installation
    
    This also means that the install script will install bash-completion for
    heat.
    
    Change-Id: Ib60346c72ce6277951cb51952e359f97be20a1be
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a44519774a18cc86a6ede537c14bb7214b1aadc6
Merge: be128a8 e88e9e5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 7 03:58:50 2012 +0000

    Merge "Switch to keystone service_type=orchestration."

commit be128a81c61d6df9b60682cfa9ee48ba69f0ebc7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Sep 7 13:12:27 2012 +1000

    Delete unused heat-engine-paste.ini
    
    Change-Id: I4c8d5b2d98634aa4d711d3fe8816891476645548
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit ae0b853499296763dae77aa5c1e4c22225674489
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Sep 7 10:12:29 2012 +1000

    Make sure the properties are defined in all cases.
    
    fixes #194
    
    Change-Id: I994283734d551f81143e7f5de50da0180a277119
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 408ba2172deee7d775d37f22e9f7f377682940fa
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Sep 6 15:04:03 2012 -0700

    Add test case for WordPress_With_LB.template
    
    Change-Id: I324da126b5a775a00b97d868cbd347dd65cb16aa
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 245a13f8f3d514c4e4ed59fce0d1920727a230bb
Merge: 3b27b1d 2f9a131
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 21:50:36 2012 +0000

    Merge "Rename heat-api to heat-api-cfn"

commit 3b27b1d6b1c4739b8d456703542ec8182ce12277
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Sep 6 13:27:50 2012 -0700

    Add a Wordpress+MySQL composed instance functional test case
    
    Change-Id: I6a905b186be59c929e530519414e46d222b4ea08
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 882ef5228eb0835ee6e3a434e6ff6896afb05e2a
Merge: 248663b 78b7127
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 18:24:39 2012 +0000

    Merge "Add EBS test."

commit 78b712741942713692c64a306c0b10ca7fae3206
Author: Ian Main <imain@redhat.com>
Date:   Thu Sep 6 11:10:48 2012 -0700

    Add EBS test.
    
    Single wordpress EBS functional test.
    
    Change-Id: I3a3e53b418a38a2bb8573d7abb16c9c7fe8837ca
    Signed-off-by: Ian Main <imain@redhat.com>

commit 248663b0670ad75ff738ad2dc816650cf7e182cc
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 6 17:51:10 2012 +0100

    heat tests : new wordpress EBS_EIP functional test
    
    Add new functional test for the
    WordPress_Single_Instance_With_EBS_EIP template
    
    Fixes #209
    
    Change-Id: I800cbe21ef42611f93644e6a0c60b732af663025
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit b98f402fa7ca977769de09a6cc200ee9f928bc6c
Author: Ian Main <imain@redhat.com>
Date:   Thu Sep 6 09:40:42 2012 -0700

    Forgot commas, doh!
    
    I had this in and tested but forgot to put commas in after update.
    
    Change-Id: I7fbcacea0a4ab40f1e6b6e016fd5940ba8432c26
    Signed-off-by: Ian Main <imain@redhat.com>

commit c805d065a1f99b280093c1a37cb91c1c6815e280
Author: Ian Main <imain@redhat.com>
Date:   Thu Sep 6 08:27:45 2012 -0700

    More EBS fixes.
    
    Single instance with EBS apparently needs an httpd restart in order to
    keep talking to mysql after we change the partition.  Also change other
    EBS templates to use vdc.
    
    Change-Id: I180cca2166a0210d5d8dd3e0aea111ea625b865a
    Signed-off-by: Ian Main <imain@redhat.com>

commit 2f9a1310e3d7e1f14ed1987b1371a2d693833481
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Aug 30 13:32:47 2012 +0200

    Rename heat-api to heat-api-cfn
    
    The previous heat-api is, in fact, a CloudFormation-compatible API. Rename
    it to heat-api-cfn, analogous to how the EC2 API in Nova is named
    nova-api-ec2.
    
    Change-Id: I9759f10cee6a60cdc9cb917966eb9fb95a618f85
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0706efc6028d06307945f1853c5ff45c57acc384
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 6 14:32:14 2012 +0100

    heat templates : EBS templates, attach volume to vdc
    
    Fix Single_Instance_With_EBS templates, need the EBS
    disk to attach to vdc not vdb which is used for the
    ephemeral disk (fix from imain)
    
    Fixes #185
    
    Change-Id: I47d1b640d25c0f53dd4535e4bd73846d01f4fc86
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 809ad01ec7a9e0084e84f541090eb4449186509a
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 6 11:41:15 2012 +0100

    heat tests : bugfix FuncUtils check StackId not StackName
    
    CreateStack response no longer contains StackName, so
    we need to parse the StackId and extract the name from
    the new ARN format
    
    Change-Id: If55ff286c98e8396a14fa4ee2b08622faa680a03
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4c26639378381028af5c096885051997f34c7fed
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 6 11:01:10 2012 +0100

    heat templates : Add default LinuxDistribution parameter
    
    Add default value to LinuxDistribution template parameter
    for MySQL_Single_Instance.template
    
    Change-Id: I6431b717dee700f9db588ddbaf58511d0a3b107c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 24db4e2086b5965b14d4a197198174d45d742ed5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 6 12:37:24 2012 +0200

    Fix identify_stack call
    
    It needs to return a dictionary in order for the result to be converted to
    JSON.
    
    Change-Id: Ieef360fd6872624325470fab626d371ed28535e6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 18bc3baf15849ed9482020720ab0906f13b46069
Merge: 585afae b1696fb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 04:13:49 2012 +0000

    Merge "Add a newline to user data injection."

commit 585afae452922efe4f2238615add9d76719fb7f0
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 5 22:47:18 2012 -0400

    Modify to use systemctl and move func_utils outside of setUp
    
    Change-Id: I420991fa4e881f6f9fadd0add02a9d1493240dfc
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit b1696fb1b0be8e6e2ce154d748ed25289a216125
Author: Ian Main <imain@redhat.com>
Date:   Wed Sep 5 19:00:54 2012 -0700

    Add a newline to user data injection.
    
    If no newline is present at the end of the user-data section of the
    template, the addition of the touch command will cause the last
    line to break.
    
    Change-Id: I15ba402f83f6fba03f7d0455a63a5dc03480973d
    Signed-off-by: Ian Main <imain@redhat.com>

commit 5655589895def95709d345509db95a2cc5e1ff7b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Aug 30 11:41:25 2012 +1000

    Fix pep8 warning
    
    Change-Id: Ia0b4336e7e861fefc7afebc99a3c6ddf48841d71
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 38f886947c91ebf610ab2972649a06bec630746b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 5 21:51:25 2012 +0200

    Support lookup of stacks by name or ARN
    
    Previously stacks could only be referenced by name. Now, use the canonical
    stack identifier to act on them. The identifier can be obtained from the
    RPC API by looking it up with identify_stack. In the AWS API, the user
    can pass an ARN that is converted into an identifier.
    
    Change-Id: I29309d12e522ed301c3f6269df5d1d14382b024b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 052a6a431144f8d249c562e8a633e3e0afea12d5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 5 21:51:25 2012 +0200

    Add an identify_stack RPC call
    
    This call converts a stack name into a fully-qualified stack identifier.
    
    This allows us to, e.g., add support for keeping deleted stacks around in
    the database while still allowing stack names to be reused, since the
    deleted stacks can be referenced using this ID.
    
    Change-Id: Ide19841a92a25d2f6172f19c2627d24ab6d2fd63
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit e8b464dabfd95c8ce7c90c72cb5132e7140062f7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 5 21:51:25 2012 +0200

    Report StackId in ARN format
    
    In the RPC API, return a full stack identifier instead of just the database
    ID of a stack. In the AWS API, convert this to an ARN for the user.
    
    Change-Id: I5c3ede4885c4ac5801cfef49e05695f3d13622da
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4465694e0d0e20ccc6383a8cd406f2df38de00ae
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 5 21:51:25 2012 +0200

    Create a unique identifier for stacks
    
    Change-Id: I1517502a2a5d9a96803565297315e7b276f2e974
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 8e1d4ef2100c0960d634f5bd848d62fab132a4bc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 5 21:51:25 2012 +0200

    Use assertEqual() instead of assert_()
    
    assertEqual(x, y) reports helpful error messages, unlike assert_(x == y)
    which reports only that False is not True.
    
    Change-Id: Idbea59dc4dbbe4ac00bad6f358896fbc9401acab
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 9fecadca6c96fa33e697df833e2f170f956b1409
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 5 16:26:27 2012 +0100

    heat tests : add functional test for Wordpress RDS
    
    Add functional test for WordPress_With_RDS template
    
    Fixes: #215
    
    Change-Id: I0613c40e218acaab987a2b0e0df7737cb6f6b6b3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ab6817ea3601ab211696bcf8635596a58e4585c0
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 5 15:13:59 2012 +0100

    heat tests : convert functional test to class
    
    Covert test_WordPress_Single_Instance_With_EIP to be nose
    unittest.TestCase subclass, so run_tests.sh outputs a more
    informative test identifier
    
    Change-Id: I21968b4ae9e0e8f7bc1ef9d3f6db0433f106826a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4a0314522f63c96ad0b64df818a347da9b9dda7f
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 5 14:39:44 2012 +0100

    heat tests : update WordPress_Single_Instance_With_EIP
    
    Update functional test WordPress_Single_Instance_With_EIP
    to use the new verify_wordpress which checks that the wordpress
    homepage specified in the stack output looks OK
    
    Change-Id: I6b839e95f2c9fc8d89a22c062c393d6f14fb5df9
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 98485bdcf4a32c32b4b50b13155eb50e25baf934
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 5 14:20:19 2012 +0100

    heat tests : convert functional test to testcase class
    
    Covert test_WordPress_Single_Instance to be nose unittest.TestCase
    subclass, so run_tests.sh outputs a more informative test identifier
    
    Change-Id: I19fe8565d99253cabcbc93d2f003c69d953be615
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d20543e306136393f4807ebdebc76e921e630329
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 5 10:47:46 2012 +0100

    heat tests : FuncUtils use heat_client in create_stack
    
    Use heat_client (not subprocess) to create the stack,
    as this will allow easier testing of the boto_client
    library and easier checking of create_stack result
    
    Change-Id: Ic3f710ec2e467bcd2fde1a2451709d444b89aca0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit e0db51bbd29b36944362cf325daab234e24ee2af
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 4 19:03:24 2012 +0100

    heat tests : FuncUtils cleanup use heat_client
    
    Use heat_client calls (not subprocess) in cleanup
    
    Change-Id: Ie622d22af66ce00272df975823a74a8fa7bd25c8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 750720e5a0da5a998a8cb30fa62eeb2a81d7fe1b
Merge: fd38656 fc25353
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 5 12:33:29 2012 +0000

    Merge "Add functional test for HA template"

commit e88e9e526729f153884b6d8a5ac7ac9d8bae709d
Author: Steve Baker <steve@stevebaker.org>
Date:   Wed Sep 5 08:16:55 2012 +1200

    Switch to keystone service_type=orchestration.
    
    This is to match the service type configured in devstack heat.

commit fd38656097f56b51d25e4e3641936d6b3f7331dd
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 4 17:25:29 2012 +0100

    heat tests : test_WordPress_Single_Instance.py update
    
    Update test_WordPress_Single_Instance.py to use the new
    verify_wordpress which checks that the wordpress homepage
    specified in the stack output looks OK
    
    Change-Id: I9c2c35215ac97f98e62bf1787db3d8645b50c762
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 94493237040f957ad2bd4186886d46309c2de88d
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 4 17:18:37 2012 +0100

    heat tests : Add verify_wordpress helper function
    
    Functional tests : Add a new VerifyStack class and retry decorator,
    which allows easy implementation of tests for stack successful creation.
    
    Initial simple verify_wordpress function scrapes a wordpress homepage
    and looks for a known string in the html result.
    
    Change-Id: I32bd4bea04228c4f393894c65d040d55c65ddbca
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 44bb725f41c6690dc13e3a350a5675469f24750a
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 4 17:08:34 2012 +0100

    heat tests : FuncUtils add get_stack_output function
    
    Add a function to FuncUtils which allows us to easily parse
    the stack outputs defined in a template
    
    Change-Id: Ie1891cb11f54d019315350d449bdc5e22e340458
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 31a76f2ee7d3b3868179abc6e763f15de0fa5b73
Merge: 1c485f9 f43507a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 4 16:02:21 2012 +0000

    Merge "heat tools : add qpid-cpp-server-daemon to tools/openstack"

commit 1c485f9ae130fc37e993deafb0ad8fe1935d1cba
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Sep 3 16:59:57 2012 +0200

    Fix support for eventlet 0.9.16
    
    The changes in c7059ae54ef2712e7599a6de30a631d3a0bb6bd2 were not enough
    to provide compatibility with 0.9.16 and 0.9.17.ith 0.9.16 and 0.9.17.
    
    Change-Id: Id1ddc988443e162f1c835505b619b7b45e86578d
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit f43507a1a00b53a3372031db224598e7cb3f19a9
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 3 14:04:31 2012 +0100

    heat tools : add qpid-cpp-server-daemon to tools/openstack
    
    As of qpid-cpp-server-0.16-5 the service scripts have been
    moved to a separate qpid-cpp-server-daemon package, so add
    this to the list of required packages for openstack install
    
    Fixes : #219
    
    Change-Id: I6c8b53a69953c543df7cd68637e4ff5e4ca495ad
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit fc253535f2ef3cc256b8dd6912b65ac136eafb9c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Aug 28 13:16:32 2012 +1000

    Add functional test for HA template
    
    Change-Id: I6d3304b807492e7041264402d161365447fa6ce1
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 1ce586c96cbacc4bd60ea5dab7ed62b0cca7d3e3
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 31 13:49:40 2012 +0100

    heat : run_tests.sh allow easier test selection
    
    Allow each category of test (unit/funtional/pep) to be
    more easily selected via CLI options, default with no args
    remains unit+pep8
    
    Change-Id: I85bbe0afe6170559a42f8c1619db24df16c6d9b0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 51dc63bb07dd63ab900759f9bf2217b56023a598
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 22 10:30:46 2012 +0100

    heat cli : initial heat-watch cloudwatch API client
    
    Implements new client to demonstrate new Cloudwatch API
    
    Currently only provides options for DescribeAlarms,
    ListMetrics, PutMetricData and SetAlarmState
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I3963a07694cec9af96d9d7369cc7d18d629fcd2d

commit 311092a29468e085b89ed6f07a9e593bbe6b0f37
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 22 10:30:03 2012 +0100

    heat API : Implement initial CloudWatch API
    
    Initial AWS-compatible CloudWatch API implementation
    Supports the following API actions:
    - DescribeAlarms : describe alarm/watch details
    - ListMetrics : List watch metric datapoints
    - PutMetricData : Create metric datapoint
    - SetAlarmState : temporarily set alarm state
    
    Skeleton implementation of all other TODO actions which
    returns HeatAPINotImplementedError.
    
    Only basic filtering parameters supported at this time.
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I8628854a135fff07b675e85150ea0b50184ed2e1

commit 7a382d5ff1390aae91f5d4df633e4cf7e2e39006
Merge: efe6b81 d656978
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 15:25:47 2012 +0000

    Merge "Add new functional test for WordPress_Single_Instance_With_EIP"

commit efe6b8149658019dcb29e6ae7c330c94488bc39f
Merge: a84c2ce d7bd513
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 15:24:36 2012 +0000

    Merge "Connect to heat client, add accessor method, and fix ip check"

commit a84c2cefc3e5a3f937c4cb40066a3dc489dbe4bf
Merge: ab39d2a 18120be
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 15:23:30 2012 +0000

    Merge "Add new methods to get access to nova/glance clients"

commit ab39d2a0dd0b3668048aad7bb491d08577df56df
Merge: 4772e69 384a865
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 15:22:08 2012 +0000

    Merge "Make sure the functional test always cleans up"

commit 4772e69b3895a737521eadb741f774680d7a7b27
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Aug 30 13:56:47 2012 +0100

    heat engine : Add set_watch_state engine RPC action
    
    Add set_watch_state which allows a watch/alarm state
    to be temporarily overridden, simplified asynchronous
    version following review/discussion
    
    Change-Id: I9f1424007fc16d1cec2f7dc504600455fe5ab3bb
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit bea7e3faadc8123f1993f69ce979a96ec17f3d66
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 29 15:11:06 2012 +0100

    heat engine : Expose valid watch states via engine.api
    
    Expose valid watch states via engine.api
    
    Change-Id: I26a1d8939ce75a0be88e646858f3f3b4feb5e8d0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d656978e96489d7ce6cd0d91f90807ff2dc1f1ef
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Aug 31 01:57:37 2012 -0400

    Add new functional test for WordPress_Single_Instance_With_EIP
    
    Change-Id: I483c5c32b9c29dc966bd154d760108292fcdbf5f
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit d7bd513b77d1dee5bd876aa1f27bacb281a4cdab
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Aug 31 01:19:39 2012 -0400

    Connect to heat client, add accessor method, and fix ip check
    
    Search server list for IP based on the PhysicalResourceId, not an arbitrary
    server name. Wait until stack create event before obtaining value.
    
    Change-Id: Ie9e3df5369132dbf668f8b42cd10a7f2faec1922
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 18120bed7f69674676a1cf554abf319f1285864c
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Aug 30 11:38:09 2012 -0400

    Add new methods to get access to nova/glance clients
    
    Change-Id: I5be8d7d57d021635422035742f59acdaeb8b409a
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 384a865bcb18dc62a9f719b2c94ea7f4301fbbd1
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Aug 30 15:44:41 2012 +0200

    Make sure the functional test always cleans up
    
    Change-Id: I740f676452905d3aceb3d2df37e4c4cdb6b81d7e
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 119d4a06f3101fed4b562d19729ac4cdbe4341e8
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 28 19:25:28 2012 +0100

    heat API : add get_param_value to API utils
    
    Add get_param_value helper to common aws API utils
    
    Change-Id: I69ab3ed1e34f8691457f3d986b4af06b1d381039
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 43e558ff5ebdaa2880d416857ab3573b5d0c002b
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Aug 29 13:30:47 2012 -0400

    Add new arguments to run_tests
    
    Execute unit tests and pep8 by default. Allow tests to be chosen in a more
    additive fashion. Cleaned up unnecessary let statements and variable
    defines.
    
    Change-Id: I40676c5d0deda7bd3abc4bdadfd404f5909c166e
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 129f073e660b4fa690b0c81bf9d0d7bc0f930e34
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Aug 29 19:12:48 2012 +0200

    Refactor reformat_dict_keys()
    
    This way is a little more Pythonic.
    
    Change-Id: Ib48d0e9b7e8a4ed6e220c645a29510c893e97419
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 87df079624e4b1441e254db2b066f3b7e9b7fb87
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Aug 29 19:35:12 2012 +0200

    Refactor extract_param_pairs()
    
    Implement it in terms of the more general extract_param_list().
    
    Change-Id: Ifbf0dd8205da87e707610c0b8cb0ca616d7b2e22
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d2401dbaf1f1906d9d787dea18df7df3b9c08eec
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Aug 29 16:10:31 2012 +0200

    Refactor extract_param_list()
    
    Change-Id: Ia338c7c4a17af90885b1c83297d32a61d2177ecd
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 590b70f50a123458ffe684f5fc7642fdf8e47d75
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Aug 28 15:23:44 2012 -0400

    Add link to RPM repository in getting started
    
    Change-Id: I79fcc10b2594b977097d7d91022cbd50adcc9167
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 7ff3bde24c40a94a1485d47d4a2865a5e018f358
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Aug 23 18:21:07 2012 +0100

    heat API : Add api.aws.utils.extract_param_list
    
    Add new common helper function which extracts
    AWS parameter lists
    
    Change-Id: Ic77ff6014a4f39d4fb5d59a1391f87cdd94f0f7f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 24d38e0a6715950f86afd194ab66efd8b5ad47be
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 28 09:35:20 2012 +0100

    heat tests : rename test_stacks
    
    Rename test_stacks.py to test_engine_manager.py
    as this better reflects what is being tested
    
    Change-Id: I612351286fbb008b2be3db7519f0a24ab9d2d8e2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f591838a44af5c150be05cf593b16a912be2b244
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 28 09:33:01 2012 +0100

    heat tests : add test for new manager show_watch_metric method
    
    Add unit tests for new manager show_watch_metric action
    
    Change-Id: Ie1b7c0a0e1eb5c7e5fad74674b1a9669bf7c9a1c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit e81fe17a2c8a95270d45aeb6f63979d02174cc67
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 24 16:33:19 2012 +0100

    heat tests : add tests for new manager show_watch method
    
    Add unit test for new show_watch engine action
    
    Change-Id: I00153f258687e02837b901c399df51085bb34303
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 16ec0a357c64e0056269f4d3e56ffdff724e387f
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 24 16:30:39 2012 +0100

    heat engine : bugfix show_watch, fix single-watch mode
    
    When called with watch_name!=None we need to wrap the
    watch_rule_get response in a list
    
    Change-Id: I83bbe816758767afd3eb49b090b0b652036cad60
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4eb99bc37a6efd41ab36446a697af4e402874127
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 24 13:22:16 2012 +0100

    heat tests : add new engine rpcapi unit tests
    
    Add tests for new watch engine methods
    
    Change-Id: Icbfc900d7578d7d0f8cd9024d8a5b57a9695c0a4
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit cbf27b1ec8745a1040038516bcadbb095570d934
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Aug 27 16:33:59 2012 -0400

    Add test-requires in RPM package list form
    
    This is to allow automated installation of dependences since functional
    tests are not going to be run with packages from pip.
    
    Change-Id: Ia9f74bc353bab79d7c78cb086210d8628d701387
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 13a79650b9d9c4462a9049ab452dbacac6b33b78
Merge: 7ae4bab 16e8261
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 27 14:46:51 2012 +0000

    Merge "Functional test improvements"

commit 7ae4bab7150c885738bfeac98f443da5dc93d321
Merge: 411ae60 e30d482
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 27 09:54:20 2012 +0000

    Merge "Fix the Timeout/Interval check in the LB."

commit 411ae6039102096604238d6aa6286f9e4b4ff22d
Merge: 20345dc c7059ae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 27 08:35:23 2012 +0000

    Merge "Set the max url length in eventlet 0.9.17"

commit c7059ae54ef2712e7599a6de30a631d3a0bb6bd2
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Aug 22 16:45:27 2012 +0200

    Set the max url length in eventlet 0.9.17
    
    The version with configurable url limit was released and packaged for
    Fedora 17.
    
    The monkey-patch does not work on new eventlet.
    
    ref #55
    fixes #197
    
    Change-Id: I728cc3b0851261667bb9b07220c855bced1344a4
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 16e82611d69702969a39111e4fdaa87440b8519b
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Aug 27 02:18:53 2012 -0400

    Functional test improvements
    
    -Move everything out of init so unit tests are not affected.
    -Make JEOS creation part of utils class, now tests can choose
    which JEOS to use.
    -Only attempt to create JEOS if a suitable one is not found in glance.
    
    Change-Id: I162e7447ae1fed17855bdca8eba16ac7f952db01
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit e30d48231dafa3d73c2b6ea29d5ae434f10d7d0d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Aug 27 15:09:06 2012 +1000

    Fix the Timeout/Interval check in the LB.
    
    http://docs.amazonwebservices.com/ElasticLoadBalancing/latest/APIReference/API_HealthCheck.html
    
    Fixes: #198
    
    Change-Id: I3ec3e5a946e32695f3f9b0930b922837ab80ea66
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 20345dc8c6338d3a90de4e3e9011c94d2327020e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Aug 27 14:02:26 2012 +1000

    Fix the way self.properties is checked for a value.
    
    The following only checks if the key is in the properties, and
    all schema keys are, so it is not the way to check if a value
    has been set.
    
    if 'DesiredCapacity' in self.properties:
    change to:
    if self.properties:
    
    Fixes: #199
    
    Change-Id: I6bcb3e74420031532dc249aafe85d5a428d0a80e
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 5e41a1ee73f146204e80b0863362fa2eb049541a
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Aug 26 18:09:43 2012 -0700

    Make RDS (mysql) wait until setup is finished before proceeding
    
    It is possible a service dependent on RDS may issue commands to
    the RDS service before mysql has finished installing.  Added
    a wait condition to force synchronization.
    
    Change-Id: I6abf2d62e92d19945c587deeb61605df2c97ec85
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 99bd84e03b83f16a27455e1feaec4d430553e1d7
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Aug 26 17:00:12 2012 -0700

    Put selinux in permissive mode by default via a runcmd in cloudconfig
    
    Change-Id: I7db02a967de9a3e85876901163f7611196a9429f
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 89df904c50c483b307a8c6d116c970dab449d710
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Aug 23 16:14:43 2012 +0100

    heat API : make extract_user_params more generic
    
    Make api.aws.utils.extract_user_params into a more
    generic aws-format-list-extraction function
    
    Change-Id: If6811ea1a138ddff96542f983397852dfbd483fd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 00527198c863dbbc407ba7aa56a5d430655f7000
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 22 14:11:52 2012 +0100

    heat engine : Add show_watch_metric RPC action
    
    Adds show_watch_metric, which allow alarm/watch
    metric data to be retrieved from the engine
    
    Change-Id: Ie69691dbf781016e6262bbbabbe57f9c3396a5d5
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit a7f4e34e5795973f89ddb83b8bdd322f8c734496
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 21 17:33:49 2012 +0100

    heat engine : add show_watch RPC method
    
    Add new show_watch RPC method, to allow retrieval
    of information related to watches for cloudwatch
    
    Change-Id: Ib434c80cf6cfab7f2cba972d5316f0ed2bbcbf30
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 6b7c5356cbb87e0c5c8a7d35de40b0357f46c813
Merge: bb6e0b1 8ba6c8f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 23 23:09:22 2012 +0000

    Merge "Split functional test into standalone and utility class"

commit 8ba6c8ffe869a7f6db0321bbeeea200a0fb140c4
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Aug 21 16:26:41 2012 -0400

    Split functional test into standalone and utility class
    
    This allows functional tests to be written for each individual template.
    See the test_Wordpress_Single_Instance for an example, but the basic
    form to follow is:
    
    import util
    
    def test_template():
        func_utils = util.FuncUtils()
    
        func_utils.create_stack(template, 'F17')
        func_utils.check_cfntools()
        func_utils.wait_for_provisioning()
        func_utils.check_user_data(template)
    
        ssh = func_utils.get_ssh_client()
    
        # test stuff here
    
        func_utils.cleanup()
    
    Functional test changes:
    Changed jeos creation to use new tool.
    Added distribution to heat stack creation.
    Improved IP parsing from glance.
    Improve SSH connection exception handling.
    Changed cfntools SHA check to match installed copy instead of locally.
    Fixed stack parsing to check correct file and handle user-data injection.
    
    Clean up run_tests a little to make it clear default execution is on host.
    Add a short option for unit test running only (may be important due to not
    wanting to run functional tests locally).
    
    Also added paramiko to test-requires.
    
    Change-Id: Ib2ae1be32801cb0ee3d1937c4f82ab9f574b4591
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit bb6e0b11c6f4d0f185fdd9011daba526f4aff8fe
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 22 20:14:11 2012 +0100

    heat DB : make watch_data_get_all work with no watch ID
    
    Align watch_data_get_all with other "all" methods, and
    return all watch data without requiring an ID.  We may
    also need by_id and by_name variants but this is more
    consistent and makes things easier for cloudwatch.
    
    Change-Id: I09c90278349efc769ab7c719f686a1fd854b425a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 9b14adc222c01f8a54c56bfe0b6658bd2968bda9
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 22 09:54:08 2012 +0100

    heat API : Add HeatAPINotImplementedError exception
    
    Add heat-specific HeatAPINotImplementedError, which
    allows us to return a sensible error to requests for
    API actions which have not yet been implemented
    
    Change-Id: Ibaee8312e7e563d29801bd325d7638bca9efa622
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ecc5a408a33f83b428a77376000c0b6f409393cd
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 21 11:52:24 2012 +0100

    heat API : Move aws api common code into aws/utils.py
    
    Move heat-api AWS common utility functions into a new
    utils.py, so these functions can be reused by cloudwatch
    
    Change-Id: I030d796b1048ffc4e7c40f7c8760121ab2854733
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 1b6c2dad19a1e0d8d34c9687a61892d12f9cbedb
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 21 11:14:18 2012 +0100

    heat API : move remote_error to common exception.py
    
    Move API exception-mapping function to the common exception.py
    
    Change-Id: If64511be0d77d9c9f9e610bbb0564d57f4530499
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 9ccf18433e421bb769b77ce0991a3ffca05adc36
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 21 11:01:25 2012 +0100

    heat API : move aws common files from api/v1 to api/aws
    
    Move aws api common files to common directory
    (so they can be more easily reused by cloudwatch)
    
    Change-Id: I1a455ef11226dd960503bac5d79fa5c28607a1f6
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d7abb038c5fc5e6f597d78f80f6a8a186c82ac9f
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 21 10:48:33 2012 +0100

    heat engine : Fix engine.api variable shadowing
    
    Fix weird-looking/confusing variable shadowing in
    the engine api
    
    Change-Id: Ic7aca18ef877149bbdb49ee33abc62241706a3f3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f48c114a4fa95a77f8bd00b399871d6c2e554b05
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Aug 20 13:01:23 2012 +0100

    heat tools : glance-jeos-add-from-github avoid duplicates
    
    Avoid adding images to glance when they already exist
    
    Change-Id: Ia914cc3015fcdcc0c12e3773985298fce6872751
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f521e53fa34b92b5ef75adbf897b558834c24d4b
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Aug 20 12:46:23 2012 +0100

    heat tools : glance-jeos-add-from-github scrape image names
    
    Scrape image names from github index page to avoid hard-coded
    names in the script
    
    Change-Id: Ifca85b71a1c20d436486a80cc5e9347a7791e5fa
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 8b5756535a3a21252d416af578a5bc07308b6309
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Aug 17 15:36:28 2012 -0400

    Inject command into userdata
    
    The injected command touches /var/lib/cloud/instance/provision-finished
    so it is easily determinable if provision has been completed.
    
    Change-Id: Ib5b93f7bd14f533af41182ffdab6a029a3b9e13a
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit b4c6513a76bff8989d74cb658aaaf6f61c152188
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Aug 17 10:11:21 2012 -0700

    Add a tool to register prebuilt JEOS images into glance from github
    
    Change-Id: Idb02e892f390516557c9cce3ca0fbab7109d33e1
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit d1a6e3465de21a6c09cca8c5a09d7506332ff899
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 15 17:11:56 2012 +0100

    heat template : Align two Openshift template varieties
    
    Align the build-from-scratch Openshift.template with the
    now-working OpenShift_Prebuilt_JEOS.template
    
    Change-Id: I8d164b0837b4cb28a6ce4ad1573b19f8daf68b8a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 87b914cf7074fb0fd23ba33768390850162011ac
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Aug 16 10:50:05 2012 -0700

    Use cached keystoneclient
    
    Change-Id: I787edd10bcc29746a08878fd371204f81f0400db
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit a9252c9b0583b61579c123d4c31b790d4d3ef07c
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 15 15:16:23 2012 +0100

    heat cli : Workaround inconsistent boto return type
    
    Work around the inconsistent boto return type for DescribeStackResource
    action, upstream patch pending but not yet merged, so this provides
    a simple workaround
    
    Fixes #175
    
    Change-Id: I026ec7b1845fb591a47a5fb12cfcb25705b33909
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 5aa80047b65488fa02f23818ca9132e523cb8693
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 15 14:09:54 2012 +0100

    heat cli : Rework to separate cli tool from client-API wrappers
    
    Rework to remove duplication between heat and heat-boto, and to
    provide better separation between the CLI tool logic and the
    underlying client API (should allow easier porting to new ReST API)
    
    Ref #175 (partially fixes)
    Fixes #192
    
    Change-Id: Ib1f821667c40c78770a345204af923163daeffae
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 619239527f7f5ae1bea30cba3d3bc453238b14bf
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 14 17:27:16 2012 +0100

    heat cli : remove some duplication from parameter formatting
    
    Cleanup - bin/heat move some duplicated code into a function
    
    Change-Id: Ib74077c557a2b8d7c640ee1686237bb5223b2a85
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c2382317de4693ee366de99938899ed00685b8ec
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 14 17:15:08 2012 +0100

    heat cli : remove unused paths from heat cli tool
    
    Cleanup the the jeos and cfntools paths which are no longer needed
    
    Change-Id: Idc7d37446a0072e38369939cbd3fd5fb374c15c9
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 08836e32499274c453fbc0a079af6eb197e3965d
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Aug 14 09:07:44 2012 -0700

    Update Getting started to match change to heat-jeos
    
    heat-jeos list will no longer list jeos in the image name.  As a result,
    we can't specify "-jeos" in the getting started guide.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit ff967194048e1e579db210ddad2df3af49ec1430
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 14 15:56:13 2012 +0100

    heat api : bugfix, save config correctly in EC2Token
    
    Fix issue where EC2Token fails to save the config correctly,
    which breaks AWS Authentication
    
    Fixes #191
    
    Change-Id: I77dfe182aac81c55b7d487d88073b40eac1faadd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 005b613f8b0ca87428b614f2a2ca90865806be6c
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Aug 13 14:31:12 2012 +0100

    heat templates : Add openshift template for pre-built jeos
    
    Add new openshift template which uses a pre-built JEOS
    also creates the example application allowing a fairly
    quick full demo of a two-instance openshift setup
    
    Fixes #186
    
    Change-Id: I9bd886b0717c8b0d810eff036b76883b537c2421
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit a013d1dc9e20acc1fefd44b0da03719207d1a4d7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 13 13:54:52 2012 +0200

    Getting Started: Add configuration info for the metadata server
    
    Change-Id: Ie99bfd1c5e7bcaedd7757872d7d618d2cf29b137
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit aa21f73f3e530f1f9f5067bc7dcd980b9ac21a44
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 10 19:16:01 2012 +0200

    Getting Started: Use install.sh script
    
    Change-Id: I7f189f8d3e0557503eca23a5489a98589bfff4f3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit e611c7a5178e3607aa64f557535e7dc58f6d9af0
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Aug 13 15:59:49 2012 +0200

    Make template params resolution standalone
    
    This makes the two functions for resolving template data (Fn::FindInMap,
    Ref, etc.) available outside of a Stack object.
    
    Other programs can then import these functions and see how the template
    parameters get resolved.
    
    Change-Id: I92de937a3fb25f907404335cb71554036a807c50
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 70bdc38a44b6ec4db40b8e1b5d7c2b6f398e27e1
Merge: 69cfc12 7f8c5fa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 10 19:06:22 2012 +0000

    Merge "change amd64 reference to x86_64 to match latest cfntools"

commit 7f8c5fabedda986f8a055b07bbbfdf2f9905fa81
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Aug 10 11:39:31 2012 -0700

    change amd64 reference to x86_64 to match latest cfntools
    
    Change-Id: I11f4bd974326c7f1b4e287389b22c5ec3f20bdf9
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 69cfc124bc5d30fe598d41d42221cac56b369fbf
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Aug 8 14:58:51 2012 -0700

    Remove crankcase patch since fix was merged upstream
    
    Added a patch to force yum to retry indefinately on crankcase builds
    because the OpenShift repositories were too busy.  I submitted this upstream
    in:
    
      https://github.com/openshift/crankcase/pull/336
    
    and it was merged.
    
    As a result, removing this workaround.
    
    Change-Id: I26e0a162d5cfb4bc23843c93678318ff21610973
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit ec45dd77c02c113af74002a65dd415758f412875
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Aug 6 17:17:31 2012 +1000

    Add calculate_properties() to update() and restart_resource()
    
    This is the same fix as 783b1112490ef07db05251c1258c04f8b1caa5a0
    
    Change-Id: I17a30b0c670dee5b228b4af8dad06ad109471e5d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit e432874d5f980f961dd3386058780c2b71ef95f7
Merge: 31718b1 dedb947
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 4 03:14:00 2012 +0000

    Merge "Log all startup operations to /var/log/heat-startup.log"

commit 31718b1e145832d23dca66481a9a904ec761db24
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Aug 3 19:31:22 2012 -0700

    Force rpm to retry indefinately during crankcase build
    
    If RPM is not forced, sometimes packages will fail to download within the
    default 10 retries.  This results in crankcase failing to build OpenShift.
    
    Change-Id: I5174928fc2ac205dcd7818ecf1da6b8e32f48e08
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit dedb9475a91fc4833adf4a5201c5898b09081ad2
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Aug 3 16:42:46 2012 -0700

    Log all startup operations to /var/log/heat-startup.log
    
    Change-Id: I0e7f415e7aee60c09d0b5b172742af7a5b313191
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit c8b47d80ed9697559c6dfafa9ecd684d6f9b7980
Author: Steve Baker <steve@stevebaker.org>
Date:   Thu Aug 2 17:32:07 2012 +1200

    Port existing rpc calls to use the new RPC client API.
    
    Patch 2/2, this implements github heat issue 181.
    
    test_api_v1 was modified to handle the extra rpc arguments.
    
    metadata_register_address hasn't been included in EngineAPI, and it
    possibly doesn't deserve to. This means that bin/heat-metadata has the
    only remaining raw rpc call.

commit e05f39c37b115259cf64e2523d7da443507f389c
Author: Steve Baker <steve@stevebaker.org>
Date:   Fri Jul 27 21:57:59 2012 +1200

    Implements a client side engine RPC API.
    
    Patch 1/2, this implements github heat issue 181.
    
    The topic string for the rpc call is built from the cfg.CONF parameters 'host'
    and 'engine_topic' defined in heat.common.config.engine_opts.
    
    delete_stack seems to be the only method which returns nothing, so it can be
    invoked as cast or call, with cast being the default.
    
    The tests exercise each api method with the same approach found in
    nova/nova/tests/compute/test_rpcapi.py
    
    Change-Id: Ia20850821083d1236ad628172db00d01f073313c

commit ea2db73166c393187ba0db039e5974c0f2333023
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 1 14:27:55 2012 +0100

    heat templates : update Openshift template to add node instance
    
    Update openshift templat to add a second instance running
    the node to the existing broker.  Move to crankcase master
    and attempt to work around build issues.
    
    Ref #186
    
    Change-Id: If7d1b39e1072d3934f37817be3d7773edd7785c3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 044887521ec2c38231458c3928af6956dc16119a
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Aug 2 14:37:13 2012 +0100

    heat : Make instance flavors consistent
    
    Add additional instance flavors to align templates with
    nova
    
    Fixes #179
    
    Change-Id: I586e57748c9b0a0c7594746399d5328da788efcd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 1ed94e1382166ccf50f116645b4d20dcd2c74e7f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Aug 2 13:15:53 2012 +0100

    heat engine : raise appropriate error for incorrect stack_name
    
    Raise an AttributeError instead of returning a string when passed
    an incorrect stack name, this then maps to the appropriate error
    in the API.
    
    Fixes #182
    
    Change-Id: I7fe80496883bfbe515d9c235de812aaa14c41c12
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c69f3892c2563cefdc26e6bdb54bc2c2e7c7cae5
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jul 27 14:43:37 2012 +0100

    heat API : Return correct AWS error response for invalid parameter
    
    Passing template parameter values which are not in AllowedValues
    makes the engine throw a ValueError exception, which should be
    mapped back to HeatInvalidParameterValueError so that the API
    error response is correctly formatted.
    
    Fixes #180
    
    Change-Id: I8615cb7fbbbfd21a403a4973fe0a63300c6cf852
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit e3e011b9cb1273f0d05f87c67b76a3b07dbc20e9
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Jul 31 14:50:17 2012 +0200

    Bump to v6
    
    Heat version 5 is released, let's start working on 6.
    
    Change-Id: Icd0db5c0a9317d17ae4c2f161d50da8b5c50c40e
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 2779760de5d47d7368e541a5a631b041ca4eda1b
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jul 30 18:53:23 2012 +0100

    heat engine : Avoid writing to class-scope parameters schema
    
    Fixes issue where multiple instances of the same resource types
    which have different parameters break, because the parser is
    writing back to the class-scope properties_schema which should
    be immutable.  This patch fixes by making a per-instance copy.
    
    Fixes #183
    
    Change-Id: Ia29f67465acbcfaf8dfe511ddaa9075bc48157ad
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 8f0caacf8a93bb515b75803e1a53692e4d4deaf0
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Jul 30 17:56:44 2012 +0200

    Update getting started with credential crypto
    
    We encrypt the sensitive information in the database now. This updates
    the Getting Started guide to generate an encryption key.
    
    Change-Id: I44a96302e736997a747f82c9d23006425396633f
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit bdf59084b65074c7cfaab8d9ade3b5932fbf8c11
Author: Ian Main <imain@redhat.com>
Date:   Fri Jul 27 09:41:25 2012 -0700

    Add tools directory to python package.
    
    This adds the tools/ dir to the tarball for distribution.
    
    Change-Id: I82a18df568bf2d7421a49e057e80a7bc236e2078
    Signed-off-by: Ian Main <imain@redhat.com>

commit b6d2608dd2f38168f004471a74c8f3add2008964
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Jul 27 14:37:17 2012 +0200

    Don't use uuidgen in install.sh
    
    uuidgen is not present in Ubuntu. This simply reads 16 bytes from
    /dev/random and stores their hex representation.
    
    Change-Id: If1152242b024218f20bd4c787e03836f0d5f49cf
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 58cd52624b50476ed5ed1c5c0ba7cb1b4d7ba66d
Author: Ian Main <imain@redhat.com>
Date:   Thu Jul 26 12:57:57 2012 -0700

    Add encryption support for authentication information in db.
    
    This patch uses an encryption key generated in install.sh to perform
    symmetrical encryption on sensitive authentication information stored
    in the database for HA operations.
    
    Change-Id: Ifd09f3f566ba3ebd941a6f453953576011b518b9
    Signed-off-by: Ian Main <imain@redhat.com>

commit e646e66728e5ca9f627c56137a40c74a195060a1
Author: Ian Main <imain@redhat.com>
Date:   Wed Jul 25 12:02:53 2012 -0700

    Change to per-tenant stacks.
    
    This patch switches from per-user stacks to per-tenant stacks.
    
    Change-Id: Ia7ac65033560bcff1db83d4d673945029e06ea6a
    Signed-off-by: Ian Main <imain@redhat.com>

commit 3c6e40f2bb9039dfae60307ea730199973ddc247
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jul 25 21:45:09 2012 +1000

    Make a template that demonstrates instance monitoring and restarting.
    
    We use cfn-push-stats to send a heartbeat and if we don't get
    it within the set interval we restart the instance.
    
    Other changes to make this work:
    - clear the waitcondition when it is deleted.
    - set the resource id to None when deleted, else it won't re-create
      properly.
    - don't run watch alarms if the stack is not completed.
    
    Change-Id: I5dfc8b372f557cf43379c6c5b7436d1010f83e3c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 783b1112490ef07db05251c1258c04f8b1caa5a0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jul 25 12:36:35 2012 +1000

    Call calulate_properties() before calling FnGetAtt()
    
    The problem is that in the delete the order of resolution is reversed
    so in delete loop we have not yet done a calulate_properties() on the
    resource that we are about to call FnGetAtt() for.
    
    Fixes #178
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
    Change-Id: I8af6f8a78086a7b1f2bcc280d57af0b4311f08cc

commit 8c3f0f14a5f2b41f0a7f4922a3100c0797feaddd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 24 19:04:07 2012 +1000

    Log the error when a resouce fails to delete
    
    Also bail out of handle_delete if instance_id is None
    
    Change-Id: I2bd77345ac35860201006a23999a06dd81ac6fe0
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f1eabe8073549cbcea47b1ae6c927e2e1948d33e
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jul 24 17:58:06 2012 +0100

    heat API : Add more tests covering error paths
    
    Add some more tests testing error path responses
    
    Change-Id: I10f3b599f8a0f5daad84752042079a591968de09
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f95e459e80625150e91413f54a76090163fc7bb0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 24 16:48:55 2012 +1000

    delete duplicate validate() method
    
    probably a merge conflict.
    
    Change-Id: Ibe8941ab471943b7385ceb4b4d4559719a7092b6
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 8a7ea792b00fa470270d85b3d08f210b5e98b78f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 24 14:09:29 2012 +1000

    loadbalancer: implement Interval and Timeout
    
    Change-Id: I74abc742371cb23ddfe38f83812662a9d42f3d43
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 27e612a77bdde87d417d502251553352fafc8870
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 24 14:03:24 2012 +1000

    autoscaling: implement DesiredCapacity
    
    Change-Id: I1403f7857e03795aa4773f9a3f1fc8f082526477
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 591377489f615e475ca72e2b7bbbcaa88c29e8d5
Merge: 1206b18 8bd9ed0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 24 04:54:19 2012 +0000

    Merge "Get rid of PyCrypto dependency"

commit 1206b18cbd24774a2397f905da323c57ebee2be4
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jul 23 19:39:41 2012 -0400

    Update GettingStarted guide to use correct state name
    
    This changed from IN_PROGRESS to CREATE_IN_PROGRESS in
    0191587ac6a79509576e2043412020d9c4257b47.
    
    Change-Id: If1cb20f6a16e719ee423db937b591b575fd4a038
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 8bd9ed0bd8e51291e549751abd5821e8263e820d
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Jul 23 18:15:49 2012 -0400

    Get rid of PyCrypto dependency
    
    The origin of this code is from Glance and is not used in Heat.
    
    Change-Id: I4a22974e24fb277aea79212f0aee2f7e85a0ea76
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 025b5f907d90ae7778e799fb37f5a3df83c16f50
Merge: 64f9b72 9c75b6d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 23 17:47:48 2012 +0000

    Merge "Add AWS::RDS::DBInstance"

commit 64f9b72c8e41d736cf2b8be447a940333b37149a
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jul 23 17:43:39 2012 +0100

    heat API : Add more unit tests
    
    Add more unit tests to improve API test coverage
    
    Change-Id: I5f3a8933a9a09acb6b904ccc76ec20ad210a5974
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 9c75b6d3b0160d43be62f75d8f56e218d5809831
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Jul 18 15:39:37 2012 +0200

    Add AWS::RDS::DBInstance
    
    Fixes #163
    
    This is an initial implementation of the DBInstance resource type and a
    sample Wordpress template showing it off.
    
    Change-Id: I5e156dc58eee563ae9de068664bafa1af1fb5ffe
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 312a84ec70ffc3cbbc9b1cbb2f8c62e4d21e97c8
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 23 20:12:05 2012 +1000

    autoscaling: don't kill all instances when scaling down
    
    only delete the difference between the old capacity and the new capacity
    
    doh!
    
    Change-Id: Idbb16b2fa93abcad2793d5b4365c18a01e588b99
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit deebc5c42aa900ee1543c6d6d791fea3e274cd4e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 23 14:58:11 2012 +1000

    make the autoscaling template easier to debug
    
    shorten the period and lower the thresholds
    
    Change-Id: I3d621fadacc6e77002d100cf725d970671475106
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit c91b8d53f2597b3626c78037e9f3df52d9a19ca7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 23 14:48:29 2012 +1000

    Return the name from the autoscaling group not the instance.
    
    the default is to return an instance_id if it is  not none.
    
    Change-Id: Ide5dcb3da5d992683dd235f1b53b264455a9fd07
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit b48d869244209c23b506696bc6f8192254fda4aa
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 23 13:09:19 2012 +1000

    Add python-psutil and fix cfn-push-stats options
    
    Change-Id: Ic88e1e886c5f8ccbcbc5bc49fa612366c7faeae5
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit b34a5cd51d66b2a8ae4fb03d8108d0e0f6e3faa2
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Jul 20 10:40:22 2012 -0700

    Add an EC2Token_filter_factory and use it as the default paste filter
    
    Change-Id: I70989ff6be655832497e1e8a3019497438a739fb
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 0191587ac6a79509576e2043412020d9c4257b47
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jul 17 15:46:49 2012 +0100

    heat api/engine : Implement UpdateStack functionality
    
    Implements initial support for UpdateStack, currently
    all resources default to delete/create on update.
    Ref #171
    
    Change-Id: I3e6e63143d554c21ccdee19879c4dfb8b6e693d7

commit 8fb2ad1e28aba2b99a7faa8a91efcd5b786cdac1
Merge: 0f4c86b 912a4fc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 20 14:20:23 2012 +0000

    Merge "heat db : fix per-object delete"

commit 912a4fc7a706bdf08ee731e0430256a326ca9d34
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jul 20 11:17:08 2012 +0100

    heat db : fix per-object delete
    
    Fixes problem where per-resource destroy() operations do not
    delete the underlying database row because the model delete
    method is broken
    
    Change-Id: I3562c9048f8d4e54c1ea51090e74abe982ffb330
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 0f4c86bd3a13b5f8ff2e57b727709c7ff46aeea4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jul 20 16:08:32 2012 +1000

    Combined autoscaling and loadbalancer
    
    Change-Id: Ib2cff867eb5d9fbee8cedb828e9c35a93436cbe5

commit 06705da563935a5097a3a502ede1c349e14656ac
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Jul 19 19:51:47 2012 -0700

    Optimize filter context
    
    Just use a direct filter factory for ContextMiddleware
    
    Change-Id: Ie17bb88c331bdb4354d0abb24346ab80f13cd323
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 8ced4770697bf87d96554391778bbf3585ddbbee
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 19 15:01:01 2012 +1000

    convert to float instead of int in the watch rule
    
    as the data sent from the guests are likely to be floats.
    
    Change-Id: Ice17c23997150db8c52c50767ed94fce8b182d4b
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit be3c066ab87cc6e1a2ca8c097eeccd9217d7329a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 19 18:35:59 2012 +1000

    Allow nested stacks to be retrieved by name
    
    When getting the stack by name in the metadata server
    we don't know the owner_id so allow retrieval just by name.
    
    I suspect this will be a short term solution until we get proper
    stack names.
    
    Change-Id: I8845b2b33a5bae30aae66c06af01c1a27c990305
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f046a6c2e259aaea4f103b00c5c2bd04aa5db209
Merge: 6029c03 466e998
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 18 11:58:09 2012 +0000

    Merge "Don't require user params on template validation"

commit 6029c031eac1ca8cdf833300d79de49717ecb137
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Jul 18 13:34:03 2012 +0200

    Use eventlet's wsgi again
    
    Ref #55
    
    This adds a monkey patch for the eventlet's maximum url length issue (ref #18).
    With it, we can use eventlet as our wsgi server again.
    
    Once Eventlet releases a new version (the fix is already in master) we'll drop
    the monkey patch and set the limit proper.
    
    Change-Id: Ia122af8d53b49587ade0ead6897fdd10107f4a87
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 466e9983d0c855b03b64227c607fdd7125f3ae8c
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Jul 12 18:04:54 2012 +0200

    Don't require user params on template validation
    
    Fixes #161
    
    Change-Id: Ia7e1a83043f8d175e320bfd52aa64cb6f62ead90
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit cf56c2613b4a7317d57d97506167c2fd8cf27e42
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jul 18 12:09:22 2012 +1000

    tools: erase openstack-utils only after using it.
    
    else we just get: "sudo: openstack-db: command not found"
    
    Change-Id: Iaad3353a7f3c64fe8fbb2f0686c24e97467efb66
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 97d8118f6e9a072e93e0ac59c6c614aff739afed
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Jul 17 17:38:50 2012 -0700

    Update openstack-common
    
    Change-Id: I2d7e169adb9205faa109634a9ae15a9f34e4bd75
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 3a4f2225269f4f0f963ff828cb1d88c9b3c5008c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 17 14:55:10 2012 -0400

    Erase openstack-utils when uninstalling OpenStack
    
    Change-Id: I219a57fdd1b600f185cafdb31d611f16c92698c9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit bb79672aec6b50b86c087dc7e2bb28d460893bde
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jul 17 17:33:49 2012 +0100

    heat : update config files with new rpc backend
    
    heat-engine.conf, heat-api.conf, heat-metadata.conf
    should have:
    rpc_backend=heat.openstack.common.rpc.impl_qpid
    to work with the reworked rpc code.
    
    Change-Id: I2e5b136240db2fe8f6dfad27da7e31b2a5053a1c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit e9eee939c7792f857b4be2f085bf05c47642504d
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Jul 17 08:27:19 2012 -0700

    Import openstack.common.rpc
    
    Use openstack.common routines.  One of the parameters changed to
    create_consumer().
    
    Thanks to Russell Bryant for assistance with sorting out that problem.
    
    Change-Id: I4badc7ca22298cd0aafc57a2335b3d6801289be8
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit b0a0f0c24e9b86ac3ab1862f3be140e79e62ca87
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Jul 17 07:17:20 2012 -0700

    Use global cfg.CONF instead of config classes
    
    Importing rpc.common requires the use of the global cfg.CONF.
    In fact, most of common requires the use of this global.  This
    patch removes all the object specific access to config options
    and directly accesses the global in prep for rpc openstack-common
    import.
    
    Change-Id: I5989a436964c199df0dc38dbb191dc3d867e5ce7
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 9d88e8d303fce338bb3d99e83ac96464b193ac9f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jul 16 16:59:41 2012 -0400

    Get rid of eval() in authentication code
    
    This was not secure. Pass the auth data in JSON format rather than as a
    serialised Python object.
    
    Fixes #124
    
    Change-Id: I8e1e9aef790b0af026da2a2d6194da19345be8b0
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d06c4ce416ece13d9a34da8002ad896b6a9b0ecc
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jul 10 18:13:23 2012 +0100

    heat engine/API : Internal API rework
    
    Refactor engine-api code so that AWS specific
    details like key names are handled in the API
    Fixes #172
    
    Change-Id: I4c5b153557216c03e5a98193e54cf75e3c7b97dd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 90e22dabdea927e4a5a185179dfd1bd7ed566b12
Merge: 8e30817 c7ec88f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 16 03:08:41 2012 +0000

    Merge "Import openstack.common.log and use inside heat infrastructure"

commit 8e30817a93667c9ce62eb0e6ea0f8561f0a40c9a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Jul 15 17:04:45 2012 -0400

    Account for XML output in Getting Started script
    
    The output format of heat commands has changed from JSON to XML
    
    Change-Id: I68b4011e31fdb14306e88506dc6ff819b041b054
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f5360d774db303f26217ad8b002d24a1d8a5fc62
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Jul 15 16:18:23 2012 -0400

    Fix directory changes in Getting Started script
    
    Change-Id: I3b23b2c0de18d72f91d4a0254e9dbf689ac91be3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0670b7c3d31bc6ebb47ee121cda4205ae51c3f91
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Jul 15 16:18:22 2012 -0400

    Allow non-interactive installation of OpenStack
    
    Pass the arguments to the tools/openstack script through to openstack-db so
    that scripts can use e.g. --yes and --rootpw.
    
    Also use openstack-db --drop rather than heat-db-drop to drop the databases
    for OpenStack services.
    
    Change-Id: I87811ee02d3bfd7cc2dca8b9ab20ea3cfc220e3e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 6eb623580f3694caca284e264a2309ea2342a655
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 1 14:42:12 2012 +0200

    Document Metadata server in Getting Started guide
    
    Change-Id: Id0995df10f329ee3076a2c60ed5eb1548eaa315a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c7ec88f2c7552d4179026b5c091473d2dbc22ae4
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Jul 14 12:18:32 2012 -0700

    Import openstack.common.log and use inside heat infrastructure
    
    Allows heat to match openstack-common log calling conventions such
    as using a context object or instance UUID for better traceability.
    
    Change-Id: Idaa6c04270d9d7143c85988d685c0f9e241b635b
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 5d5d8ba5dd388b5952a4fe4f614409ba07d3bd9d
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Jul 13 15:30:03 2012 -0700

    Update openstack-common in prep for pulling in common.rpc
    
    Change-Id: Ib3444d97967c807cb96175ce23d4b670a028e9a7
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit fba2ed3921b132621a42c95eb2230829273f431e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 13 16:46:20 2012 -0400

    Set the stack updated time through the Timestamp
    
    Don't allow the resource class to modify the parent stack's database
    representation directly.
    
    Change-Id: Iff93d1430f4cb0695e729d0cf8f784ccb2ed7598
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit bfd7fcf8f5642e99df9ada33a5c39e5c1a0f89c5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 13 16:46:20 2012 -0400

    Eliminate DB access from the engine API
    
    Access all data through the Stack and Resource objects.
    
    Fixes #168
    
    Change-Id: I0331a0ad67bcd11bb678e026ddc7b7c954517bc4
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 07be1d72699d051a58697962fff5c39a11d48544
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 13 16:46:19 2012 -0400

    Make timestamps available in Stack/Resource objects
    
    Provide the creation time and last-updated time as attributes of Stack and
    Resource objects so that external code does not need to access the database
    in order to retrieve them. Use a Descriptor class so that the latest values
    are always fetched from the database.
    
    Change-Id: Ic3fa173b1dc8f2e5dc676a9152e8928ed2290913
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b0ec4877992c6660bedadbb53ea1d7c1503bc513
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jul 13 16:08:53 2012 +0100

    heat cli : Manpage updates
    
    The heat cli tool manpage had very little information,
    this adds detail to the existing page and copies a version
    of this page to cover the heat-boto version of the tool.
    
    Change-Id: I5b64466878b719b49a9084f301b2c177ddef9a91
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c16b10255d1aabf0884cf27b55f486b9e8901aed
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jul 13 10:31:42 2012 +0100

    heat engine : fix create_stack response format
    
    create_stack response is broken now the StackId formatting
    is done in the API, modify response format to fix.
    
    Change-Id: I013bdb5ed992ce735905225cc4415fc0cfc5ce92
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 0fc46d513477865fe8abfd54ad9529fda413060f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 12 17:46:46 2012 +0100

    heat API : Add missing StackId prefixes
    
    Align event-list and resource-list-details with
    other calls which add a AWS-style prefix to the
    StackId response element
    
    Change-Id: I0b1951068448d141e04ddca44f1d4188d3dff360
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 5336c986510a4b075a35a0233d59a1e69b6f4576
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 12 17:37:37 2012 +0100

    heat engine : move StackId formatting into API
    
    Move AWS specific StackId formatting into the API
    Ref #172
    
    Change-Id: I02f964b63c0489800300d8db92e1c800286c4bd3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 581b0c6f6adc4480fc7c03eb96abda821c89b1a7
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Jul 12 08:38:51 2012 -0700

    Block on instance delete until delete operation completes
    
    Fixes issue #160
    
    During deletion of a stack, following would occur:
    delete stack
    delete instance
    delete eip or security group
    
    When the last operation occurred, the instance is still present in OpenStack
    making a deletion of EIP or security groups not work properly.  Serialize
    the operations in resources.
    
    Change-Id: I6e1613f5a6f5db485dd8a5f381d7a96afb58188b
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit a7d3879d7c7c3d67d6d58a05fed1319b52bf082f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 12 12:56:44 2012 +0100

    heat engine : Store stack timeout in database
    
    Store the TimeoutInMinutes common query parameter
    value in the DB so it can be returned correctly
    with show_stack/DescribeStacks
    ref #125
    
    Change-Id: I4ccc79b586087f61e415d5d2c24b7bd52844399a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 82138f48bdc3c078df680b70bd4196c66fee1129
Merge: 4da17a9 a82114f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 12 10:25:14 2012 +0000

    Merge "Update JEOS example in Getting Started"

commit 4da17a9b8b2523cfe5fa0d25b65dd970f3988131
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Jul 12 11:52:02 2012 +0200

    Display better message on Keystone failure
    
    Fixes #148
    
    When there's something wrong with Keystone, Heat reported a rather cryptic
    message. Now it indicates that the problem is with Keystone and passes
    its response to the user.
    
    Change-Id: I791b5bdfa68faa1b17daa67b911253d8bf8a2bb8
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 8cbd065bf0124290a828320f9087ce9183ee73fc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 11 15:12:23 2012 -0400

    Speed up metadata server registration
    
    If heat-engine and heat-metadata were started at approximately the same
    time, such that heat-engine was not ready to receive the registration call
    from heat-metadata on the first attempt, it would take a minute before the
    next retry. Instead, start with a very short timeout (2s) and increase it
    if the engine does not show up.
    
    Fixes #159
    
    Change-Id: Ie2efcce667f1dde9ae227a4bb19a1d6a2b7cf135
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit e4eaca5d58b1d59459079d4967b91f3bbc6a1aae
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 10 18:21:56 2012 -0400

    Fix the WordPress puppet template syntax
    
    The template was not valid JSON due to an apparent copy-and-paste error.
    
    Change-Id: I5fb4afe6597b2f469fb5219494feb745d083bf52
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 8108c0aefb316516061a3db6ae44180b2c26b4d7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jul 5 14:12:46 2012 +0200

    Optimise DB lookups by ID
    
    SQLAlchemy caches objects in the database per-session, but cannot cache
    queries. A query just generates a list of object primary keys, which is
    then used to fetch the corresponding objects from the cache (if possible)
    or database. Therefore a query which filters by primary key is a waste of
    time, since it just returns (surprise!) the key we started off with. If we
    have the primary key (in this case the id field), just look up the object.
    
    Change-Id: I7123c12372b26c0e1b91b2496921c54d9d992cd8
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 5737782c718e84446d8f7f207b3b488ca4473862
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 10 17:53:58 2012 -0400

    Raise the correct error when a stack is not found
    
    Change-Id: Ia96d7b96f61e48d20ab080395365e770cf5bb1a8
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 57a71eb07d393e5f7936b97745cefc6a6520aea9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 11 11:02:13 2012 -0400

    Access Resource metadata through the new attribute
    
    Get rid of all the other code that was accessing this directly from the
    database and use only the Metadata descriptor.
    
    Change-Id: I36a7a00878d0b65f58ba282ebad78f77b37c4d07
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 139fe4009e8776a3e56ed5023e9745577caacc4e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 18:17:05 2012 +0200

    Add a helper class for metadata
    
    With this patch we can now access resource metadata through the 'metadata'
    attribute and have it always fetch the latest data from the database. This
    reduces the chance of accidentally accessing stale data (due to the
    metadata being updated in a different database session via the metadata
    server) by providing a single implementation to access it through.
    
    Change-Id: Id411ae891d3eace746d16008a7d58bb19b4f652d
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 7e9d745ee6e326110f155dbb3cac71f112b0ec42
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 11 10:54:41 2012 -0400

    Add unit tests for metadata read/write in heat-engine API
    
    Change-Id: I2b745a00a2110c794f6228976d3ed1cb9cf59d5f
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f74aef83bf180ddee3cc9a8a2f7de77707e011d1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 11 10:41:40 2012 -0400

    Avoid unneccesary template parsing
    
    Only parse the parts of the resource template that we need.
    
    Change-Id: I4628e699452dc390848fc15197a5e04a3095399a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 5aac736bb60cfd72887aef2555c3c0cbe24ea6e1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 11 10:37:47 2012 -0400

    Allow partial template parsing
    
    Make it possible to only parse the section we need when generating the
    parsed template for a resource.
    
    Change-Id: Ib4216d8d7bfdbca81f43690b6e8c53c15c71a232
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 897ccca9ed1039df2b60b0607997cccb06fd913c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jul 9 14:23:31 2012 -0400

    Rename resource_id to resource_name in metadata API
    
    This more accurately reflects what the parameter is, which is just the name
    of the resource within the specified stack.
    
    Change-Id: I6bc26c0046e0493c3b98c5753c04cc5a314678d7
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit bd24e183c1a404286f9b701feb18819d353544b9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 6 20:40:00 2012 +0200

    Report errors from nested stacks
    
    If creation of a nested stack fails, we need to raise an exception so that
    creation of the nested stack resource (and hence the enclosing stack) also
    fails.
    
    Change-Id: Ic5eda7f8d044ed2c87fc0e785b1cd8fcf78071a4
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f5811fb4e92decdd255df40329ab7b242ec9cafc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 11 09:53:40 2012 -0400

    Speed up engine manager unit tests
    
    Refactor the engine manager unit tests so that they all use a single stack
    that is only set up once. This makes the tests run a lot faster, and also
    makes them easier to write. Both should encourage increased testing.
    
    Change-Id: I50d2ffff393d4049459c5c30e408961681c189c7
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 7e56619e4135260065cbee36d1cbee7b936fb9fc
Merge: ccab1c3 3100a89
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 11 12:31:53 2012 +0000

    Merge "Add DB refresh/expire on specific parameters"

commit ccab1c36dc69fb68b9f176bd819f0978fe72d45a
Merge: b96c15c 84841e5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 11 12:27:04 2012 +0000

    Merge "Allow Status(Reason) access through Stack/Resource objects"

commit a82114f39bbe00ff60e6c071155966dd70166974
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Jul 11 12:42:58 2012 +0200

    Update JEOS example in Getting Started
    
    The heat-jeos usability branch has merged into master and the command
    syntax for building new images is now a bit different.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
    Change-Id: Ibd4e308fe6ef4d690b0408d59d8a9539a5c81f96

commit b96c15c96fcbcf6af8f5c731406b2feaa3f74810
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jul 10 13:56:41 2012 +0100

    heat cli : Align resource-list-details usage with other commands
    
    Align resource-list-details usage with the other heat commands,
    and provide better usage info on failure
    Fixes #156
    
    Change-Id: Id80b377151eca64e5f7dbfb436f5a5da5213c8b3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit dd94f3eba2d6540a37b8743c8bd15482149b4c05
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jul 9 17:54:59 2012 +0100

    heat API: bugfix to XMLResponseSerializer
    
    JSON wrapped in XML responses needs to be serialized
    with json.dumps not str() or quotes get mangled and
    json.loads fails to parse the result
    
    Change-Id: I65c6ddf0be383e71bf8d05e7293b514269a27213
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 3b7e0ae4c615a203ed40a99b8e74f8bd18bdf2b9
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jul 9 14:58:08 2012 +0100

    heat engine: raise appropriate error on bad stack name
    
    Raise an AttributeError when called with a bad stack name,
    this then maps to the appropriate HeatInvalidParameterValueError
    
    Change-Id: Ic11142e95166ade380c2ad8741ed7063684214fb
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 3100a898b59b54a581bd5122cc6a3b1ea2f1c4b8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 6 17:13:09 2012 +0200

    Add DB refresh/expire on specific parameters
    
    Previously we could only refresh or expire the entire object.
    
    Change-Id: I2207349d6ffff435538a577943316cd13e7f1355
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 84841e53fd2db6cc72dbeaec8d3bf1d4d8145552
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 6 17:03:17 2012 +0200

    Allow Status(Reason) access through Stack/Resource objects
    
    It would be better not to have to go looking in the database for this
    information, so cache it in the Stack/Resource objects themselves.
    
    Change-Id: Id96fbd229898fecc8917a61f19480f70fc2135d9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 179bd1154f7a95b668987aac143232f04f4723eb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 6 17:03:17 2012 +0200

    Rename test_resources to test_instance
    
    Since that's what it's actually testing.
    
    Change-Id: I03556778587e4b1b3a38bf755137eef08455e8f3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 00cb384e8e65e7b046cbf35e103001350160ba1f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 21:53:36 2012 +0100

    heat API : Return auth errors in AWS format
    
    Update EC2 authentication code to return HeatAPIException
    subclasses, so the API error response on auth failure is
    aligned with AWS responses.
    ref #125
    
    Change-Id: Iafa33e7aed4d77f2255b4d879192b9d15a2395aa
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 637875f729538ac5cf294ce20fd37babd84587ff
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 21:51:55 2012 +0100

    heat : heat-boto remove boto.cfg reading
    
    Remove code directly reading boto.cfg, looks like the problem
    with boto not reading the config file internally is fixed upstream
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    
    Change-Id: I57e1d89d0fa83793d51d5cf6266c200d7abc7d57

commit 8bf7353982ea92ae950fd29dd61cb6a6b8d091b1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 6 14:33:19 2012 +0200

    Separate out formatting for Engine API from manager
    
    Change-Id: Ib5fc28bc6a3a2f1f3c0d291954e928d4fb036bbb
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit eb2790cc9968f3430f1e26bad917c5ca153ca806
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 6 15:07:46 2012 +0200

    Add new assertions about event unit tests
    
    Change-Id: I5a7d4690fe752c053a08ecfdb4f0467026fdd245
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4d79e24097aac5e1976240e9694a10ab92f0eccd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jul 6 16:57:48 2012 +1000

    Add basic autoscaling.
    
    This is mainly for ppetit so he can create multiple
    resources with one stack.
    
    Use like this:
    heat create lots -f ./templates/ppetit.template --parameters="KeyName=${USER}_key;NumInstances=2"
    
    Change-Id: Ie609a1843c855953d65183a8f2d8ed49254a265f
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a0da17b39fc94269862d0113f254b966e133566c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jul 6 18:10:57 2012 +1000

    Add NovaSchedulerHints and correct the implementation of Tags
    
    Change-Id: Iaa7ea182414a8fc48a78f5aa6c2c3e1baddb4034
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit fd83855600cf32f001f2004bd130bd948af9e51b
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 16:58:19 2012 +0100

    heat tools : openstack script don't create duplicate pv's
    
    Don't create duplicate loopback mounts if nova-volumes VG
    already exists
    
    Change-Id: I1c580f2915cd92709fbbf4033f77ec3c64e4952e
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ed71fe29081c59d2ff73f27271aa909640a7b7aa
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 16:57:20 2012 +0100

    heat tools : openstack script add restart option
    
    Add option to restart openstack
    
    Change-Id: I7578ff4cecae5351d5749272424d71b56071239d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 55d5713f19d81731903eac4e89020c58b37f4842
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 16:39:57 2012 +0100

    heat tools : whitespace cleanup in tools/openstack
    
    Convert mixed tabs/spaces to all spaces
    
    Change-Id: I3c75ead59afad8a7edf24d8fc6c1c0484dbcd3eb
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 80994c1f3924c3d786eaf509f8cb82b4bfac553c
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 14:42:53 2012 +0100

    heat tests : Add missing headers to tests
    
    Most of the tests lacked the apache licence boilerplate
    
    Change-Id: I34ed0066a6f6751fc872f5286acfc7550319bc8f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit eb1166009065d293162ec0473102cba02a738e0f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 14:15:37 2012 +0100

    heat API : cleanup docstrings
    
    Fix some API docstring formatting & content
    
    Change-Id: Iad1646bb91ae501110ee20a5820ffc5c168bcc45
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 5f812b65b72f75b09aa76d8a71b7f3966345710e
Merge: 767c418 c4cb6bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 5 16:53:06 2012 +0000

    Merge "Add more unit tests for the engine API"

commit 767c41850f0fe516f0553796b49cbb4b9f0b14ab
Merge: faba9b6 f71dc82
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 5 14:18:35 2012 +0000

    Merge "Pass Tags into scheduler_hints"

commit faba9b6d565f105d78dd13acba84ef775741f1e0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 5 23:44:05 2012 +1000

    Add monitoring to the loadbalancer
    
    This makes use of haproxy's unix socket api
    to get statistics. This is retrieved by cfn-push-stats
    and posted to the watch.
    
    Change-Id: I662293bf5dbc55e3f9106f7ef0ceb0641ddae564
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 3b2e0727f958eda6b64eaa303bf798c62498951d
Merge: dfacb9f 9a8f083
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 5 13:17:35 2012 +0000

    Merge "heat tools : heat-db-drop prompt for missing password"

commit dfacb9f49b0651ac0d040d8e6d72b02e6a592ee3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 5 15:42:08 2012 +1000

    Add an OpenShift template.
    
    This is based off of http://www.krishnaraman.net/openshift-origin-on-openstack/
    
    This is the broker, the node is TODO (but simpler).
    
    Change-Id: I5d500a460e43de1172aa7636d9b94f590a979d97
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f71dc82e140b7f7ce58469230eb8fe0b804f71ac
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 5 21:18:26 2012 +1000

    Pass Tags into scheduler_hints
    
    Change-Id: Idad6090c7baf0db943c999585dfe3bf33fc9492e
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 9a8f083276b35c68f3d57acfcb940b0c86e19220
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 10:46:53 2012 +0100

    heat tools : heat-db-drop prompt for missing password
    
    heat-db-drop fails to drop databases when called via
    tools/openstack erase, so prompt for password when
    not passed as a CLI argument.
    
    Change-Id: I4930b8457e0f3e1488187b35be9737578595c387
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 9ce1d94553bd6341ac0416d1920be32506d7a94b
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jul 4 15:41:20 2012 +0100

    heat API : Convert API to use HeatAPIException subclasses
    
    Covert API to use HeatAPIException subclasses, instead of
    plain webob exceptions, which cannot be correctly serialized
    by the wsgi controller, and map engine errors to API exceptions
    so the raw engine exception is not propogated to the user.
    ref #125
    fixes #150
    
    Change-Id: I164c71e12ed29f40ad67188b645ca7ad2fa1fee8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 9de825c5d2395a420df8c66331d2ae2dcb351efd
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jul 4 11:45:38 2012 +0100

    heat API : Implement API specific exceptions
    
    Implement HeatAPIException and subclasses, which will return error
    responses serialized in the correct AWS API format when thrown
    ref #125
    
    Change-Id: I9039f181ee64ed59445667f50545dc6481973cb2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 9d0a22f92be29281718632d28a1cd06fd6219494
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 29 14:11:14 2012 +0100

    heat : add heat-boto test client
    
    Add initial version of the heat cli tool which uses boto
    - revised following review comments to remove jeos/cfn paths
    ref #92
    
    Change-Id: I61b5815b250f3b01d33844ff46dd1612000d51fd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c4cb6bd39590edb4a61f645209715f9577f61324
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 4 16:16:16 2012 +0200

    Add more unit tests for the engine API
    
    Verify the following endpoints:
     - list_stack_resources
     - describe_stack_resources
     - describe_stack_resource
    
    Additionally, check for presence of the correct output keys from the
    following endpoints:
     - list_stacks
     - show_stack
    
    Note that some tests are commented out because they are currently failing.
    This will be fixed in a future patch.
    
    Change-Id: I1c8c46283c1217789e3d4dea7aeac11c991bcef4
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 9c7c0dea6233e42bf5db3c7714b2bb7ce120f242
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 17:11:12 2012 +0200

    Store the context in the resources
    
    It's a pain to have to look it up in the stack every time
    
    Change-Id: I655260aafd17bc17b5895f5b53d79b20aa8eecbb
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c68b2c53150adebff91d8df650f60e3c50ab63c9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 15:04:39 2012 +0200

    Add Metadata to detailed Resource output
    
    Change-Id: I492b9a0a190a905ca5c8597c7236ad1d130a5b77
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit de02376d549ee22b4e1e37bd3e47ac6cb89cb9db
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 14:55:30 2012 +0200

    Use a consistent stack ID
    
    Generate the StackId field of various API responses in the same place, so
    it is consistent and can be easily modified later.
    
    Change-Id: I09a3e170b5825533d8cf9c7dbf08a0ef6700a682
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 5b4a403f51a4099bd8651c8e92101c4f3e5f7e6f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 13:02:03 2012 +0200

    Make Stacks the owners of their own DB representation
    
    Change the way that Stack objects are initialised, so that they know how to
    load and store themselves in the database (they were already updating their
    own data, but the actual creation was being done externally). This
    consolidates a lot of existing Stack database creation code (in the
    manager, nested stacks and unit tests) into one place.
    
    Also, split the template and parameter handling out into separate classes,
    and pass these through the constructor for easier testing.
    
    Change-Id: I65bec175191713d0a4a6aa1d3d5442a1b64042f8
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit ce8f316fb5130641f948c177c4980bd8585f06b3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 12:41:40 2012 +0200

    Don't store the metadata server address in the Stack
    
    It is basically a global piece of data, so there is nothing to be gained by
    dragging some extra state around with us everywhere.
    
    Change-Id: I50ba7391f258dc7d9b1e186f1618fb140e15b26e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 5f5f22f9b00dae1a2c649301bcdc463e12a22016
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 12:32:02 2012 +0200

    Delete user creds from DB when no longer required
    
    The user credentials are only for a particular stack and should be deleted
    when that stack is deleted.
    
    Fixes #162.
    
    Change-Id: Id5d1f101df17ede1843e4f2fca51903c956667ca
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0a6ac9895cd275662e8e38f610308565765ea17b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 14:03:47 2012 +0200

    Remove parsed template from database
    
    It is no longer used since we now store the parameters and can recreate the
    parsed template from the raw template.
    
    Change-Id: Id725bcde7b30ce33d122ccf9c6d5c571f7d754da
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit efc611652efc8802f951552d4183e3cb15875ce3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 18:56:22 2012 +0200

    Make LoadBalancer a subclass of a nested stack
    
    This avoids duplicating the code for dealing with the nested stack
    instance.
    
    Change-Id: Iaeb96f6184cc39677be81bb5619c1fc3e3c9a2a2
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit ab2ee441df4f9f8273db146106b358bd2387c781
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 11:25:33 2012 +0200

    Use unittest assert*() methods instead of assert keyword
    
    This gives much more useful messages when something fails
    
    Change-Id: Ibdf22996e674beef6edabfd3f7ef7d2213b6f26c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 82c61467a62b448e42874be0c2421762c0a6b1a3
Author: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date:   Wed Jul 4 13:27:45 2012 +0100

    Switch .gitreview to use OpenStack
    
    Change-Id: I47f98c5b68bffb0f547a1ca95e745dd2c4665dad

commit 894272f2140a8fceeb37fa6c0f09281f15f43c82
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 3 14:55:56 2012 +1000

    Add the loadbalancer resource.
    
    Some initial simplifications:
    - only one Listener
    - static (only use Instances)
    - only http (no tcp or ssl)
    
    Ref #164
    Change-Id: Iaac06eff83a5c43049adc95a98ebe632e17b490c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 1439f85d72e420101289c02077bd0082b7079cde
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 2 13:10:59 2012 +1000

    Add the Fn::GetAZs() intrinsic function.
    
    This just returns 'nova' right now.
    
    Change-Id: I5449123b912da0f2aaca8a16aee78d391db033dd
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 5faf344646d061710d57b452e395303fb25c55fb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 2 11:23:32 2012 +1000

    Teach CheckedSchema to do nested schemas
    
    Change-Id: Ie321fcded8c826ca98c15078d9a545f283d25510
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 34c196f75b7598602902d2f125ee7d8b4232d697
Merge: 80b21e8 985ba43
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Mon Jul 2 18:16:21 2012 +0000

    Merge "Bump to v5"

commit 80b21e83bdc4fffeecdd580b20bb8e03fc5a5d09
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jul 2 14:04:33 2012 +0100

    heat API : Add missing Response wrappers
    
    It's not clear from the AWS API docs, but all responses
    should be wrapped in ActionNameResponse tags.
    ref #125
    
    Change-Id: I25f3860f30b7313ce63019e96d1da4e370552ed6
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit cd94c31909b98563663d9cf98b8c42a96c3ca188
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 29 13:08:47 2012 +0100

    heat API : Make CreateStack work with boto
    
    Further API rework to make stack creation work via boto
    - Use webob.request.params not GET, as boto passes POST parameters in body
    - Wrap CreateStack response in CreateStackResponse as expected by boto
    - Add API debug for JSON format responses
    - (second version in stackforge due to long-line fix)
    ref #125
    
    Change-Id: I347368ee0395a9019fae69a06e45260379ed7722
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 4fe38c787e47def79cc820790529c3adeb383d27
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 29 10:52:41 2012 +0200

    Add unit tests for timeout extraction
    
    Change-Id: I87837b78dc04683aa686f0573bb7b643667c4553
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b7eee6c64eb88a10b5a3e43985c8c05ceb3fa8ea
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 25 16:38:51 2012 +0100

    heat API : DescribeStacks return all when no stack name specified
    
    The AWS DescribeStacks API documentation says if no stack name specified,
    we should return results for all stacks created.
    fixes #142
    
    Change-Id: I3d17fef7f1b660bf399e8ff82ff39ca2b2d6f046
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 8e5972a333e0e1e88d6d24a8951f0f0a0e216cab
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 29 10:22:21 2012 +0200

    Fix typo in stack creation code
    
    Broken by b942be0e362ef6c04afb45f0ecae8fa4ce432a20
    
    Change-Id: Iad6ace2d460212a41b8504d479335b9f16b5d5ce
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 237e838d4d6b9b8398d319fa08f1fb7ed4b65e17
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Jun 27 23:35:32 2012 -0400

    Change oz rpm install to use yum
    
    yum localinstall will automatically download needed dependencies.
    
    Change-Id: I0a24c549909ff50062affade014d3a17fc252e4d
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 73492540ddd009b6a0a3ed3f855bde38b05e1b0d
Merge: 9a800ac 2c15f8e
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Thu Jun 28 22:00:45 2012 +0000

    Merge changes I05dcfd9a,If938b51a,Iebd2693b
    
    * changes:
      Don't go fishing in the stack for the KeyName
      Tidy up create timeout code
      Get rid of _wrap_db_error()

commit 9a800aca5bbf59e44f3b8b222ae5713c44407c89
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 25 17:42:15 2012 +0100

    heat engine : Return timestamps formatted by heat_utils.strtime
    
    Fix remaining timestamps which are not formatted via heat_utils.strtime
    This allows event timestamps to be correctly parsed by boto.
    ref #125
    
    Change-Id: I62c3bdcdcfd8e1d51e6c3f2566eb1568e60097d2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit ab3701968c8855fbe9b190e8f1a49f5526350287
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Jun 28 13:01:12 2012 -0700

    Clean up pip-requires for stackforge
    
    Change-Id: I50a79fedf80269b8b1bad2c94d132d6692c8ecae
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 63cdd18d5024e5f89e046463326cb40826a6f3c9
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Jun 28 11:36:50 2012 -0700

    We don't need to be installable via PIP so remove build and install deps
    
    setup.py is installing dependencies via pip, making a mess of the system.
    
    Instead if someone wants to install, expect they will have openstack
    installed already, which should contain the necessary dependencies.
    
    Change-Id: I8ff82aad1b85bd4e1acc454b04c5fcec2adcadbe
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 2c15f8e1b3c0a4d05efa7a37f28ad49db22569d4
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jun 27 11:47:30 2012 +0200

    Don't go fishing in the stack for the KeyName
    
    The KeyName should be a property of the Instance, and need not have the
    same name in the stack parameters.
    
    Change-Id: I05dcfd9aa6f92bc7aaa2dbc594062984ac074b7e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit b942be0e362ef6c04afb45f0ecae8fa4ce432a20
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jun 26 11:36:10 2012 +0200

    Tidy up create timeout code
    
    - Change the parameter name to 'TimeoutInMinutes' to match CloudFormation
    - Don't hack parameters into the template, just pass them as parameters
    
    Change-Id: If938b51a0fcb36bb76efeea3527ee7f8eaae9f81
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4bff543367b5283037b21da1b1de34a90e572343
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jun 25 15:03:17 2012 +0200

    Get rid of _wrap_db_error()
    
    This was causing recursion depth errors, and the exceptions in question are
    never being specifically caught anywhere anyway.
    
    Fixes #137
    
    Change-Id: Iebd2693bb1418392ebb041fbbb788bef28aae581
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 985ba43a24c579b0f0be342aa1526cda919a7cc7
Author: Ian Main <imain@redhat.com>
Date:   Wed Jun 27 09:56:54 2012 -0700

    Bump to v5
    
    Heat version 4 is now released, on to version 5.
    
    Change-Id: I6e679f0d202e25bcaa0620b2a858a2910f4d4f33
    Signed-off-by: Ian Main <imain@redhat.com>

commit 038a65947c8a6fdb13328c6555ba148330a0a7cc
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 27 15:20:45 2012 +1000

    Store the user parameters in the stack table
    
    This allows us to use the raw template + the parameters
    in place of the parsed_template.
    Using the parsed template we lose the dependancy information
    that is necessary when deleting the stack.
    
    Change-Id: Icc6ed9ae1617ea9f760a674b44630918669124f9
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a2fc69d90556301334d454e434ca95b7f18b34d4
Merge: 0b6d912 63c81a2
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Tue Jun 26 16:22:36 2012 +0000

    Merge "Do not remove qpid-cpp-server as it is part of openstack erase"

commit 0b6d912a97cd1c609573638f8bc838c313ba01cd
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jun 26 16:41:17 2012 +0100

    heat GettingStarted guide, add oz install instructions
    
    Add F16/F17 install instructions for oz install
    Amended following sdake review comments
    
    Change-Id: I58830edd1581279ac987626b3fb4d7cc51fe455a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f557b22e7e8fc7d3200f538e782dc1d00f56bed2
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 26 23:23:27 2012 +1000

    Add nested templates that implement a simple proxy/loadbalancer
    
    Change-Id: I49f12e399f565d77955cf26288d182d0165422a0
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 8623ba8dbd5707b6d73f081556f94ec64b299ca5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 26 18:57:54 2012 +1000

    Pass the stack_id into the resource_metadata_update
    
    Change-Id: I2b98592cf3970e3cd79ae7002504fb34cf2d42cd
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 63c81a2d87588bb2fdedc885ab9a90a1af9e6a62
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Jun 25 23:11:51 2012 -0700

    Do not remove qpid-cpp-server as it is part of openstack erase
    
    qpid-cpp-server is not a core part of openstack proper
    
    Change-Id: I448b19669c11c839c22b0c012d316b7b7bc75a69
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 1a43f5e6098ba5457a15fd9a2c29ecab4068dfa3
Author: Ian Main <imain@redhat.com>
Date:   Mon Jun 25 21:06:02 2012 -0700

    Few small fixes for getting started.
    
    A few small updates to the documentation and to the openstack install
    script to make it work more smoothly from a base install.
    
    Change-Id: Id9abad058695474aefcae62a5d7a1babc98d0ec9
    Signed-off-by: Ian Main <imain@redhat.com>

commit 29ffcfb0b7e4102527d1937b7f5385e729b910c9
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Jun 25 18:04:25 2012 -0400

    Remove --root=/ in install script
    
    Installing with --root=/ put the files outside of the egg directory,
    which is not desired.
    
    Change-Id: I40142d1a67c0ee12814e08e7b2846bee0ce4e32e
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit d48c537760b9de80a48f51f41d5192814893e390
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Jun 25 12:47:23 2012 -0400

    Add keystone create script for devstack
    
    Copied from heat-keystone-service, with two differences:
    The keystone endpoint-create command has been deleted. Devstack uses the
    templated catalog driver by default, which does not support this
    command. (The equivalent operation is handled manually elsewhere.)
    
    keystone user-role-add parameters have slightly different names,
    requiring _id suffixes.
    
    Change-Id: I3d56becde7b6fedbe29e1cfc6a2b4ad9ab2621fa
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 34f1bb34a50094bfc13034a03e364017ee2e1151
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 25 14:15:51 2012 +0100

    heat API : Align DescribeStacks response with AWS docs
    
    Reformat the DescribeStacks response to more closely align
    with the AWS API spec - boto parses the result correctly with
    these changes.  Ref #125
    
    Change-Id: I23b270c040653f404014807de79c85b2ab63c85f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit d2487050b6e16d9bbb40d5f842793c44780635ec
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 25 10:16:06 2012 +0100

    heat API : Escape JSON TemplateBody XML serialization
    
    AWS API defines JSON templates returned inside XML "wrapper"
    this change escapes XML serialization of TemplateBody content
    ref #152
    
    Change-Id: I7e38dd2010b03061979f0906b582f9461c85cabc
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit e09bd8e662fbd3b1de88759998cb305c49c76b04
Merge: 85fe316 6603aa2
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Sun Jun 24 04:27:46 2012 +0000

    Merge "Add uninstall script for Heat"

commit 85fe316bcde7e185cf98a073df912ded0cefdb08
Merge: e0c3141 893cda4
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Sun Jun 24 04:25:38 2012 +0000

    Merge "Fix path to cloudinit directory"

commit 6603aa27fed8540dfade5e8541d2e1203f5afebe
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Sat Jun 23 22:41:30 2012 -0400

    Add uninstall script for Heat
    
    Change-Id: I1f0cbde19f5b75106d93cafdbd0b8fbf47cbbfe0
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit e0c314125318b5d1c2120fa23ddc03f09e91dc36
Author: Ian Main <imain@redhat.com>
Date:   Fri Jun 22 08:48:23 2012 -0700

    Factor out authenticate method for engine.
    
    This patch factors out an authenticate() function for use by both
    the heat service authentication and the resource authentication.
    This fixes the AWS auth method for creating resources - issue #153.
    
    Change-Id: I134e993263ae6ba4890f56bfbe6a6a3205b7f921
    Signed-off-by: Ian Main <imain@redhat.com>

commit 38d382ad07168ff7e521b574b46a13b9f67bf941
Author: Ian Main <imain@redhat.com>
Date:   Fri Jun 22 09:55:17 2012 -0700

    Fix metadata startup.
    
    A previous change to wsgi init caused the metadata to break.  This
    makes the 4th argument to init optional allowing other wsgi apps to
    continue to work as normal.
    
    Change-Id: Ib0e7042f656a9319013dba4e30c7ffa35cb85f92
    Signed-off-by: Ian Main <imain@redhat.com>

commit f87fb58e01d24f85c7b5c710f1eefdeb1932f3d4
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Jun 22 12:26:38 2012 -0400

    Change install.sh to work on fresh install
    
    Also, change shell to allow use of bash on Debian.
    
    Change-Id: I53b038432389c824556d90ea686c28d132708904
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 893cda431447a319809e2dd9f4ebd41ea012997b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 22 17:30:28 2012 +0200

    Fix path to cloudinit directory
    
    The various path manipulations designed to search for the cloudinit
    directory do not work with the current installation script, or when
    heat-jeos is also installed. They also perform gratuitous manipulation of
    sys.path (causing warning messages) and may pick up the cloudinit files
    from a different location to the code that is actually running. Python
    already knows which heat package we are using - just look for the directory
    inside there.
    
    This patch also tidies up the code for generating the user data.
    
    Change-Id: I14add5f1670aea2562329ff1a1303320a35ff428
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit fa7d89e5eda5fc5ad617cd19b9be3c7277692ab4
Merge: 60c6bb5 b2ab263
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Fri Jun 22 11:05:24 2012 +0000

    Merge "heat API : Add support for ContentType=JSON query parameter"

commit 60c6bb5319e167413c640f472bacd989b44f6882
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 22 14:41:20 2012 +1000

    Ignore the unimplemented properties of IAM::User
    
    They are in lots of templates, and this is going to get
    irritating fast.
    
    Change-Id: I42cb5e5d0e8496028a70d6bed8477a0c864a09e7
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 0d9052ef4f708c34aafa3bb3ebcd126d76db9db1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 22 14:11:01 2012 +1000

    Don't use json.dumps() on the output of get_template
    
    Change-Id: I913e9f9e2b90cd983fb9674b18b6c81d66129e6c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 2eadedf5fde33886ad46f5c8ae958ddb40eaefdd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 22 12:01:55 2012 +1000

    Fix EIP template.
    
    Some of the implemented flags were wrong.
    Allow the eip to be deleted when no eip was created.
    
    Change-Id: Id1d3aaff9adf0988a5c58f8bf0f7b2fb9c7bde44
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit e30ee55ff99db36af97f18716e19a521c36c3543
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Jun 21 15:05:00 2012 -0700

    Remove service name from nova() def
    
    The service_name field is not unique between distros or versions of
    openstack, but is used to select endpoints for communication with nova
    and volume services.  The nova client will sort out the correct operation
    based upon the service_type field.
    
    The service_name field should probably just be removed from the API
    definition upstream.
    
    Tested on F16 & Devstack U12.
    
    Change-Id: I36409dba9d9ec2b453a027fc1e2e78f7c8ace2a2
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit b2ab26398ffa1232e84cc0c78217cad644eaae30
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jun 21 10:52:25 2012 +0100

    heat API : Add support for ContentType=JSON query parameter
    
    From reading the boto code, and looking at real AWS API responses
    it would appear there is an (undocumented?) AWS query parameter
    which switches response format from XML (default) to JSON
    ref #125
    
    Change-Id: I7c8b0f5701be5ff8bd0a3b135e42cf0e46e39ded
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit acf8334a1f370975c18109bf59452b09721ce1c1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jun 21 15:20:16 2012 +0200

    Fix Stack initialisation
    
    self.parms must be set before calling self.resolve_static_data()
    
    Change-Id: Ic3864c56575d759f4f398eb55f90e12c2afdd5f6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 89dca2fd6a6696ccc04ceae602f6ab8673f38e97
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jun 21 14:03:19 2012 +0100

    heat templates : Cleanup README and template whitespace
    
    Align README with latest templates and cleanup some whitespace issues
    ref #147
    
    Change-Id: Iad39c388806bba6497f8abf0de46c04ef7ac7e69
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit c44746d8d500825211b53cfdc54ee8ea73fb639d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 21 20:10:53 2012 +1000

    Fix the wait condition's reading of the metadata.
    
    the db was caching the object, so we need to 'expire'
    it to make sure we are getting live data.
    
    Change-Id: I1108daccc96f3dcfa33fda968ea30d83e03aad2d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 477baee868a990ae5b4733c08668f382aa156481
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 21 14:36:19 2012 +1000

    Fix a typo (from the commit to use state instead of parsed_template)
    
    Change-Id: I37800ad3fb50210b8f27ca889fcfa48e14da8af0
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit c20b33dd1448c1a0b9d8d3141a9fa299d3268f69
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 21 14:54:38 2012 +1000

    Use the correct resource name
    
    Change-Id: I25d6962dfcc75b703aae6489cd0e751317029bc6
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 970c333d4e13685f025c4dc27ae7df9807d6c309
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Jun 19 14:54:27 2012 +0200

    Make the describe-resource API calls user-aware
    
    Fixes #143
    
    The stack retrieval DB calls were already fixed in previous commits but
    there was still one query (resource_get_by_physical_resource_id) that
    would return any resource, not just the ones owned the user.
    
    Change-Id: Ie02ff1e8ba6ea8da2c3d0c7f0a87c32452824fc6

commit d5d13120e44c2f4debec7dabd0cc5e43e41ba11a
Merge: 66fb205 6e6d0b4
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Wed Jun 20 15:24:37 2012 +0000

    Merge "Don't remove resources from the DB during HA restart"

commit 66fb2054fb67dc17d5b6f558ffefe38706d2e1aa
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 20 23:49:26 2012 +1000

    DB: add stack status & reason, resource metadata
    
    Change-Id: I369aa688fa9890a5484de417a9995e7f04f34ad2
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit b85bdc2d6c958a76ef0e274e1cf74ce1a4bb2e07
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 20 22:21:24 2012 +1000

    Use the resource.state_description
    
    Change-Id: I114067f3bb91c6d38b3c4c69af842f4f3585810b
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 6e6d0b42225aee8e5eb351e66ae07363099ff38d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jun 20 13:58:26 2012 +0200

    Don't remove resources from the DB during HA restart
    
    This was broken by 3b91d100a6c6424961e1ec06cf7afd9a1c9cf49c. Resources
    should be removed from the DB only when the stack is deleted.
    
    Change-Id: I6822aee8453afd6076793cff9206a035cff33588
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 1530a29cfd25e33b50e5894fbe47dcd235bb3fef
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 20 21:24:44 2012 +1000

    Make the saving cfn-signaling more reliable
    
    1) The metadata saved in manager.py was not always showing up
       in the db (from wait_condition.py)
    2) Reuse a little method in parser.py to retrieve the parsed_template
       db entry (and store the parsed_template_id).
    
    Change-Id: Ib5b5474b81c0b7439eb1fa4aec5a0f1f21bbde1c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit cfd1232038286fb14b36d1427d4ce5f7611ba58f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 20 14:01:29 2012 +1000

    Remove duplicate setup_logging()
    
    This is already done in load_paste_app()
    
    Fixes #146
    
    Change-Id: I3631b7ade06c8b142960abbf9c172461fae93a56
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit bb92e62581a5241a581af9b243615839ebafa685
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 20 12:23:55 2012 +1000

    Work around keystone strangeness (error deleting user)
    
    Fixes: #144
    
    Change-Id: Ib9298605accc3fc7d12112a4fb57df2b4746864a
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 3df9355a68ad42b04448b62a4197b8ee63b03ac3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 20 09:37:23 2012 +1000

    Fix db exception description
    
    Change-Id: Ie7c1076e9cf5be1d6d63d3af7bc90933c1e588f7
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 6ad3c5c3ea8e4bcbffabc386cb85e5d0cf5daba5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 19 16:04:52 2012 +1000

    Fix the metadata rpc functions
    
    Change-Id: Id3a071a45037d85920d273fa198d59602443026d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f2784dbfba83a44500094b8fb6a85fa4ef7f1ac0
Merge: b40d770 a4090bf
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Mon Jun 18 17:34:50 2012 +0000

    Merge "heat API : Align response StackId with AWS spec"

commit a4090bfb12e86dac68331ddeb15b1b4a3a3fab38
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 18 17:49:31 2012 +0100

    heat API : Align response StackId with AWS spec
    
    Revise response format for CreateStack, ListStacks and DescribeStacks
    so the StackId element is formatted in a similar way to the AWS spec
    
    Change-Id: I0dd34a6dae2e30c63619449ebbf89643ccc9d364
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit b40d770864e0d7ee8923f77a82c2145d84a07c42
Author: Ian Main <imain@redhat.com>
Date:   Mon Jun 18 09:47:34 2012 -0700

    Add more per-user stack support (2).
    
    This finishes up the API calls with per-user returns of stacks and
    events.
    
    Change-Id: Iab6118f35978a6f62ad4d3454842cb7f3d686bc8
    Signed-off-by: Ian Main <imain@redhat.com>

commit d09bad5bef0179bfb0b0d95787da21dea0e6081c
Merge: f6e69f8 0846b4d
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Mon Jun 18 16:30:56 2012 +0000

    Merge "Add execute bits to executable scripts manage.py and runner.py"

commit f6e69f8419b342a3cadb8dd3522d22fdd8905977
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jun 18 17:48:54 2012 +0200

    Add example templates for nested stacks
    
    Change-Id: I3b5fb7018a606895007dad589f1dcbeb6b0defe6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0846b4dd1b7696f6db5850fce6c6ab0f563643ca
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Jun 18 09:13:25 2012 -0700

    Add execute bits to executable scripts manage.py and runner.py
    
    Fixes issue #138.
    
    Change-Id: I90b139dac5775cb061bed79e86e1ded99b9322ca
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 9a19032ff8dc3804150461dae926ca75db1288d6
Merge: 7155c52 f13727e
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Mon Jun 18 16:00:53 2012 +0000

    Merge "Add manpage for heat-metadata"

commit 7155c52d9481fe98decb78769667cb9ba6874479
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jun 18 15:15:50 2012 +0200

    Fix DB calls in Resource API
    
    The DB API changed in 892b99bff480aba8240a1f49eadeea079bae4c81, while
    these calls were added in 247cc2bb9afb9db87ffad7160ef05d2cc4457235. Both
    patches were under review simultaneously.
    
    Change-Id: I8fc6c3228c99f025e01fc82979fa94f086649909
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 247cc2bb9afb9db87ffad7160ef05d2cc4457235
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Jun 14 17:51:45 2012 +0200

    Add describe resource API calls
    
    Fixes #62.
    
    This commit implements the `DescribeStackResource`,
    `DescribeStackResources` and `ListStackResources` AWS API calls.
    
    Change-Id: Id9161b3c3eb527d5936c5b8978e32a67ba6c12bb

commit 614f7868c43b57eee658a0eb5f82281ffe62b2af
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 18 11:30:50 2012 +0100

    heat api/engine : Reworked approach to aligning with AWS date format
    
    Modifies heat internal default date-string representation to match AWS spec
    Note heat.common.utils.strtime default format loses sub-second precision
    Avoids having to regex mangle datetime string format
    ref #125
    
    Change-Id: I1347e82b1c3ccac5eac7c85858cf8009723547c2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit f7f4755076c29931e4ed372448487068d9462f15
Author: Steven Hardy <shardy@redhat.com>
Date:   Sat Jun 16 08:39:10 2012 +0100

    heat API : Align time format with AWS spec
    
    - Reformat ListStacks/DescribeStacks responses to align time format with AWS spec
    - Remove duplicate member tags in DescribeStacks (now handled by XMLResponseSerializer)
    ref #125
    
    Change-Id: Ib001acba591dba52f3f56052427d2b298d781ea0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 88c8bdee3f650411f5b46c87c7c45b9e76360cd8
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jun 18 15:10:30 2012 +1000

    Lengthen the timeout of the WaitCondition in the HA template
    
    Change-Id: I059075b80dfac0472ae2e2e47d14b2ee4093a530
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit be76361dea8eeabbdeedc12338d772ca7b94972e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jun 18 15:09:48 2012 +1000

    Change create_watch_data from POST to PUT
    
    Change-Id: Ie460e76668fdbc3101da183e373d02eefda945f3
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a9f0c446bc48870d6f1e51739cf5519ebb19ba05
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jun 18 15:09:08 2012 +1000

    Get the context from the db not the context of the guest tool
    
    Change-Id: Ia2403161a0f97eb1c807be339d8024ff5c245695
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 6044ef1b78678916611764ba023f3514ab447d14
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Jun 17 16:05:58 2012 +0200

    Implement Nested Stacks
    
    Fixes #123.
    
    Change-Id: I89affe471b4df898c7d3157ff23f9b64003c2893
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 582b8b29cb443410ee87f8518e648aefdc42014f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Jun 17 16:05:57 2012 +0200

    Move parsing of parameters out of template parser
    
    The format of the params received by the manager is a property of the Heat
    API protocol, not of the template, so it makes sense not to have the parser
    extracting the template parameter data from them. This simplifies the
    implementation of #123 (Nested Stacks).
    
    Change-Id: I8eaf50caf79f69359cbc8ee1f0193c08d7944d1c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 892b99bff480aba8240a1f49eadeea079bae4c81
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Jun 17 16:05:57 2012 +0200

    Get stacks from the DB by either name or id
    
    This code was previously misleading, as it appeared to get stacks by id,
    but actually got them by name. This patch adds a separate API, so
    get_stack() gets the stack by id and get_stack_by_name() gets it by name.
    
    Change-Id: I1cbbb3f9211661ad665e208d87298f177825f8ac
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 42ad6a7a652aed6b154b85dfcf818324dd627ea7
Merge: da698d0 be0d7bf
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Fri Jun 15 22:44:08 2012 +0000

    Merge "Fix latest DB migration script"

commit da698d0bd28fbaae55666af56f47972074f71aed
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Jun 15 08:39:02 2012 -0700

    Lock to pep 1.1
    
    Change-Id: Ic363e8815c057219b2a7ba9dfc149d47378283e6
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit be0d7bf844c6a4b6b594e83f1e7a6d0a2d73826f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 15 16:19:08 2012 +0200

    Fix latest DB migration script
    
    Unfortunately, as long as the user_creds_id column is not nullable the
    script will still fail if there is data in the database. However with this
    patch it is at least left in a recoverable state. Also, downgrades now
    work.
    
    Change-Id: Ibb7b7664ad2532154fab90a50bbb95ae9ccfbb91
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f8fbbd07265763b2df4903133e1f73b049b6834d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jun 12 16:23:35 2012 +0200

    Raise NotFound exceptions from database
    
    Raise a specific exception (NotFound) if something is not found in the
    database. Then we can match on this exception, rather than searching the
    error message (which effectively makes the text of error messages part of
    the API).
    
    Change-Id: I22673ffb1407cf95b1fe24eaec8824039c1dda4e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 3b91d100a6c6424961e1ec06cf7afd9a1c9cf49c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jun 5 09:46:10 2012 +0200

    Tidy up Resource creation and deletion
    
    Most of this code is common between resources, so put it in the parent
    Resource class and have subclasses provide handle_create()/handle_delete()
    methods for all their extra needs.
    
    Change-Id: I14c6afa9fdd1ecc065036fa93bde2a693b6c3eb2
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 067e037064b3e10f5ede335ac2688fbb4a2f7b01
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jun 14 11:08:51 2012 +0200

    Do proper dependency calculations
    
    Change-Id: Ic8a9bd2105ebfff3604a45b45eac39da3b1bbcf5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f74219a52d1d9b0c367409c46c7c64e48cf24464
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jun 14 19:22:44 2012 +0100

    heat manager : rename dict keys to align with AWS API
    
    Rework to align API response format with AWS API XML key naming,
    ref #125
    
    Change-Id: Ifa0d1b87d0b721e71c50be06815a7aaf12b07bb3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 8e95a0f2117b35e6326c0c32ee7bb2818f77e1c7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 15 15:51:28 2012 +1000

    Add a better error message
    
    This was "ERROR" in the event status description.
    
    Change-Id: I401bbbe1c8e8cafe64a692b7faba63bd2ab38a4c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit b637eef5af14896a58cc33c8bf880066b3a796d4
Author: Ian Main <imain@redhat.com>
Date:   Thu Jun 14 17:46:12 2012 -0700

    Add a user creds database table and associate stacks with username.
    
    This patch takes the credentials passed in from the context and allows
    you to store them in the database in the 'user_creds' table for later
    use with HA operations.  It also adds a 'username' to the stack table
    for direct comparison and user validation to support per-user stacks.
    
    Thanks to Angus for fixing the tests for me :)
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit d36d8d38ba3d9b440a385f519f19bda6c3416547
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 15 10:55:51 2012 +1000

    Fix the metadata server auth (KeystoneCreds only sent from heat)
    
    Change-Id: I918ff76485649ec56312f7029895d61e0cbf7a4b
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f45d43626385c15246e55212a0093ae03695e203
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 15 09:49:46 2012 +1000

    Fix the error reporting.
    
    - Don't return a dict error
    - in manager return full response
    - return the result in Resource.validate()
    
    Change-Id: I585ea9dd9cf747927fb4effb90cfff49cba20931
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f13727e22d7feb2f485a96a9884ce973e5e3aabb
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Jun 11 18:19:10 2012 +0200

    Add manpage for heat-metadata
    
    Fixes #140
    
    Change-Id: Iafedefbf2e564760f560ca5f44a44b0cb943fede
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 1fc9ff4a0b0acc8c68e14f617ede4b4640ba00b1
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jun 13 15:45:46 2012 +0100

    heat API : return response body as XML not JSON
    
    AWS API returns response as XML, this implements a new response serializer which
    turns dicts returned from the engine into AWS style XML responses.  Ref #125.
    Updated following review comment.
    
    Change-Id: I8170ed814be0b5cea98761a2723e12be216374a3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit fd1c6c8010ba12a48864ab76808ae0e5247415d2
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Jun 13 12:50:01 2012 -0700

    Add heat-db-setup.1 manual page
    
    Change-Id: I80650931fd9d5de902e37458766d6938f6466bb3
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 91352c012bc396aae9b1ed264eb9de5f09ff3817
Author: Ian Main <imain@redhat.com>
Date:   Tue Jun 12 16:37:26 2012 -0700

    Pass Full Credentials to Engine
    
    In order to support HA operations, eg restarting an instance, we
    need to have full credentials in the engine.  This patch passes
    in the credential information into the engine and uses it to validate
    the the user.  A future patch will have this information stored in
    database and associated with each stack.  It also assigns the username
    in the case of EC2 style authentication allowing us to support
    per-user stacks with EC2 auth.
    
    Change-Id: I4b92f83d4d10a2bfebd4ddedc8a4f53b3e1217fe
    Signed-off-by: Ian Main <imain@redhat.com>

commit 709cf56ef71de0c96ed75a57c8043db3152e7e3a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 13 12:54:57 2012 +1000

    Implement the user/access keys using keystone
    
    Still no groups or policies
    
    Change-Id: I3a78a62f741ed5979994b327e269fb9407bcebff
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 6d4c5618db43725c0af2b37661911a960bfa0aa2
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 12 16:42:06 2012 +1000

    Allow an already deleted watch to not fail the stack.delete().
    
    Change-Id: I1fbf46475b901bb2cc3b85784444e547ab9d9e67
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit b343c6b8381bf9ea5085b3f8bcf555cc0c9cd792
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 12 14:34:41 2012 +1000

    Delete redundant escalation_policy (rather use instance.restarter)
    
    Change-Id: Ia5f6b6adfc5c8c60e1db5b2f4e0aa186d0437ad9
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a8ae32ab5cf65c3f680a8a51fc109be843f8919d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 12 12:45:35 2012 +1000

    Make sure create happens if a resource has been deleted
    
    (recovery situation)
    
    Change-Id: Ife4492bb32c4b1bbcedeba6e6bdd89bd952effcd
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 986d203cca0badb565708ab4dfad5620eea0b969
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 12 12:58:34 2012 +1000

    Make sure the 'nova_instance' is refreshed when ever the state changes
    
    Change-Id: Ifadfb12bcd933ac66681fc94335c1ddd83fc31be
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 014566935ae1b89e7a83a0da64e0f4b14ef81cc9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 12 12:35:04 2012 +1000

    When restarting a resource make sure that the parsed_template_id is set
    
    we need this to re-create resources else we get foreign key errors
    from the db.
    
    Change-Id: I41b142db020ae84026f3b7007ecd7d927a27880d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 1da0f5d97429d3e89fe0419592204ec437c69753
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Jun 8 11:36:49 2012 +0200

    Fix heat-jeos installation in Getting Started
    
    Change-Id: Idc6a3a7d5b541e03e99eba69fb91f0b069d789c0

commit 834c13e4ab7683a62b43d3b1109faf8ae0344b7b
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Jun 8 11:24:04 2012 +0200

    Make heat-keystone-service a tad more robust
    
    The ADMIN_ROLE extraction failed when the column with the role names was
    centered instead of left-aligned.
    
    Change-Id: If39292b65dfce5fa820396e49e72fc635c2cb0c2

commit 23305fb9fc1401c472afb7b7a39ae74fe702248f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 8 12:54:03 2012 +1000

    Add install.sh
    
    fixes #134
    
    Change-Id: I5d0aa01143050a305c44573220e96dba9f81e1ae
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 0b7feab00b3f85cfa10a2cb78825ffdc65a73e46
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 8 12:06:50 2012 +1000

    Add EstimateTemplateCost API
    
    see #1
    
    Change-Id: Ib362b5320b5fa050dfb70202838042e222287534
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 3601fb263c1dfa6cfd2e5a3e18e6d6690e5eb62c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 8 11:35:56 2012 +1000

    Add the GetTemplate API
    
    see #1
    
    Change-Id: I178a1d9a19570296b62381548434fb4fcf836fee
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 4c359db1b01d6b1be90dc872f7e1620b077ac918
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Jun 7 07:47:47 2012 -0700

    Remove cfntools and jeos
    
    These files are now available in the heat-jeos repository.
    
    Change-Id: I392e7443348a31e8454ae14d957b0b54560c2ec3
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 4b5c3fee7b7deba2c909247c5e65c2537be554ad
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 7 15:05:54 2012 +1000

    Convert getLogger(__file__) into getLogger('heat...')
    
    Makes a mess of logs when not installed.
    
    Change-Id: Iab6bd247b943f276bf8de64aed65619b38f99acb
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit aca71be770e2bc0fecd06a64a7e36bcb7cf686a3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 7 11:41:03 2012 +1000

    Add a Timeout (-t) to the heat options (and make -f for templates).
    
    This makes the cli more consistent with AWS and implements
    the timeout feature.
    
    Note: the timeout is in minutes and defaults to 60 minutes.
    
    Change-Id: I41dea75170c871c1ee47948643311752d9d5e41e
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 7e02a65f79b8a356b93822555caf40f0a9dfdb97
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 6 23:07:54 2012 +1000

    Fix the setup of daemon config
    
    Change-Id: I02d4a3da63d2438067cf64c15432d66b539c30bc
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a724259609d288781e1384745c5d9b40b42c7693
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 6 15:15:15 2012 +1000

    Update openstack-common
    
    Change-Id: I5af06e0d44a69b9f968fce91db441157a69ea9c7
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 7e81a8a8f9650a9df8c879b817941927447d43c3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jun 5 15:02:45 2012 +0200

    Improve parser readability + add unit tests
    
    Change-Id: I7dd8c394e6543d1ee545648af32c9025c522b6e0
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 3c33de8b9fe02532e0db4f224998f329e2c4fb48
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jun 5 12:07:37 2012 +0200

    Fix parsing of metadata
    
    I broke metadata in bece6593f00f8e096f045982673f85c67863b932 by no longer
    updating the parsed template in the database. We need to resolve references
    runtime data before storing the parsed template, because the metadata code
    uses this directly.
    
    Change-Id: I753fe199779ae1b0046366abadca0111a81463c6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 5c3fc7bb61418ab0cad43ec0247f6f1566662575
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 15:02:05 2012 +1000

    Rely on instance_id been set to None
    
    Then we can use the default FnGetRefId()
    
    Change-Id: Ib328289b4d22cb7ab7b9985fa7c95cb19bcfd9c3
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 963e96e010c33d8dfbd8f32c6b7d9e275d45814b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 14:29:26 2012 +1000

    wait_condition: use properties not t['Properties']
    
    Change-Id: I81fc0dd654e9011fc7404f184390379edeacda8f
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f5c88891cb3754f68dec03dfb642a8185c6eb70d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 09:31:34 2012 +1000

    Fix cloudwatch delete
    
    Change-Id: I091bb394f5ad3afad82d55f4a81bdce94cc09b71
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 8c30545f871d92f97780a6389b5b06148c59f441
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 11:22:07 2012 +1000

    Fix restart_resource()
    
    Change-Id: Ia77c9a5ab4107d9803a6e8180fd9e34ac13436f5
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit b0894d0e53d2c1f54099c931e630cc3a7f438e03
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 11:11:05 2012 +1000

    Pass the context to the db calls
    
    Change-Id: I38937ee37926507dab8a7ff9e0d0d42a3ada707d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 360c279c49b34c24ce4370a9e7b11241b609cf15
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 09:34:40 2012 +1000

    add user auth to ha template
    
    Change-Id: I044d153bc33de08c6736fd4dd32380ceb0bf8caa
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 4a19ab5903f0be6bdc56f98227665cb72e22fddd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 10:57:08 2012 +1000

    Make sure the resource exists before trying to update it.
    
    Change-Id: I5d8bdc0f4ceff61cab0b909dcaaf8ab5952ba4af
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f0b75758f634ce0d782a707d8ae451f428216d17
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 10:36:21 2012 +1000

    Fix the conversion from instance to resource name
    
    Change-Id: Iaca10eb5468bd7b64b6a66f87fc6f7066053cb27
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 2d4d5529f9045ca48f8d98b31f5a119f828acca7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 10:04:16 2012 +1000

    Restructure watchrules to make them more testable
    
    Change-Id: Ic8085de3f5692249d82e68462bbed02da787712f
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a9135324f654c90d4da859b1b727836daa48b871
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Sun Jun 3 22:12:58 2012 +1000

    Add missing properties to cloud watch
    
    Change-Id: I8d4be61d1a0b7bd37c97148ca291d22487ee22ba
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 70c687ccf735ce8194b1e774880493c8e7047226
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Jun 4 13:13:21 2012 -0400

    Change command interpreter to bash
    
    This is important since /bin/sh is symlinked to dash by default on
    Debian based systems.
    
    Change-Id: I47b6317981ec020bed0bc45f7f68b636d71023d6
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit ba49964211fb4e8f5052d17840f4654e7205d646
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Jun 4 16:44:20 2012 +0200

    Add qpid-cpp-server to the openstack setup script
    
    Change-Id: Ie63b1031583091b5bdfd52f79e59b841f21ee778

commit 93ea554c0e72fa02b9cbdaf616b905039faf8d79
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jun 4 21:16:31 2012 +1000

    Teach heat-api about the bind_host
    
    Change-Id: Ica32693373a87f01c41755a2b041c187bddd034d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit bece6593f00f8e096f045982673f85c67863b932
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 1 10:50:15 2012 +0200

    Refactor template resolution
    
    Resolve functions in templates by making a copy of the data rather than
    modifying the original. This means that e.g. a resource resolving functions
    in its own template data does not result in changes to the data held by the
    Stack.
    
    This patch also refactors all of the template resolution methods to operate
    using a common parsing algorithm to move through the tree.
    
    Finally, the resources have been worked to load data as it is needed,
    rather than requiring external code to put them into the correct state
    before using them.
    
    Change-Id: I79eafaefc9ced07b652fac7162aa2edbfa7f547a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit abd4b735e5f2d32e3d7bf5580b128090af0f8e4d
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Jun 1 13:55:54 2012 -0700

    U10 wordpress template
    
    Change-Id: I25beb7b48e287b3097379c1e1f92adc309ce9c83
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 1852373470a7b41bc20c3cfba2e7fb7922c0748e
Merge: 6b0e7a4 4b1e386
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Fri Jun 1 19:18:32 2012 +0000

    Merge "Fix the Getting Started guide for the new setup.py"

commit 6b0e7a4314d0573319f55da3833b5b0f2b56435e
Author: Ian Main <imain@redhat.com>
Date:   Fri Jun 1 11:50:36 2012 -0700

    Fix new pep8 warnings.
    
    With the new release of pep8 we have some different requirements.
    This patch fixes them all.
    
    Change-Id: Ief16becba47007460f8b125907b055aa51de999e
    Signed-off-by: Ian Main <imain@redhat.com>

commit 4b1e386c795299fadfb7227db171235ed4b33ebc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 31 16:09:35 2012 +0200

    Fix the Getting Started guide for the new setup.py
    
    With the new setup.py script, OpenStack must be installed before heat,
    otherwise PIP will start importing bogus dependencies (at least on Fedora).
    
    Also install stuff that was previously being installed by setup.py. This
    will eventually be replaced with an install script (see #134).
    
    Change-Id: I942def545f9351a1f3238dac49f34b13370e2597
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit fdfb967cef058cad934abc3c11d7f3785b540903
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 31 11:17:30 2012 +0200

    Refactor Resource creation
    
    Allow the Resource class to instantiate the correct type of object for each
    resource.
    
    Change-Id: I518f27fa27f675b9e497aac40962331833077aed
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit ee2500263d0053c0850c92309c6dcbe12a014626
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 31 11:17:30 2012 +0200

    Clean up imports
    
    Change-Id: Ibca9c8ab8b9dafb813baee6a9c4aa024bf9733e2
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0da631a3216ac5c76e7c12ca606b7be78a28d052
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 31 11:17:30 2012 +0200

    Don't use sys.exc_value
    
    sys.exc_value has been deprecated since Python 1.5, and is not thread-safe.
    The replacement is sys.exc_info(), but in this case we don't need even that
    since we have the exception in question available.
    
    Change-Id: Ibb4b354fd099fbf0d6390163eb4f7cc9e97db0e9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit cfe391073a681ba8f1b806fc53428adb36486181
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 31 11:17:30 2012 +0200

    Get list properties working again
    
    The CloudFormation documentation is very confusing on this point.
    'CommaDelimitedList' is one of the data types that are valid for a
    Parameter (the others are 'String' and 'Number'). A CommaDelimitedList
    parameter takes the form of a string where the list members are delimted by
    commas:
    
        "item1,item2,item3"
    
    However the documentation also uses the phrase "Comma Delimited List" to
    refer to the type of some Resource Properties that are, in fact, simply
    lists:
    
        [ "item1" , "item2" , "item3" ]
    
    ...as if there were *another* way to represent lists. (Note that the
    items here need not be strings, and in fact are usually objects of some
    variety.)
    
    So we need a different data type to represent the latter. (This patch
    changes the name from 'TupleList' to just 'List', since the actual Python
    sequence type is just an implementation detail.) In future, we should
    probably also verify that only the 3 valid Parameter types are used, and
    perhaps that list Properties contain only objects of the correct type.
    
    Change-Id: I94054f588fc37f7d4ba245f2e92b86ac9c872c37
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d1f71f6d5d4dbbcc68d33f3779f09aaaf4aefd19
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 31 14:25:59 2012 +1000

    Remove _authenticate() check for metadata calls (temp)
    
    To be replaced by proper AWS auth, which needs AWS::IAM::AccessKey
    resource type to be hooked up.
    
    Change-Id: Icbdb08493fb51add5e6d3d5f4a153595f93c8f75
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 07d1eb9b78e72ae6266680f13824b254a7564d6b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 31 10:48:35 2012 +1000

    Fix the HA template (sed the username/password)
    
    Change-Id: I835a9f6d2a9abfdeb5af8fb703c8abae5afae2d1
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 5f7cf95f26bb7c2c26f1dba70502ff2bfc4b9db0
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 30 14:49:27 2012 -0700

    Fix apt-get install
    
    rpm deps not available on ubuntu systems
    fix apt-get install doesn't work (string vs list)
    
    Change-Id: Ic2da1415f9bccb15321afd0ed5111041cbf2a2d0
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 13e6e7d1a9309d8510d489d789dbd862c539d37d
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 30 20:06:23 2012 -0700

    Remove python 2.7ism
    
    Change-Id: I9e74d79e42cc22aa0f0883fb1e1582be2860d842
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit f924a681ea005650fae60fcc52c6dc66bfd9b1db
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 30 13:26:20 2012 -0700

    Compress qcow2 files to take up less disk space
    
    This results in less data transferred during a glance registration.
    
    Change-Id: I36d17c6e1bf12e3e0f37394d5522c6f4f59313de
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit c2f0e488f3b09cfd6dbb81d70ec67ff8b2746dc8
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 30 11:15:34 2012 -0700

    Install argparse and update the U10 package cache
    
    cfntools require argparse
    U10 package cache needs updating to install packages correctly
    
    Change-Id: I3630f5082d4b9f73fa95805d51684a68bf8c0d6e
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit a093e6d074872c761dda3ab84701e35b019c4204
Author: Ian Main <imain@redhat.com>
Date:   Wed May 30 10:46:15 2012 -0700

    Fix auth failed exception handler
    
    This patch fixes the auth failed exception handler so that we
    get back a meaningful result when authentication fails.
    
    Change-Id: I2f37daed3890fd685fa6f701938b675460e76b0c
    Signed-off-by: Ian Main <imain@redhat.com>

commit daa2c72f0cbe1c860e65821cb9566ea97e0bda4a
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 30 16:52:17 2012 +0200

    Set stack's `updated_at` time
    
    Fixes #126
    
    Change-Id: Ie7abe6c3385632138671cb0b7f12dfa33e69bae0

commit bd281338493ea3612c65602b60a578276be5db89
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 25 11:53:57 2012 +1000

    Add instance restarter
    
    Change-Id: I8ef28efc7d86a1a3a44f4784cb496c415a14f95c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit afa0d4cf0b48eaf8fb790e0e31649e952b2e5e84
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed May 30 13:10:02 2012 +1000

    Add a name to the checkeddict to improve the error messages
    
    Change-Id: I11edc3bce77cd84d0393d6d95c6733b7901f95a1
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a5962d10782263a33e7d3fb403b12ee3149e408f
Author: Ian Main <imain@redhat.com>
Date:   Tue May 29 14:09:57 2012 -0700

    Authentication Overhaul
    
    This patch updates the authentication system set up in heat:
    
    - We now authenticate against the 'heat' service at the entry
      point to each api call in the engine.
    - We are now using the 'Context' class to contain the authentication
      information as intended.
    - The two context classes are unified and we now use the same one
      for both WSGI and RPC.  This is the intended design as the
      context is loaded by the WSGI middleware and then passed into the
      RPC methods.
    - We are now doing token authentication in the API that works with
      both native keystone and AWS style authentication.  That token is
      then passed on to the engine for further authentication for various
      endpoints.
    
    Note that the heat-api-paste.ini file requires updating in order for
    this to work on your system.  Admin user and password must be set
    properly in the authtoken section in order to perform token based
    authentication.
    
    I suspect there will be a few bugs in here yet.  This is just part of
    the authentication/identification changes we need to make but I wanted
    to get this in so we could continue to work with a boto based client.
    
    Change-Id: Ib635ecd3088304e8d51d8e1fc31a8b1bf751caf3
    Signed-off-by: Ian Main <imain@redhat.com>

commit 9ea875a250637664b009f332fd9c40ba126b5ee9
Merge: 29aea9c 9098543
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Tue May 29 21:40:06 2012 +0000

    Merge changes I31d97b0d,I10507113
    
    * changes:
      Changed SecurityGroups property type to TuplesList
      Change the policies for User to TuplesList

commit 29aea9c552f77209cb56b260cc40aa08237b588e
Merge: 8803a2c 71681de
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Tue May 29 21:37:22 2012 +0000

    Merge changes I475ac4f7,I212cffac
    
    * changes:
      Add missing "properties_schema" to WaitConditionHandle
      Fix jeos_path when not intalled as an egg

commit 909854333857706070973883d7bc4e55af53f394
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue May 29 15:03:05 2012 -0400

    Changed SecurityGroups property type to TuplesList
    
    Change-Id: I31d97b0de6e72bd24f0f78d86890726fc1e8a138

commit 99e1bc728b7b54ba8d2a3a64545a5f288fb21583
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue May 29 11:08:02 2012 -0400

    Change the policies for User to TuplesList
    
    Change-Id: I105071135a6b20a414c2f4016ca3a8312a4ee2a2

commit 8803a2c66e9680ecb35f08139f7c6654aba799a5
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Sat May 26 14:16:19 2012 -0400

    Add missing flags to enable working with RabbitMQ
    
    Note: rpc_backend=heat.rpc.impl_kombu must be set in both heat-api.conf
    and heat-engine.conf.
    
    Change-Id: Ia7f5af8805240381f28ecae1efc0a677155f898e
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit f3913a9a3e8f0f84f74ba65a1ba7634e231f354a
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 23 17:59:41 2012 +0200

    cloudwatch: set HA template to send watch data
    
    The Wordpress HA template is now able to utilize the cfn-push-stats and send
    alarm messages to the metadata server.
    
    Change-Id: I52b615d3401dc2665e2b30e4a925d61ed204c827
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 1d5aec19d72aecdf6158e90f55d42a9abe280dd5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 25 19:24:29 2012 +1000

    Add the basic cloudwatch feature
    
    Fix watch db tables and silly programming errors.
    get basic posting data to metadata server working
    add watch_rule_get_all()
    check for alarms in a periodic task
    delete watch_data when the rule is deleted
    add a last_evaluated field to the watch_rule
    remove unused option to watch_data_get
    take better account of the sample period.
    - still much to be done here (evaluation periods).
    add some useful stats to cfn-push-stats
    fix how the metric is accessed
    fix a divide by zero
    
    Change-Id: Iaf98499d0e3ac6d6f951ea38b3b0f409669258da
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 71681dec4479b1a77ce5a40cff0da282c739419d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 25 12:12:14 2012 +1000

    Add missing "properties_schema" to WaitConditionHandle
    
    Change-Id: I475ac4f72613a2f20275949a01168246cae1fb52
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 07018fe88a020532649369750fbcc529196571d7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 25 11:51:21 2012 +1000

    Fix jeos_path when not intalled as an egg
    
    Also use os.path.join() to sort out trailing "/"
    
    Change-Id: I212cffacc018f456894e9b7921fef75256edcf45
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a16a8bb9c272613bcd8e705e1e53aa5c0771f569
Merge: c3256b5 84b6569
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Fri May 25 00:29:15 2012 +0000

    Merge "Changes to checkeddict for tuples and required"

commit c3256b508334396d78c7faeec255c732faea7fe2
Author: Steven Dake <sdake@redhat.com>
Date:   Thu May 24 17:12:27 2012 -0700

    Allow login to U10 jeos launched from heat
    
    cloudinit on debian expects the user "ubuntu" - hard code to ec2-user
    useradd doesn't create home directories on U10 without -m option
    
    Change-Id: Iaaee6df560b60e203b17a36bba57ac410ad6ed56
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 84b6569ae65f766fdb225dbdf96db73c1bf1cb58
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 24 15:22:41 2012 -0400

    Changes to checkeddict for tuples and required

commit 4c1adc193f95a9b1ee5df81b318e8150b1b1b7b6
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 23 18:24:57 2012 -0700

    Make i386 cfntools jeos work
    
    was expectin cfg-* instead of cfn-*
    
    Change-Id: I6234829d92a33e8bd4a8fab246ded2c1a43afc55
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 0cdccbd93f478244e65b3f1d74519721d6e113bf
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 23 16:09:00 2012 -0700

    Add U10 JEOS support to heat jeos_create
    
    This requires oz 0.9.0 (or latest master).  0.8.0 shipped with
    most distros does not have customization support for Ubuntu
    images.
    
    fixes issue #23
    
    Change-Id: I854aaf9657353b3fdb4768a277b527304e88ac8e
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 03ae5b2d1c33d23105206398425d235e21e7c223
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 24 21:01:46 2012 +1000

    Validate all resource properties
    
    Change-Id: Ib0346fd22636d3eae31c688426b966f07acda19c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a83fcc6aa33540257762cd73196e8bbb448ef10b
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed May 23 16:13:00 2012 -0400

    Add functional test to verify jeos and stack ops
    
    (Tox.ini has been modified to only run tests tagged with 'unit'
    to prevent this test from running with unit tests.)
    
    This test requires an OpenStack install present and will not run on
    StackForge. This test creates a JEOS, waits for glance registration,
    detects key registered with keystone, creates stack, and verifies over
    SSH that:
    - cfn helper script SHAs match tree
    - verifies presence of wordpress
    - verifies expected user data is present in multipart mime file
    
    closes #112
    
    Change-Id: I22a0dfe41986d466ac689c050fc33585e3e6229e
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit a4f5ae264d669eaf4a484f4877d0ebad7070f753
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed May 23 16:19:33 2012 -0400

    Fixing variable name for debug message
    
    Change-Id: I5992e0c449b5caeff3fd91c3aefe721ab32830c4

commit b00987868101b75aa599723471689106b4d411e1
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed May 23 15:37:07 2012 -0400

    using the calculated path for the template tests
    
    Change-Id: Ifc5f142cf36a387d32f2ea70dfcb1bb33a44a056

commit 5467f40da3c447f43da487b1faa8d37638c89cf5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 23 20:34:54 2012 +0200

    Update resource statuses in the database
    
    This ensures that resources will not get deleted multiple times when
    something else fails during stack deletion.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c63965b3a09c149d2bc7bd1438a1d8b03bdc3e55
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 23 19:14:39 2012 +0200

    Fix deletion of security groups
    
    First off, don't set the instance_id to an empty string as soon as we
    retrieve the object from the database.
    
    Also, don't fail if we try to delete a security group that no longer
    exists.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 72c383396d42c21b73b4ce66717e6e0cfd2978ce
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 23 07:42:19 2012 -0700

    Only run cfn-init once
    
    cloud-config-final.service (atleast in Fedora 16) runs the user scripts.  So
    there is no need to run them in cloud-config.service (which this file is processed
    by).
    
    May need a revisit on deb based systems.
    
    Change-Id: Ib7c3d56a50bcdc4ea68626e1d57a28a4ec70e1b4
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit e4ccac1f94f4aaa9951be05ab95343b9f36b11b7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed May 23 22:15:38 2012 +1000

    Use the new CheckedDict for Parameters
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit af15b0d1346fac894b1daebc58634792889c9c4a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed May 23 21:53:11 2012 +1000

    Add some better checking for parameters and properties
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 4955a9bf4807e37ad868ef0f20bd82e2645c25ca
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue May 22 17:05:55 2012 -0400

    Fixing path lookup to make sure the templates can be found
    
    Change-Id: Ib48c27a9d0a794d243e48661aaebb108728af6bb
    
    Conflicts:
    
    	heat/tests/test_resources.py
    	heat/tests/test_stacks.py

commit 0aceb40c391db3630e3847ada2a11553eecb95f0
Merge: d3c5d74 12fbd15
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Tue May 22 20:03:24 2012 +0000

    Merge "tools/openstack: Updated to latest openstack F16/F17 tools"

commit d3c5d744b64af75ff8ac29689ad120d330f0c076
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue May 22 13:29:25 2012 -0400

    Adding the AWS::IAM::User and AWS::IAM::AccessKey to the mapping

commit 12fbd15b60ed9489462a46fafef31ee76776d680
Author: Steven Dake <sdake@redhat.com>
Date:   Tue May 22 09:50:53 2012 -0700

    tools/openstack: Updated to latest openstack F16/F17 tools
    
    Change-Id: I8e6b376a90ad1641c10eea2ef6711a9cd09ee2e0
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 70020f71d94d63130be38a8b35f0520b3fa3a501
Author: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date:   Tue May 22 13:11:39 2012 +0100

    Update gitreview for new Stackforge remote
    
    Change-Id: I265b771fa2b4d040a9e90ceb265941acdea90156

commit 2fc479c6845a71eba91ee72693caf8ab255a87bf
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 17 16:02:04 2012 -0400

    Align with project standards.
    
    Rebased from: Change-Id: Ifc9fff4f88dfaebe97b7caba4d603d23c645e346
    
    Reviewed-by: Steven Dake <sdake@redhat.com>

commit 4c68cf63e3e640a843a83a70cf34742bed6f3683
Author: Steven Dake <sdake@redhat.com>
Date:   Mon May 21 16:43:48 2012 -0700

    Fedora openstack projects use new tools to setup databases
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 3970b5d76aecc0c64d408a2836df42da9c16b40f
Author: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date:   Thu May 17 11:16:00 2012 +0100

    Add .gitreview for Gerrit
    
    Reviewed-by: Steven dake <sdake@redhat.com>

commit 40fd546f8390f95c7ed6fab06fbc1eac63aabf11
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 21 23:41:17 2012 +0200

    Add an integration test script
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 21413cafcd515af253e72de6b4fc6f237c0cb684
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon May 21 15:41:29 2012 -0400

    Pep8 fixes

commit af8dab457046b5911ad22d8442dfd153408ebfc5
Merge: a72267c 2f827bd
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon May 21 15:39:11 2012 -0400

    Merge branch 'puppet_instances'
    
    Conflicts:
    	heat/api/v1/__init__.py
    	heat/engine/parser.py

commit 2f827bdd2a5e6b12ee05a334096ebab1ede9580a
Merge: 7d0a350 480d382
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon May 21 15:33:08 2012 -0400

    Merge branch 'puppet_instances' of github.com:heat-api/heat into puppet_instances
    
    Conflicts:
    	heat/api/v1/__init__.py

commit 7d0a35030ae50d9405368d36519db712896841cd
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon May 21 14:50:54 2012 -0400

    Fixing _decompress to handle bundled and compressed
    
    The api call to os.path.splitext returns the root and the ext;
    however, for a .tar.gz the ext would just be the .gz, which meant
    there was no handler for a file with a .gz extension.

commit a72267cb0cab2e61e49b6f53e40aadbca3e8ec91
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 21 14:53:42 2012 +0200

    Handle failures when deleting stacks
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 53eda6d78a4c8714dfdd198ad61f2505c894dcde
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 21 20:18:33 2012 +0200

    Fix problem with updating parsed template in DB
    
    The parsed template would not always be updated correctly when the actual
    template object had not changed (only the contents). This change forces an
    update by making a copy.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 08c79368245573b79acfb1e0b203813aa8de5078
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 21 15:08:36 2012 +0200

    Fix copy-paste errors in template descriptions
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 45702a0d2690e13f923d9880b0afe64356ce5d16
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 21 14:53:03 2012 +0200

    Improvements to uninstall script
    
    - Kill only the specific heat processes we want (heat-api and heat-engine).
    - Remove installations wherever they may be located.
    - More robust handling of input.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 80302ceffdf7a3361791f150dc3a095eb15d32ff
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 18 14:02:39 2012 +0200

    Refactor some not-particularly-Pythonic code
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 8550a36f48e151a1618bf2cc9631f1788a8d7264
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 18 14:02:39 2012 +0200

    Delete networks when erasing OpenStack
    
    This is required to remove any network interfaces created using nova. If
    these are left behind they prevent a new installation of OpenStack
    re-adding them.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 04da765efb31cdcb5ad59d0d188402a8d8570df6
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Fri May 18 11:10:55 2012 -0400

    Adding chaining to CommandRunner

commit cd798ff0cd5cdba71d11daa38e608c1a4dd0d4fb
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 17 10:33:39 2012 -0400

    Making PrivateDnsName return the ip address

commit bba73f4c75056799ca384485016db026f38df30e
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed May 16 16:15:34 2012 -0400

    Adding puppet and puppet master instances

commit c9da1924bf13ab96c601bbf27f63c86a200198b0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 18 14:02:38 2012 +0200

    Wait for instance startup in GettingStarted test
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d9474b32c260c0914f5c607c63ade2d52eca56ef
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu May 17 21:43:51 2012 +0100

    api : fix pep8 warning
    
    Fix long-line pep8 warning
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 67203a54975db6294469b8fb0fcfe20105830c72
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu May 17 16:49:15 2012 +0200

    Allow engine and metadata server start in any order
    
    When the metadata server starts first, it will wait for the engine to come up
    and only then registers it's hostname and port and becomes available.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 480d38266bc313197aa664c5c20f2a3b4f6d893b
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 17 10:33:39 2012 -0400

    Making PrivateDnsName return the ip address

commit 1fb16a433053cff5476872f79d25cdd476a69c6f
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 16 15:15:39 2012 +0200

    Clean up the API routes
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 77a30304ed141c54c3b346b2cfff5ca81c231910
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed May 16 16:15:34 2012 -0400

    Adding puppet and puppet master instances

commit a18fb604ccecc37e73f6ea8f4f5f6a6755d60ad7
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 16 15:15:39 2012 +0200

    Clean up the API routes
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 53447e67fd0d14888a29e1bd683c2ff99a06bac6
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue May 8 14:26:23 2012 +1000

    Make the wait condition behave better when the stack is deleted.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 298e0921aeb081ab1e3f8aa93ab3814a849877a2
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed May 16 09:36:43 2012 +0100

    heat cli : Add options to bash completion script
    
    Ref #87 add completion of long-format options, align the command options with
    the "heat help" option
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 9f8b4b42858ae6cd66c0f1e64cc8e30475b66258
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue May 15 22:01:18 2012 +0100

    heat client : reduce duplication between functions
    
    Move common code into utility function to reduce duplication
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 26cc7efb4d7623be0ef994ff00cf8c00943c44e2
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon May 14 23:27:02 2012 +0100

    API and heat-cli rework to align with AWS CloudFormation API
    
    Ref #115, rework API mapper to route by Action= query parameter,
    not by path, and align heat CLI tool with revised API.
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 0f1bd5d29102318e62b5a10281d809807bd3b163
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 15 15:03:38 2012 +0200

    Report errors when resource creation fails
    
    In order for the Stack creation to fail, resources must raise an exception
    when their creation fails. The Stack's create code will set the resource
    state appropriately; resources should not silently do it themselves.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0720684956380ad3b5140f474a1c5a568bcd66f9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 15 11:42:37 2012 +0200

    Modify command names for consistency
    
    Replace 'events_list' with 'event-list' and 'jeos_create' with
    'jeos-create'. This makes things consistent with the conventions of
    OpenStack projects. The old versions will continue to work for now.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4f34681d1de31f72f6a2f7ecddb22162d5cf6373
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon May 14 14:24:25 2012 -0400

    Updated the version to 4
    
    Signed-off-by: Chris Alfonso <calfonso@redhat.com>

commit 7a28ec601e5da452f6f8395b8f809acd89bbea19
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 14 17:56:33 2012 +0200

    Make 'heat help' show a list of commands
    
    Previously we just printed an error message about not specifying a command
    to get help about, and no hint about how to work out which commands even
    existed.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 645d093c457a1ccae00d0068a6c2e76960c05b85
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 14 16:03:49 2012 +0200

    Allow the Getting Started script to run non-interactively
    
    Related: #84
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0cd65f8cac2cb79ea469cd3473d56ecc3df33dd7
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon May 14 09:55:50 2012 -0400

    Fix pep8 errors

commit 596b74d72a76a41356a70026570f77c1d2fd037b
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon May 14 13:56:27 2012 +0200

    Set cfn-hup to send events to the metadata server
    
    Fixes #107
    
    This is implemented using a logging handler that sends events to the metadata
    server.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 95e3a0165d8d417b46aa86ade168c6dd9d528d0c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 14 21:15:23 2012 +1000

    Slim down the getting_started template.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 3c84d66de9a07c69c22e94fdf743a2a4687e02eb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 14 21:14:55 2012 +1000

    Check for the presence of Metadat before trying to include it the multipart
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 845a670f7d8b7e96db6491661bd4bdec06250520
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri May 11 19:23:27 2012 -0400

    Add status argument that shows service status for all required services
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 534416cfcd496dc7ed791278caa133f317bdee09
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 15:12:56 2012 -0700

    Kill some pep8 errors in test_stacks.py
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit adc331c8184e38b550bc6fc7106fa16916d11028
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 15:10:47 2012 -0700

    Kill some pep8 errors in engine directory
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit e4ba0e5642bbcaac28031b088d33a07141519195
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 15:07:34 2012 -0700

    Kill few pep8 errors
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit d7568d2fa3fd6873e62d4cfe3ed169de8f32914a
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 14:58:14 2012 -0700

    Properly test ref valid against proper input
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit af7e57cad2466240172a3b15eb7bd61b82d1be01
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 14:55:24 2012 -0700

    Use manager to test ref validation
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 6b631d9136171fc8244cce72e4810bff36102fc2
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 14:52:31 2012 -0700

    Add test cases to test valid and invalid keys in FindInMap
    
    Partially Fixes issue #111
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 099318e5139d4585dd1a4d7f90e355088c987062
Author: Ian Main <imain@redhat.com>
Date:   Fri May 11 13:54:40 2012 -0700

    List stacks tests
    
    Implements a list stacks test.  This one calls straight into engine
    manager.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit fb23391277120e1ecd76e7b94625256c097a29db
Author: Ian Main <imain@redhat.com>
Date:   Fri May 11 11:14:08 2012 -0700

    Move list_events into the class.
    
    I think I went too far last time, this should at least be a method
    of the class.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit a4f82756f8c25a80618d98e8e467c65973520aeb
Author: Ian Main <imain@redhat.com>
Date:   Fri May 11 10:47:17 2012 -0700

    Factor out a start_wordpress_stack()
    
    There was a lot of code duplication in the tests so I factored out
    a function to start a wordpress stack.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 50e5f2de917612dcf4285d9fdc66036329f1ffa5
Author: Ian Main <imain@redhat.com>
Date:   Fri May 11 10:23:38 2012 -0700

    Add event_list test.
    
    I moved parse_event out of the method and into the class so we could
    call it from the event_list test.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 876a450a4e0a4a30f5e5097b837cf88ff61d2aad
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 11 18:54:38 2012 +0200

    Add uninstall script
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 95e5ed067096ff52bbcd6c49146b74e1d59d2d3f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 11 18:54:38 2012 +0200

    Add Getting Started guide to repo
    
    Convert the Getting Started wiki page to ReStructuredText format and add it
    to the repository. Also add a script that will extract the shell commands
    from the document and run them, so we can use it as an integration test.
    
    The script can be run using the command:
        > bash -c "$(./tools/rst2script.sed docs/GettingStarted.rst)"
    
    Related: #84
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 65397941666a0aed0e8785a76628c57f35819a79
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 11 18:54:38 2012 +0200

    Add cfn-get-metadata to the manifest
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit cbdbf3146eb268da56f775a3a8d9d91197464e40
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 11 18:54:38 2012 +0200

    Fixed problems with starting MySQL in heat-db-setup
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 46bdd9bb1e963f97bd45718a85ae83d6888fb659
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 09:41:51 2012 -0700

    Add test_validate_ref for invalid and valid inputs
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 7f4323365a6eedca8465fe70282c14b89cb8d78e
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 08:33:13 2012 -0700

    Check for invalid Fn::FindInMap key
    
    Partially Fixes Issue #111
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit bbed10f941e59c92775db845a6d6b97e1066063c
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 08:30:17 2012 -0700

    Check for invalid Ref keys in validate
    
    Partially Fixes Issue #111
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 33c6afd6c86cf7ea42e60ef114cad6938d400929
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 11 10:45:35 2012 +1000

    TEST: slightly better version with minimal template in place.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 8de0aff3d798342c831736b2fa6f8ce2e76b971a
Author: Steven Dake <sdake@redhat.com>
Date:   Thu May 10 17:10:53 2012 -0700

    Add volumeattachment validation
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit d3bdddee682bd7039d6febee332817be099e4f86
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 10 15:31:31 2012 -0400

    Allowed the database call to return no parsed template.
    
    The database impl was raising an exception if no parsed template
    exists.  The logic that was looking up the parsed template
    expects None to be returned if the template isn't stored.
    
    * I also fixed some pep8 errors.

commit 3d5b05c50dc40aab5aedea1a4af8573b5e8e6212
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 10 15:02:46 2012 -0400

    Adding a deepcopy of the template before stack create validation
    
    Calling stack.validate will modify the stack's template, which
    we don't want to do.  We just want to validate the template and move
    on with an already parsed template.

commit 74f9579f8988287bf1d96f81f0862236c5535286
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 10 14:04:16 2012 -0400

    Add stack delete test, and set stack to DELETE_COMPLETE when done.

commit 45bb10655a303991c81b5b570ffda9a9905c3a29
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 10 13:40:15 2012 -0400

    Removing stack validation on create

commit 0a642cd918b93f254328236b2c1afb5a522730dc
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed May 9 16:49:45 2012 -0400

    Adding stack create test

commit 899e952ed697d7b44b5d3b9438c95dd157f3a14a
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 9 13:35:22 2012 -0700

    Validate invalid mountpoint.device entries
    
    Since KVM only allows /dev/vd[a-z], we validate that implementation-specific
    sd[a-z] is rejected by heat validation.
    
    See:
    http://docs.openstack.org/trunk/openstack-compute/admin/content/managing-volumes.html
    Search device name
    
    Resolves issue #71
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 4d432413e13f4cba88e9ed8a4f9ddd15925bc501
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 9 18:23:22 2012 +0200

    Allow sending events using metadata server
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 50d2ca8029619c1f13c990e76b579dc4a93cad40
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 9 17:02:28 2012 +0200

    Typo in a logging declaration
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit dd3d21ee9e8b3539584d8921c15284d66c46d7c7
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed May 9 09:45:15 2012 -0400

    Fix stack creation - CREATE_FAILED issue
    
    The stack creation call to validate the stack was resetting the
    stack template attribute.  I've made a copy of the stack purely
    for validation purposes.

commit 1b903f8b7078f7b9cac29919c91bb5bb5904d0d2
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue May 8 17:39:08 2012 -0400

    Add ability to automate testing with tox.
    
    Install tox via easy_install. Tox automates the creation of multiple
    virtual environments, each of which can be used with a different
    interpreter or specific custom tests (and is what StackForge uses).
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit ee2076b2aa33cf1f3248e8d1052f52bd723762ac
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue May 8 14:41:21 2012 -0400

    Add option to exclude pep8 examination to run_test.sh.
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit d8b3a3387bf35dca7742395d3b8095b2d6e35b04
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue May 8 11:31:25 2012 -0400

    Add test coverage option to run_tests.sh
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 2733b9a5debb80066a2df1efe90f74f0dd0be6e7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 23:04:35 2012 +1000

    Connect up the waitcondition code to poll the metadata for the signal.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 41ae2e7995172854b7a981ea86422637c8227ddd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 22:04:04 2012 +1000

    Save to parsed template as that is used in the parser.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 23849cce1331b7c7fe3550000bcae08757db9ead
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 20:49:39 2012 +1000

    WaitCondition: fix the url to the new metadata server.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f3c2d67cd5148e997e86f9b8f046f2d92a8854f4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 20:47:28 2012 +1000

    Add WaitConditions to HA template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 6d4a0dff6bac0b722e5a5ae769463b60e7451873
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 20:46:44 2012 +1000

    Download cfn tools from the master branch.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 154442a3a6cb5333a1d9f1a8111977100985f0e7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 20:15:02 2012 +1000

    Escape the quotes going into cfn-signal shell command.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 62e7882e9e61df2017549e6edbe7b1b5a3238ca3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 18:58:36 2012 +1000

    More peppy fixes...
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f36197a872ca2de5676b44372cbb725674822b98
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 18:29:17 2012 +1000

    Add implementation to cfn-signal
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit c3b0fe9ff52a23e2253a295f86d61e580e75713e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 18:27:35 2012 +1000

    Fix undefined LOG variable in db.session
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit ffeda71756840a13640a101016967bd7ab5b1166
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 18:25:48 2012 +1000

    Remove unused "cloudinit_path" setup in resources.py
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 7a28922d1e564182a901781f8055f4eb7bcb1405
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 18:25:03 2012 +1000

    Metadata: Add bind_host to the config
    
    This needs to be set to the nova interface to work.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit fa55a6984205ce9356b7c533309380e8c9e1a696
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Sat May 5 03:01:31 2012 +0200

    Register metadata server's entry point with Engine
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit da366b43b91c380cea2f7e20b63e0e536b9fadcc
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Sat May 5 03:00:16 2012 +0200

    Remove obsoleted metadata files
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 9d69b204023eed196d4dd113d3378a0704d428dd
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri May 4 15:16:11 2012 +0200

    Connect metadata server to the engine via RPC
    
    Similarly to the way heat-api works, the engine does all the heavy lifting (db
    access, etc.) while the metadata server provides the API layer that communicates
    with the engine.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 247266e7bc65550b87f90ecfb2cb1c5a9e5efc0b
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Fri May 4 14:53:17 2012 -0400

    Moving key validation into instance validate

commit 8bfacf2e2322ec440e752fe90e2eb7cf615c8f79
Author: Ian Main <imain@redhat.com>
Date:   Fri May 4 11:23:09 2012 -0700

    Apparently boto expects / to be list stacks.
    
    This patch just makes / redirect to list_stacks.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 9e2c35efa8df0ba3597b9f9e4e33b706eb86dbe9
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 4 10:09:41 2012 -0700

    ValidateTemplate API call framework
    
    This is a start on issue #111
    
    While no actual validation is done by this patch, this patch introduces
    the framework for validating in each of the resource types and returning
    an appropriate error when a validation error occurs.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 6bae53753bff2bf1062a1fdea2ee5963e6ed6b65
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 4 11:21:55 2012 +1000

    Fix the sql in the rails template (didn't work with the mysql in f16)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit d7c2c89a15d0a9cbdaa6dee920865b8cea21e327
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 3 17:45:18 2012 -0400

    uncommenting the metadata server attribute so the tests work

commit 3af0fb67db69204f941ff78a385b85972879898d
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 3 15:06:20 2012 -0400

    Validating the KeyName against nova on stack_create
    
    Fixes Issue #98

commit 47cf2132a27f85cccf779f070badc3cebbc37a3c
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu May 3 16:19:17 2012 +0200

    Connect cfn utils to the remote server
    
    The cfn_helper's `Metadata` class can now connect to the metadata server
    prodived it's URL is known and available.
    
    Engine will pass metadata server's URL via the User Data to the following file:
    
        /var/lib/cloud/data/cfn-metadata-server
    
    If the file doesn't exist or the server is unreachable, cfntools will read
    metadata from the `/var/lib/cloud/data/cfn-init-data` file as they did so far.
    
    Note that Engine dosen't currently know the metadata server's URL so it's not
    passing it to the instance yet.

commit 25568e75c335fb3deef534d17853c6496f9911c1
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu May 3 16:33:53 2012 +0200

    Fix cfn-get-metadata params and output
    
    Marked the `--stack` and `--resource` parameters as required and set it to
    actually write the metadata out.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 18eb501eb00779953ebbeebd97123648b49af02a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 23:26:25 2012 +1000

    Fixed the interpretation of the file extension.
    
    My initial lack of understanding of "is" and "==".
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 235112febe5e4d413ff8ca62ce22e9444974c1e5
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 3 09:10:13 2012 -0400

    Only showing the Outputs when the status of a stack is CREATE_COMPLETE
    
    This fixes issues #96

commit 863f04af0e421ae88db35f9a452fff7d8196dc96
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 22:33:23 2012 +1000

    Fix unbound error in cfn_helper.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 9f7fd58a3024e9215594a7f5ee08b8e9bf3b7450
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 3 08:15:08 2012 -0400

    Adding mime_string to the Instance instance and fixing tests

commit c0b9519e49ad5dda2d92df2b22ff19a6afc365e2
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 22:01:09 2012 +1000

    Fix some indentation and pep errors
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 07148b41e7d8fb065c17eb7013927cae13d03bff
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 14:37:53 2012 +1000

    Hack the Rails template to work.
    
    - set the image name mapping
    - we don't have AWS::IAM::AccessKey yet
    - we don't have PublicDnsName yet
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit c273624c021a95b08467b9d4fca6f2067ca38235
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed May 2 15:48:34 2012 +1000

    Add Rails template example
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 59fb839acbf49d4820744012afcb5e56a0e0a837
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 14:34:57 2012 +1000

    Add dummy cfn-signal
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit cdcc931848f8dc09ce4ff85d9ea472220dff8769
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 14:34:39 2012 +1000

    Add WaitConditions
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 20fc3c76a2f2e577af5eefc2640eb97a586593b1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 14:34:13 2012 +1000

    Split the resourses up into seperate files.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 9de4d852dcc484485df5a47a17092f186fed3d1e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed May 2 15:44:38 2012 +1000

    Handle "sources" in cfn-init
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 9843bc8baae066643d556c1bc5600202338011a6
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 2 13:51:08 2012 +0200

    Initial metadata server API
    
    This implements the basic capabilities we need from the metadata server. Each
    API call returns proper HTTP responses (404, 409, etc.).
    
    The server is currently not connected to a real database. Rather, it uses a
    simple mock. This allows for quick initial API changes before things stabilize.
    
    The immediate next steps are to integrate the server with the cfn tools
    (cfn-metadata being the prime candidate) to see what may be wrong/missing.
    
    And then to connect the server to a real database.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit c061dc0029517b7d8a346f8a8661f30620aed9ff
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed May 2 12:13:19 2012 +1000

    Add very basic support for installing (apt, python & gems)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 67d5892ea96729b161e080914999236794949c53
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue May 1 14:48:16 2012 -0400

    Add cfn-get-metadata to files section of cfntools tdls
    
    Found while writing test for jeos creation
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit b4cd790a8402c6cf8706765ff3a1767995f8b7d4
Author: Steven Dake <sdake@redhat.com>
Date:   Tue May 1 10:02:48 2012 -0700

    Modified README in tools directory to explain a few more tools
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit dc3c5bdf3db776cbabfce5e2ee3634c2f689f8f6
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue May 1 11:04:34 2012 -0400

    Scoping the session per thread (request).
    
    Fixes issue #94
    http://docs.sqlalchemy.org/en/rel_0_7/orm/session.html#sqlalchemy.orm.scoped_session

commit f7c1b3311d0fb5e9c0643830d81cd9f228402d64
Author: Ian Main <imain@redhat.com>
Date:   Mon Apr 30 15:03:39 2012 -0700

    Oops, meant for website repo.

commit 53a41bcfeb5dc7dd88604a89621bfe7284a1539f
Author: Ian Main <imain@redhat.com>
Date:   Mon Apr 30 14:57:38 2012 -0700

    Heat Logo
    
    SVG format of heat logo.

commit 028f33397082ca3169ad5a0a975853df8a1e27e4
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 30 13:04:51 2012 -0400

    Skipping the import if its deps aren't installed, use --no-skip if you want to run this

commit 1d706dd93efd8ed4c960a63b8e235b5537a92865
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 30 10:39:51 2012 -0400

    Copied the python-novaclient test code to avoid importing via python path

commit f10f5cf15b55c87f948196ad07a75e5b24142ab5
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 30 10:13:15 2012 -0400

    Adding the metadata.log file

commit 908f572b34805c77b40c3890f2caa370561f8867
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Apr 27 16:44:11 2012 -0400

    Finish necessary changes related to jeos_create move
    
    As a result of moving jeos_create, the code is now used during test
    execution. The library libxml2 which was previously being used is not
    available in pip, so lxml has been swapped instead.
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 4fa77a658c12b8caef72059ec645d04d80a8b639
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Apr 27 18:40:49 2012 +0200

    Add skeleton structure for the metadata server

commit 669f312c9a80a5ce322b838ebe2b1656b292b888
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Apr 27 15:25:50 2012 +0200

    Update heat-api docstring

commit 524d214b84f2fe5c5e1df25989eed5860e59de0e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 13:12:33 2012 +1000

    more pep fixups.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f7c677354261a78cacc1affab27ddb48a209ba6c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 13:02:58 2012 +1000

    Add cfn-get-metadata make all cfn tools more consistent
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 1f141a6d041e9bbd6b7710c09c35cdd45f6fdab9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 10:21:43 2012 +1000

    openstack-common: timeutils and importutils seperated out
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a9a6906a6ec0427112ee6137ff210cec9050d958
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 08:28:55 2012 +1000

    openstack-common: update cfg.py
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit d4f0c0d25b4d0d55b3dbe393fcc2fd8429d834c2
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Apr 26 16:51:00 2012 -0400

    Move jeos_create into utils so it can be imported
    
    The main reason for this move is so that jeos_create can be tested with
    the aide of Mox.
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 2ba3934ce06b7c2d1c58d3347906c562063a9565
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 26 11:02:15 2012 -0700

    Put Starting Heat API in log file and add logging setup to bin/heat-api
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 2a06886077c05e1bfae7c28a09cf3489da6e450a
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 26 10:55:23 2012 -0700

    Remove stray print debug message
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 87eca83a047a103529d2563a046e773705805f89
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 26 10:49:10 2012 -0700

    Quiet down the QPID logging since it isn't helpful and makes logs hard to read
    
    Should likely be removed later, but for the moment, logs readable without
    grep now.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit a1908e501440b2505560fcb07b37a1ea26c92f16
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 26 10:29:26 2012 -0700

    Kill prints and replace with LOG in heat/rpc/__init__.py
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 10ef7521f5f9186d807699f7409fc4c2ceb0e8b5
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Apr 26 17:29:42 2012 +0200

    Stub out system calls in metadata_files test
    
    Since CommandRunner now honours `runas`, the tests would have to be run as root
    for the commands to succeed.

commit 6b0d2d7827dedf553ac7d25cb75ebcacc7379532
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Apr 26 17:27:25 2012 +0200

    Implement runas for cfn-hup
    
    As a side effect, this fixes #109. By running everything through `su -c`, all
    the piping and redirection issues are outsourced there.

commit 3802dfbba6f27df3c172bdb6ace261a7be998c49
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 00:32:15 2012 +1000

    Add test artifacts to gitignore
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f489c956c67240cfa3f3d5b8a4b54c9e7d4531e7
Merge: 1029566 fe8a57c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 00:22:24 2012 +1000

    Merge branch 'ha'
    
    Conflicts:
    	heat/db/sqlalchemy/session.py
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit fe8a57c9cfd0e29aae5bd1f913370434953a5d69
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 00:05:59 2012 +1000

    Handle cfn-hup non-value parameters
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 10295665615ae525caa06c42a3edf3b81db817b8
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 26 09:33:01 2012 -0400

    Moving db error wrapping into heat session to avoid a nova import

commit afb73a6e764819c953e17c0f181b8dd7f4ad8e1b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 23:16:59 2012 +1000

    Add an easier way to update the cfn scripts
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 1eb030408051afe71e306f501bcd94bd9dd8509f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 23:16:25 2012 +1000

    Fix up the template - some scripts not right.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 51242e0802faad4c5c55765b68cfdd73c93bdf3b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 23:15:39 2012 +1000

    Fix the cfn logging
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit ee56b0978e3fa4a3aea51f4257b769b9e48f139a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 22:51:38 2012 +1000

    Fix userdata mime creation
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit e5553b53d5ef72a135bc12f23a00561c76d9e119
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 22:51:38 2012 +1000

    Fix userdata mime creation
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 7151e579849263a73869c94d3ccd7f79a631d717
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 21:46:02 2012 +1000

    Add a real creds file for the cfn-hup config tests
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit be49adb7fc2c0f0e25c98e6b842a5a0fad90542b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 21:45:01 2012 +1000

    Re-add the file logging to cfn tools.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 9f9716f3d944aa7782727179c6001ff2b4b0b435
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 17:01:38 2012 +1000

    Make sure AWS::StackName is avaliable
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit e5208d1d717e59a451ca3e4ac095990d466ae3c3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 17:01:13 2012 +1000

    Add cfn-hup config into template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f03e90140461bef74468ff6ee5326b6ca9fea2d5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 14:13:56 2012 +1000

    Copy the single inst. wordpress template to With_HA
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 5d1a35fbf5c1a19b0aa65065a29eba3cd0f209b7
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 24 17:08:36 2012 -0400

    removing import of common config because it needs credentials

commit 0fbe418d12d94c660c880a357ad3ce5a9b5211cd
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 24 16:53:31 2012 -0400

    Adding the nova.exeption import to fix the tree

commit 6d2f82aca047dd850c699fbd2178c910be39e041
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 14:07:12 2012 +1000

    Add file support to cfn-init
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit cdd4d98862b14eded343413390cf05aa549b245f
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 25 10:46:27 2012 -0400

    Adding instance  delete test

commit c227c4581a0b77b19db5ed5b13006d2656283433
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Apr 25 16:34:59 2012 +0200

    Log when cfn-hup couldn't restart a service
    
    `service.restarted` hooks are not run when the restart failed.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit febbc668bbe2b415c874696be98612625ef6237a
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 25 09:42:28 2012 -0400

    putting python-novaclient back in pip requires

commit 0a9d87e28ddebe77ee3be4399533214b80c377b0
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 25 09:39:39 2012 -0400

    Removing nova from pip requires

commit 724b5f3902c2117040d21b830f7b276bb5dc4e1e
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 24 15:29:08 2012 -0700

    Make heat-db-setup generic enough to run on RPM or DEB distributions
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 83e6754c823bdba656c8073e24d4a696b1d7b592
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 24 17:32:17 2012 -0400

    Adding the nova module to the pip-requires

commit 3299dbecb989b249b47e08b3bce5e19e3553ab92
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 24 17:08:36 2012 -0400

    removing import of common config because it needs credentials

commit 30482f729079b109caf7bc1c3c7e2a5853df4cf8
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 24 16:53:31 2012 -0400

    Adding the nova.exeption import to fix the tree

commit 710e2bb5f8774b4b3f8130ae484c6d4f3856cab7
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Apr 24 14:48:38 2012 -0400

    Use pip package name, not the RPM one
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 53446bb36edde490896aff3725b30a14d62c50fa
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Apr 24 14:17:40 2012 -0400

    Update virtual-env requires and documentation
    
    Document the necessitity to keep tools/*-requires up to date and add
    missing dependency.
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 9b23e2dc355e9a6e4d7a1cd1dbd2bc89ff9c8ba1
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Apr 24 16:41:35 2012 +0200

    Make cfn-hup configuration handling closer to aws
    
    We now enforce the presence of the [main] configuration section, check that the
    credentials file exists and ensure that there is at least one hook defined.

commit 77935cb3d482ace4cd60183fca5131035a29a7ad
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Apr 24 14:56:15 2012 +0200

    Better error messages for cfn-hup configuration

commit 39a8bfc296c465694e851c7ca227d50754324617
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 24 13:57:51 2012 +1000

    more work on cfn-hup
    
    - correct the default config files
    - seperate out the monitoring of services
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 6bf132f9098a24102e73851f4c7e08acea3493fa
Merge: 833fedb ed92ae3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 24 10:34:38 2012 +1000

    Merge remote-tracking branch 'origin/master' into ha

commit 833fedbfb3baa5da2faaf8a518d00e593f4ede55
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 24 10:32:58 2012 +1000

    Add test case for boolean.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit ed92ae34715eead8c5a128f27d13af3599b16a29
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 23 16:37:09 2012 -0400

    Assert the instance auto increment on the id worked

commit 6c0bcf0727094b9f988ec5ddc0d695c22862d402
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 23 14:47:44 2012 -0400

    Removing the run_tests.py, was replaced by heat/testing/runner.py

commit 841452f350447683a851151088ee5615d64c97b8
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 23 14:46:49 2012 -0400

    Changing version scheme to just major

commit bf859e6f4b69d35dbf496522d1e75e4cc3771507
Merge: c5ff641 29c0f9a
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 23 09:26:57 2012 -0400

    Merge branch 'resource_unit_tests'

commit 29c0f9a74f74c75478b81994d5a9f77ecf52f75e
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 19 19:24:28 2012 -0400

    Adding instance creation test
    
    Signed-off-by: Chris Alfonso <calfonso@redhat.com>

commit 9a0ee86fc62372b3c4a99b705981fe653bdaa088
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Apr 23 15:10:33 2012 +0200

    Fix `to_boolean` in cfn_helper
    
    The lowercase conversion and striping whitespace from strings was being ignored.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit c5ff64132a2c036740c9d45c5be00dc35e690a58
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 23 22:59:27 2012 +1000

    Try and keep track of the stack status.
    
    Ref: #93
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 7b039d4a7523e3468c3bad7eeea6f30ddf428cca
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 19 18:10:20 2012 -0400

    Added db setup and teardown with sqlite

commit bad1eb37a5b3659e888a5840ed931aa11fc0e37b
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 18 09:03:17 2012 -0400

    Adding unit test for instance creation

commit 7f44cf82bf8255a336104ac40191e51a0aa7ec52
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 17 15:55:36 2012 -0400

    Adding resource initialization test

commit 2af14f5abf1e57b3b9a27362f63ad7bb85b25be1
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 19 19:24:28 2012 -0400

    Adding instance creation test

commit bdaed9b99735b5e221d423f5e53a5113b1512b99
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 19 18:10:20 2012 -0400

    Added db setup and teardown with sqlite

commit 9c69836bfd49e2b8c7b84d0de9c44aa5c852373e
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 18 09:03:17 2012 -0400

    Adding unit test for instance creation

commit 517d00fb8a749b6d912e1dab29fea9c28b1136da
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 17 15:55:36 2012 -0400

    Adding resource initialization test

commit 12797d82299b9e5698a25b6b7284642bed72ab79
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 23 19:54:11 2012 +1000

    Initial cfn-hup (wip)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 2019dec757321ae3dae3e32ac63f352df5a534a4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 23 13:08:32 2012 +1000

    Move common cfn code into cfn_helper.py
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit e67e9c80bf8369314378268cb0b988be0c45c115
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 23 12:04:46 2012 +1000

    Fix more pep8 errors.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 3323d045d2af05c0bf9ecdf59980f70cb24fd6ae
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 22 18:39:11 2012 -0700

    Update version to v3
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 87dac3d2c05d6f232c789878a58e85abdec39160
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Apr 20 14:48:59 2012 -0700

    Wordpress 2 instance with EBS and EIP
    
    srs.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit dfeb65185bc1349a4b19466eb7056f28cea4f15e
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Apr 20 20:54:04 2012 +0100

    heat cli : Add bash_completion.d entry for heat
    
    issue #87 Adds basic bash smart-complete script for heat to bash_completion.d
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 831078ad28cc55904a7f018840c7c2b3ea7db1c8
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Apr 20 20:42:29 2012 +0100

    heat cli: Use python logging module
    
    Issue #88 : Adds support for logging via the python logging module
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit a9e9fa9782c10f71f33be3ad08775ee955dfbe00
Author: Ian Main <imain@redhat.com>
Date:   Fri Apr 20 11:49:13 2012 -0700

    Fix another print -> logger.warn.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit df69c7d2a5a9fb4c8f773ba3fcc6da5eff7e5e71
Author: Ian Main <imain@redhat.com>
Date:   Fri Apr 20 11:45:07 2012 -0700

    resources.py had a bunch of print's in it.
    
    This patch removes all the print statements and puts in proper logging
    statements.  Some of these (db tracebacks) are now logged as warnings.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 2f880bc61c4ccb7751003cede3d16f7e6fb6ee7a
Author: Ian Main <imain@redhat.com>
Date:   Fri Apr 20 11:38:59 2012 -0700

    Add an exception around EIP fetching.
    
    I was getting a traceback here causing the whole 'heat describe' to
    return an error when really it was just the one aspect failing.  Use
    try/rescue and log a warning.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit df5dee4e0b78254c5b0c589bcbd4d9625f7aee2b
Author: Ian Main <imain@redhat.com>
Date:   Fri Apr 20 11:07:36 2012 -0700

    Fix a typo in the command line help.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit fe5ebdbde1a81e4920c9f906fcfbe7fbb068b7c2
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Apr 20 10:43:18 2012 -0700

    Use v1 / v2 / v3 for version numbers to match tags
    
    In the next several months since we wont be supporting maintenance releases,
    Just use v1/v2/v3/v4 for releases to match our tags.
    
    We can switch to an x.y.z or openstack style versioning when appropriate
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit f04ba8797624f9d43999572d74dab320118bd627
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Apr 20 10:36:18 2012 -0700

    Set proper author and mailing list in setup.py
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit b5eec2832d4d94efe1fb21deeaedbe6ae7310cf4
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Apr 20 10:31:39 2012 -0700

    Remove BUILDING.rst since there is no building taking place inside project
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 262e6066322a79eaba825e63a8cb59033d2d03fd
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Apr 20 10:29:51 2012 -0700

    Remove rpm spec file and Makefile.  Will track packaging in a different repo
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 1816791ad4f54f6deefac9a70737bd06b2f425be
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Apr 20 10:28:55 2012 -0700

    Remove tito - likely track this in a different repo
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit b1802fe7ab0458ca381fbc5214cbf27918bafd9c
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Apr 19 18:23:56 2012 +0200

    Fix the EIP cleanup
    
    Fixes #69
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 753b34deb9d7e3514a11ee138b9f6d165a961044
Author: Ian Main <imain@redhat.com>
Date:   Wed Apr 18 13:25:44 2012 -0700

    Add documentation for the per command CLI help options.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 39f822f04ff67dd05be0dec595fa7cfa30f4e622
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Apr 18 20:47:03 2012 +0100

    heat, heat-api: Add missing licence to header
    
    Adds missing licence header to heat and heat-api
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

commit 2a766dfcc132b0a066a88bf16cf463437599038c
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Apr 18 15:17:51 2012 -0400

    Remove rootpw from tdls and add ec2-user to sudoers file
    
    Fixes #72
    Fixes #73
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 7921648911a91d1f40be3b353bb57887fed3b783
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 18 12:29:52 2012 -0400

    Deleting parsed and raw template when deleting stacks

commit fc77b204f84f54b381ec08f9f1bc315fbdf61c5b
Author: Ian Main <imain@redhat.com>
Date:   Wed Apr 18 08:53:54 2012 -0700

    A little more detail on network create.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 6e9acd83abc0416978f4e4d4dcc81dfe148de679
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Apr 18 11:29:48 2012 +0200

    Fix the test environment
    
    Made sure that `run_tests.sh` works properly (it was failing on the heat/bin
    directory) and that all tests pass and the generated logs are .gitignored.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit eac075e5e1feb18610e9f049430a900c6f3d6120
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 16:16:32 2012 +1000

    Fix another template attribute in the output section
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 3e7499aea7d710602ddaef498f201dbeb6c1c834
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 16:15:47 2012 +1000

    Use the correct api to get the volume object.
    
    It must be volume not nova. But nova is used for the attachment.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 770224c0502138d5d15b031676a354c4cee22a42
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 16:14:24 2012 +1000

    Save the resource if complete or failed
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 777d2f3a567c0e32eb3fcea6936ccf6787faa09f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 15:47:21 2012 +1000

    Fix the delete of a volume attach when the create partially succeeded
    
    Fixes #70
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 24ad425a7af57017e3167cebaaa0fe19173a3d14
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 15:08:47 2012 +1000

    To properly populate the output section.
    
    We need to get ipaddresses which are lost as they are
    not stored in the template so we need to retrieve them
    at runtime.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 89e86fa918302c297fca7057144ae7798dd05088
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 14:45:22 2012 +1000

    Use the instance_id for the event "physical_resource_id"
    
    Just to provide a bit more info.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 9e79551d7724d3dd89c2c09a9aaefacacd69c7d9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 14:44:08 2012 +1000

    Fix the output attribute in single instance wp template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 35bd5f4c5f21e375f828377b7ea37ec1b93c6d96
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 14:43:18 2012 +1000

    Save the parsed_template so user parameters are available.
    
    This caused parsing errors when deleting, as required
    references were not available.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit e5a0f9196f0f4f55887b5a96e595d710e78d0ba1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 14:02:25 2012 +1000

    Fix the parsed_template columns (missing created_at and updated_at)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 8a317678cf7a4e846141b54e881fb19ecb7b4220
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 12:25:16 2012 +1000

    Fix the version file (don't import glance's git commit)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 358920e1369246d12a92ce60770844145581aab1
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 17 10:12:04 2012 -0700

    Add WordPress_Single_Instance_With_EBS_EIP.template
    
    This template uses EBS, EIP, security groups in a single instance.
    Unfortunately because of issue #83 the template doesn't fully start.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 991b3fd18d5a0fc4056b94db801b5a3b3178a395
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 17 09:36:31 2012 -0700

    Rename EBS_Volume to just EBS to pave way for EBS_EIP
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 83e002fd3bbc4e7a62d9940d4eff3c3c26cd1218
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 17 09:30:21 2012 -0700

    Make WordPress_Single_Instance_With_EIP.template work
    
    Note I receive an exception in engine.log:
    ClientException: Associate floating ip failed (HTTP 500)
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit bf68a800e59ee3dc37ea2509048b8ddb6f3af4de
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 17 09:06:16 2012 -0700

    Initialize sec to None to avoid exception in security group
    
    When an existing security group is not found in nova, heat will trigger
    an exception and the stack won't be created.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 7afbd05da3fd24b9c825531d1a1c562e31189c53
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 17 18:04:04 2012 +0200

    Fix invalid JSON in template
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 4993b5dfa0d3b09e3f1ed2b6dc4327054effd1c8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 17 17:38:48 2012 +0200

    Store all event data in DB
    
    Fixes #64
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit c2ab4a39d136949db5d2e6c6c2b90930929fe087
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 17 17:38:48 2012 +0200

    Remove hard-coded paths from DB setup script
    
    Since versions of heat can and will change, we do not want want them
    hard-coded in the DB setup script. Instead, use the Python import logic to
    determine the location of the module.
    
    This will use the local copy of heat (which is usually what you want) if
    run from the top level of the repository. Otherwise it will use the
    installed version, as determined by Python.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit d4fda0273580fc8575298614bc90569a73c1d5b3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 17 17:38:48 2012 +0200

    Avoid printing exception in db-setup
    
    If the db-setup is run multiple times without dropping the database, the
    attempt to set up version control again causes an exception. Since this is
    an expected condition, just print a message and exit normally.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f94547743e8b28203e34dd7c3534473ebb1babde
Author: root <root@zbitter.fedora>
Date:   Tue Apr 17 17:38:48 2012 +0200

    Handle exception on Ctrl-C
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 27832d617e34a1d6a290437a76e397526e039291
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 17 07:12:21 2012 -0700

    Updated WordPress_Single_Instance.template to work properly.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 08ad2beab0d0cb30283f8e210a42a707210a1e3a
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 20:45:26 2012 -0700

    Update templates README with list of secure vs insecure templates
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 9e2f208bffebb4434c74ca558e394aa93226feaf
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 20:43:28 2012 -0700

    Make WordPress_Single_Instance_With_EBS_Volume.template functional
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 8c7e46f4e6c4f5fbf2a7550f52690a7817750ea4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 17 12:09:30 2012 +1000

    remove old experimental code
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 0c93a40b604536507f308d901fb6c4e752c0ced8
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 17 11:58:57 2012 +1000

    kill all pep8 errors in parser and resources
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit dbfe16ff00be38a76505e492463b2fde154a0e58
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:46:27 2012 -0700

    Updated templates/README directory to more clearly explain templates
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 2da09c064a4c5c7d037d5f640488a9f6f468d39a
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:36:57 2012 -0700

    Rename WordPress_Single_Instance_cfntools.template to not have cfntools in name
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit eca8d5aa8bb24f99a64b824925344756b5b02e67
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:36:22 2012 -0700

    Rename WordPress_Single_Instance.template to have gold in name
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit b5bf88aab524ed0ba199af6d1db9f45d9424258b
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:34:53 2012 -0700

    Adjust cfn-init -f flag to be implicit
    
    Fixes issue #75 for WordPress_Single_Instance_cfntools.template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 162826f9d713a8116fbfe832a3e3bc7380cdb4c7
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:33:45 2012 -0700

    Adjust cfn-init to not use -f option
    
    Fixes issue #75 for WordPress_2_Instances_With_EBS_Volume.template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 71f884272a39b0b6d301ee7f265db753b36ed2d7
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:32:09 2012 -0700

    Adjust cfn-init to not take a parameter in the initialization
    
    WordPress_2_Instances.template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 95d583fd79a5e6e65d8effcc0589f7361a0447c1
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:29:35 2012 -0700

    Fix bug in path on cfn-init
    
    Fixes issue #75
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 64c654f71c12b6c230ce4286441f3b98b9625159
Author: Greg Blomquist <gblomqui@redhat.com>
Date:   Mon Apr 16 17:27:43 2012 -0400

    Fix for issue #75: no more -f in cfn-init
    
    Removed -f in cfn-init.  Instead, cfn-init reads resource metadata from
    /var/lib/cloud/data-cfn-init-data.
    
    Also, added logging.  cfn-init now logs to stdout and to /var/log/cfn-init.log

commit 20e10f2bf788cb1a73488755c3d6d6718e11f871
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 14:12:19 2012 -0700

    gold plating the WordPress_2_Instances template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 6046cb1bdd81a68fffd1596b111f458a27548c86
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 13:51:50 2012 -0700

    Wordpress 2 with EBS working
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 6b48e317b2dbac3794f801020c3199eae13034e6
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 16 13:46:58 2012 -0400

    Resolving rpmlint errors and adding man pages.
    
    Fixes #67

commit 8423294a43b5b8db001acf157e179cc5e174bb21
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Apr 16 16:35:08 2012 +0200

    Register security group with launched instances
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit b26a067626d5809381207a6ecafa0a3793e254fd
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Apr 16 15:10:31 2012 +0200

    Fix creation of security group and rules
    
    When the group or rule already exists, The Nova API and client errored out.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit dfe12cbaba575620efac009597461a80110db9c9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 16 17:07:07 2012 +1000

    Fix a heap of pep8 errors
    
    ./run_tests.sh is much cleaner now.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit b7b29add1128861056e26b368e3e181ccd8fdbd3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 16 15:37:26 2012 +1000

    Make an attempt at passing exception messages from engine to cli.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 65b1ed9e89c8bb493867090812c35ce0f5b78e8d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 16 13:36:07 2012 +1000

    Fix 'heat describe'
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit fe9b29dd3e1a150677fdb72f5b12db94c1b63609
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 20:51:46 2012 -0700

    Add a traceback on exception caught
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit f7d0e0572c63954727866733bcd08bec24c5579d
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 19:13:12 2012 -0700

    Add a README to the templates directory to aid in navigation of the templates
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit aa02d3270e7611094f2a2f38601dc5d312585425
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 18:53:39 2012 -0700

    Add a tools/heat-db-drop script for fatal error recovery
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 67c6131536ca102eec6ad69a73fca874fd8cc2ad
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 17:44:10 2012 -0700

    Make Wordpress_2_Instances.template work properly
    
    note the mysql instance is not secure because both IPs must be known
    ahead of time.  To resolve this problem, we will be using elastic IPs.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 2f858e656c5527877793d0c76c9e9420c2edc080
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 16 10:00:39 2012 +1000

    Check errors better in resolve_attributes()
    
    Add a little more debug.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 814dee93f14a85908d3fab3263f94485540cd8fa
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 11:12:42 2012 -0700

    Add yum-plugin-fastestmirror on F17-x86_64 cfntools image
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 4592c434099a62ac55f1a4da8a523e6d20bc5ea9
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 11:10:50 2012 -0700

    Add yum-plugin-fastestmirror to the cfntools images
    
    Should speed up the downloading of packages on launch
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit ede22be715255eb2f15e2808c94bbec8367e0dbd
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 10:28:52 2012 -0700

    Update WordPress_2_Instances.template to use cfntools and cfn-init
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 365b525dc4ae09b848a38cf94d4ef9cb87513efe
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Apr 14 09:36:33 2012 -0700

    resources: remove insert_package_and_services
    
    Now that we have cfn-init, this hackery is no longer needed
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 730ae9470eea526895ec7349978d945db3b1309d
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Apr 14 08:10:38 2012 -0700

    Properly launches a cfntools image with the appropriate userdata mime blob
    
    Note that cfn-init should be run as follows in the userdata script
    
    /opt/aws/bin/cfn-init -f /var/lib/cloud/data/cfn-init-data
    
    This will install the appropriate RPMS and enable them
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit be21044ef82c3962034ade2af93194ddb03445ee
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Apr 14 07:57:06 2012 -0700

    Correct path to cfninit data
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 05f4df48930f8b723bfa41f4d59e2b8b0089acb4
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Apr 14 07:34:08 2012 -0700

    Yet more typos in cfntools template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 2d9253b07601c7cad3e21da5ead832171d52b637
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Apr 14 07:27:15 2012 -0700

    Fix typo in template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit c43659dd7ae6800ac25f477f9896aaa2ab69ca9a
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Apr 14 07:23:20 2012 -0700

    Add a cfn-init call to cfntools
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 60db42c27cd9ac2aa44153560fd276c7dfad2199
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Sat Apr 14 08:15:22 2012 -0400

    Automatic commit of package [heat] release [0.0.1-1].

commit 6b098b82cebedd9946f015ebdc050110064f2d81
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Sat Apr 14 08:12:14 2012 -0400

    Adding instructions on building the project with tito

commit 8f201423b2378657555de67cdc27c15eb1d58821
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Sat Apr 14 07:58:27 2012 -0400

    Removing the PKG-INFO and vcsversion.py from the rpm

commit 65e62a6a7fdb888c4b900746b3f1195ded299764
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Fri Apr 13 16:05:40 2012 -0400

    Initialized to use tito.

commit 2f8e95baecfb312bb93c93ddd020ee13f0e94120
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Apr 13 17:10:30 2012 -0400

    Add unit test framework nose and associated helper scripts
    
    For usage documentation, refer to heat/tests/testing-overview.txt.
    run_tests.sh is what runs the tests.
    
    Fixes #44
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit b070322351d4c03401ce80d31388dbf89351b181
Author: Ian Main <imain@redhat.com>
Date:   Fri Apr 13 13:29:57 2012 -0700

    Document all methods in the EngineManager class. These ones seem important.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit d3dfb7f15a69904417b516bb84edc4c6e12c392f
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Fri Apr 13 15:59:12 2012 -0400

    Updating the heat spec to pull in cloudinit files and i386 jeos templates

commit f0862d8b882beba4a698ddc554f1f263bba0039d
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Fri Apr 13 15:01:41 2012 -0400

    renaming CloudFormations to CloudFormation

commit 4b04ffd16a909332f11aeb552c25893e856068cb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Apr 13 17:58:23 2012 +0200

    Handle errors when listing events
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 0525333416283fa02c86fc17693c23d53c984f1e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Apr 13 17:58:23 2012 +0200

    Show stack description when status is unknown
    
    Apply the same improvement that d41193cbff97caf68a5eaa5b105593af17e3339d
    made for list_stacks to show_stack.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 5c69b6087aa647260dcb87a2ed3936f9eb7b6a47
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Apr 13 17:58:23 2012 +0200

    Allow listing of all events
    
    Make filtering by StackName optional.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 3cbb97ad00413910bb3d06ef5ad3af8a3b7c1164
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Apr 13 15:56:29 2012 +0200

    Use security groups in the multi-instance wp template

commit d41193cbff97caf68a5eaa5b105593af17e3339d
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Apr 13 14:43:07 2012 +0200

    Fix listing stacks
    
    `heat list` was failing for non-empty stacks because the `Stack` model had no
    `template` attribute.
    
    Also fixed an issue where we didn't show the template description when the
    stack status was unknown.

commit 957a45c32eeaf5a9136215df06da2658d815534e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 20:15:23 2012 +1000

    Fix the stack.delete() by populating the resource id/state from the db.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 4d1b1394cfc319efc52f896d78c92314ea4b3406
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 20:13:09 2012 +1000

    move the db stack delete into parser.py as it is non-blocking.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 90a67a73636e12c46da2ce9947ae415f0c488a38
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 17:23:29 2012 +1000

    Cleanup db imports (use heat code, don't import nova modules)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 4b6482c6a3c8530ff2a98de87742ce438fee1c76
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 16:25:07 2012 +1000

    Consistently create the db resource entry.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 0ee8db445941f24e07a3a93b91adc87c192b1c1f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 15:26:09 2012 +1000

    Add SecurityGroups to make is easier to use EIP
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 4d7e2721ea74c69ef02ff16e86dc6a3ee1265eb9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Apr 13 12:10:10 2012 +0200

    Eliminate overly-broad exception catching
    
    We probably don't want to catch e.g. KeyboardInterrupt in these cases.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 16986b4062802eb5f01641677326b51ead575215
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Apr 13 12:10:10 2012 +0200

    Improvements to DB setup
    
    Don't fail if the database or user already exists.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit a03a307d33ef5fedab6ec08532a1ed4b82c25b5a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Apr 13 12:10:10 2012 +0200

    Issue #52: Fix error in db-setup script
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 31ae00df42c492b7fac79f67445bb40c022a3d6c
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 21:16:42 2012 -0700

    Start systemd services properly with cfn-init tool
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 2a9a87dc3e22bf1d045add1351cb1bad332a1b5e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 12:37:13 2012 +1000

    Fix the jeos path when running from installed code.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit c453a33f35335eae74161f3bf4a6b536496b4894
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 10:16:29 2012 +1000

    Delete extra white space
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 5bb18073cbf069b5812c64b1f5c7d4e93ef49ddf
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 10:13:42 2012 +1000

    Fix 'heat list' when there are no stacks
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit ec794e6d4a3777a89a0136bd397abfffb3dfd485
Merge: 2f5ec87 aba5fc8
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Apr 12 18:32:48 2012 -0400

    Merge branch 'master' of github.com:heat-api/heat

commit 2f5ec8738dc557db6c51416b3cfb1a45b9eeedb4
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Apr 12 17:42:52 2012 -0400

    Make jeos_create aware of existing disk files and previous glance registrations
    
    The user is interactively prompted for decisions to be made when:
    -An existing jeos disk image is found: build a fresh JEOS?
    -If fresh JEOS is chosen, continue as normal removing the files and
     existing registration if it exists.
    -If no fresh JEOS is chosen: register existing JEOS with glance?
    -If no registration is chosen, no action is taken.
    -If registration is chosen, continues as normal without rerunning oz in the
     case of the image not being previously registered with glance.
    -If the image is previously registered: delete existing JEOS in glance?
    -If the user chooses to not delete existing registration, no action is taken.
    -If registration deletion is chosen, the registration is deleted, rerunning
     oz is skipped, and the registration will occur.
    
    Fixes #50
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit aba5fc8a444f130e61f1642440f69b87a26c7c60
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 14:16:41 2012 -0700

    Update F17 cfntools image to properly boot for cloudinit
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit f9c645a09f90a2d44a1e6ba48b0f342d129bdf81
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 14:05:59 2012 -0700

    Add ec2-user to F17 x86_64 tdl
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 85a9df46d2b56497b7d75f5451400cfc2f76245c
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 14:05:13 2012 -0700

    add ec2-user to F16 cfntools image
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 7abe849db7d7b6e1ea6ff337df63cc20c7cfadef
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 14:01:45 2012 -0700

    Update i386 F16 cfntools image to match latest cloudinit features
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 98649be02d0448b9143149946192486231ba489f
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 14:00:24 2012 -0700

    updated F17 x86_64 cfntools tdl to new cloudinit model
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 797ea880d982e0f25b5c18f3689da0a994658c05
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 13:33:27 2012 -0700

    Install cloudinit specific files that are loaded into the mime userdata
    
    Partially fixes Issue #48
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit af451c207424f1ee2ccbce2eafbdeaa953ad50f9
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 13:17:46 2012 -0700

    Updated x86_64 cfntools tdl to work with broken F16 repos and cloud-init
    
    Partially fixes Issue #48
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 1a3186dc6f8a83e92112ac53a2672c31286bfaac
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 12 14:00:53 2012 -0400

    fixing small sed typo

commit b633c768c4af7adb88c63d0f4f21d6564e2f1ec8
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Apr 12 18:18:35 2012 +0200

    Add elastic IP and userdata to 2-instance template
    
    Ref: #56
    
    The 2-instance Wordpress template with EBS now uses Elastic IPs for both
    servers. The IPs are referenced from the init scripts in UserData.
    
    The template wasn't tested yet.

commit c226a24efca9975365aeb36dcfbf052398accd78
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 12 11:05:11 2012 -0400

    Fixing the heat events_list <stack name>
    
    Patch provided by Zane Bitter, thx.

commit ead1838fb771c14eed22eef31f849d2799461717
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Apr 12 16:57:48 2012 +0200

    Move the EIP settings into a different template
    
    We'll keep the WordPress_Single_Instance.template simple.

commit d41059f6a9c2afbbcbdfe19737dd40d49974d269
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 12 20:28:14 2012 +1000

    Initial ElasticIp work - not quite working
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 9358f20d40ac3e50c4de4747137b1faae699a14a
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Apr 11 22:22:43 2012 -0400

    Add newly added tdls to manifest.
    
    Related to issue #26

commit 01488938cf3be19b0d1a357543299e48f87a5a58
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Apr 11 20:56:45 2012 -0400

    Add 32-bit tdls for Fedora 16,17 jeos (gold and cfntools)
    
    fixes #26
    
    Note that the templates have been adjusted and the naming of the 32-bit
    versions to i386 instead of i686. The install really is i686, but making
    the arch match what is listed in the install ISO seems less confusing.
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
    
    Although the 32-bit version of Fedora (and others) ISOs are labeled with i386,

commit adf53e972ab64f2ce8efe60074961c3e0aef39a1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Apr 11 19:15:38 2012 +0200

    Fix exception getting events list
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f2a952c790e472c2264cbff428278d03fbc843bc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Apr 11 18:59:33 2012 +0200

    Import missing exceptions
    
    The local definitions of several exceptions were removed by commit
    e7f05dba5d899200b9e09b22ea423fa33fd1b612 because OpenStack already provides
    them, but we need to import them to actually be able to use them.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 34962ac0749468c4caa31c99ade76f15fb641cda
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Apr 11 17:17:04 2012 +0200

    Fix setting of admin role in keystone service
    
    The script was looking for the "admin" user instead of the "admin" *role*.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 11854762757255dc7d10063704f3425898c973d1
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 11 09:48:42 2012 -0400

    Resolving functional conflicts from merge

commit 0dc8d604abab9550446bfcbd67181c9b28920991
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 11 09:00:14 2012 -0400

    Adding new files to heat.spec file

commit dc696e5e9c9973f19a226551f261e60e7801350c
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 11 08:24:08 2012 -0400

    Defaulting to the mysql db_backend, removing anydbm

commit 1c96afa5023bcb83821057e44506bac7248b4b19
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 11 07:15:13 2012 -0400

    Making delete stack work

commit f2f4aff1870fcf1647ca176db3b83be94cf1427f
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 10 16:58:45 2012 -0400

    Persisting resources

commit c8868921facf42de1d73a844c4118039c3576ac9
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 10 07:57:09 2012 -0400

    Made datetime objects JSON compatible by calling their to string functions

commit 77a004167ac34b7d9073d7606392a15b188733b3
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 5 11:05:11 2012 -0400

    Integrating all stack, template, and event calls with database

commit 95e10314952f1894b12fca1090759d4458ff785c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Apr 11 14:03:37 2012 +0200

    Fix reporting of RemoteError exceptions from AMQP
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit f45f677a5f11d33990c7edef653a283317a55f38
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Apr 11 14:03:37 2012 +0200

    Handle missing config file
    
    Report a more useful error when no config file can be found.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

commit 7523932c5d7ef794a26fab0de13b7bc242577cc0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 11 19:29:13 2012 +1000

    Fix silly spello
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 4539bdeca6e481ae74a2d019af7344850f5e813f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 11 19:28:31 2012 +1000

    Record the reason for any failures
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 9bad23299184fc19ec3e4aee8241bae667c639ee
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Apr 11 00:33:40 2012 -0700

    Make better use of cloud-init
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit df1ad15c8a4af9702f16fe7553822d585ee9a2c4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 11 14:52:12 2012 +1000

    Make the create/delete non-blocking
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 2c492583e111260e37c8999c618f7f7b4f87ac40
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 11 12:55:57 2012 +1000

    Fix path to keystonerc
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 4b360e33c274b99150be123446b84e566ad00e7f
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 10 18:01:59 2012 -0700

    Rename cftools to cfntools in the wordpress single instance template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit c8f6c1752c6cd2f7452d6f454c91f31564b70ecf
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 10 13:53:53 2012 -0700

    Put cfn-tools into the cfntool image
    
    Closes issue #59
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 34f55bdbd6bfd43208563c9a2dac993021f397c0
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 10 12:26:44 2012 -0700

    Renamed all occurrances of cftools to cfntools to be more consistent
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 39f953802fb91a75f379d9af0764d99334fcf99c
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 10 11:59:38 2012 -0700

    Move cfntools to heat directory so they are accessible by jeos_create
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 434438d2e197864dc2a3804b4790744d20d5374d
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Apr 10 17:18:28 2012 +0200

    Add 2-instance Wordpress template without EBS
    
    Ref #56
    
    The template has two instances. The Wordpress one depends on DatabaseServer.
    Therefore, WP should be started after DB and it should use DB's private IP in
    the Wordpress setup.

commit 20c2b8891a1d129d9bb5ef254bb4a96b1a6fabf7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 10 14:13:06 2012 +1000

    Try harder to detach the server volume.
    
    It seems to need some encouragement.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit da38f9af185983b9f9dad9d320b27e99c6f090d3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 10 14:12:05 2012 +1000

    Don't use the "depends_on" in resource.start
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit b3893cde96effc0280f564fcc84561174aa242c4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 10 14:10:53 2012 +1000

    Cleanup some prints in the resources
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 555bb45cd5f51f34c363ecdb1332c680b607238a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 10 09:41:23 2012 +1000

    Add a 2 instance wordpress example
    
    Ref #56
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a9fd72c21c23d8709e737af817050896538828d7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 10 08:57:55 2012 +1000

    Improve the ordering of stopping resources
    
    Create a common function to generate the start order
    and stop in the reverse order.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit c51273efaaf74f59cef72d01ac9a39f36046ae3b
Author: Greg Blomquist <gblomqui@redhat.com>
Date:   Tue Apr 3 19:45:20 2012 -0400

    Issue #54: Getting started with cfn-init
    
    Implemented features:
      * sysv and systemd service handling
      * yum package management
    
    Running the script:
      e.g., sudo python cfn-init -f resource-metadata.json
    
    Example resource metadata file contents:
    {
        "AWS::CloudFormation::Init": {
            "config": {
                "packages": {
                    "yum": {
                        "rubygem-fattr" : []
                    }
                },
                "services": {
                    "sysvinit": {
                        "httpd": {
                            "enabled" : "true",
                            "ensureRunning" : "true"
                        }
                    }
                }
            }
        }
    }

commit 56e8d806303a8d2437940a432750b8a649e79ae0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 9 22:23:42 2012 +1000

    Get the volumes working properly.
    
    Tested with:
    heat create wp_ebs -t ./templates/WordPress_Single_Instance_With_EBS_Volume.template --parameters="InstanceType=m1.xlarge;KeyName=my_key"
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 22c2dde2ac808c997150941440156b52fc8d328b
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 5 11:42:36 2012 -0700

    Add documentation for heat jeos_create function
    
    Partially Fixes issue #58
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 8483e2219fac031148e7e9f7415043de783bfc5a
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Apr 5 11:41:12 2012 +0200

    typo fix in jeos_create

commit c0fd06bc1f5c824af3eda3507611133b5fdd2542
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 16:40:19 2012 +1000

    Fix "heat list" only showing empty list.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit e7f05dba5d899200b9e09b22ea423fa33fd1b612
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 16:39:22 2012 +1000

    Add utils & exception from openstack-common
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit aff20aca99866b0b1244133313b65d0be395034d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 10:42:52 2012 +1000

    Use local.py from openstack-common
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f4d4f60f8fed29e8148ac9af4efd93cc82c3c313
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Apr 4 18:50:03 2012 -0700

    Add F17 cftools TDL
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit d6cce8198d3f1fd3ce97851439868c0d39a183ba
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Apr 4 17:39:24 2012 -0700

    Add F16 cftools tdl
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit bd598a8399a3bfb39dbd6ec5ba7f0a676d3ad060
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 10:19:32 2012 +1000

    Fix events_list
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit d9ab5bdad44a231fa10b8a34ca31d43cea4fbd66
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 10:12:44 2012 +1000

    Fix describe and delete
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 8a6eb03d62dab0133ba59fd50654badfb9063e8b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 09:59:16 2012 +1000

    Pass the parameters to the parser
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit ebcb364e7990086933aba5adec0f3e41c24c5c86
Merge: 7690e1b e4a27e8
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 09:11:59 2012 +1000

    Merge rpc branch
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit e4a27e88f2c33fdae51b02c849306567df9de66c
Author: Ian Main <imain@redhat.com>
Date:   Wed Apr 4 14:29:54 2012 -0700

    Remove some more unused files.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 3eb40cae130015dcc85de56fdc5c9e30496eecf3
Author: Ian Main <imain@redhat.com>
Date:   Wed Apr 4 14:18:44 2012 -0700

    Don't need these files anymore.  As per the layout in nova compute
    the manager is handling all the engine api calls.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 7690e1b5d4ca5dce2aeccbb04da43871cd8718fc
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Apr 4 19:13:37 2012 +0200

    Fix --template-file
    
    Fixes #47
    
    The code that causes the URI TOO LONG error is in eventlet.wsgi.
    
    So for the time being we're replacing that with paste.httpserver which serves
    WSGI apps, too.
    
    Longer term, we want to use eventlet but they need to make the maximum URL
    length configurable.

commit ec9c7009fa184e609cbc0d5c4ae937ce5220afc2
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Apr 4 09:17:25 2012 -0700

    Use some evil to get the jeos tdl path
    
    Resolves issue #46
    heat:251 tdl_path uses get_python_lib() which doesn't work with eggs
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 485b0dcb291adc9420475dd988de85c355d71e3a
Author: Ian Main <imain@redhat.com>
Date:   Tue Apr 3 16:57:23 2012 -0700

    Fix stack_delete()
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit c94960563adae02138238db94ef8ee53a53cbb90
Author: Ian Main <imain@redhat.com>
Date:   Tue Apr 3 16:55:20 2012 -0700

    stack_db attributes seem broken.  Comment these out for now and the API
    is generally working.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 1163ec9ce744b45a609274ea6c0e30d2110b346e
Author: Ian Main <imain@redhat.com>
Date:   Tue Apr 3 16:40:11 2012 -0700

    Fix create a bit more.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 06d5b8c378e9ffd496b1bb49db16f8fc85516825
Author: Ian Main <imain@redhat.com>
Date:   Tue Apr 3 16:31:53 2012 -0700

    Hook up RPC methods
    
    This commit hooks up all the calls via RPC to the new implementations
    in manager.py.  I haven't tested them all yet.. I'm getting HD failure
    warnings and want to get this commited before something goes terribly
    wrong :).
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit ebdf76e1e8538823ed93247eed03042907b93815
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 3 15:53:27 2012 -0700

    Pre-bake cftools into an image
    
    After this change, new JEOS will need to be created since the JEOS
    names have changed.
    
    For a cfntool image:
    heat jeos_create F16 x86_64 cftools
    
    For a gold image:
    heat jeos_create F16 x86_64 gold
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 2915c99d466e28a7b1d2e1fafbd0cf65817b7560
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 3 11:51:16 2012 -0700

    Initial CloudFormations dummy files for vm helper tools
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 12b75ffa7f12f2f7d6ed67e8e39fb00b7c576360
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 3 08:21:30 2012 -0700

    Revert "Allow templates specified from local filesystem"
    
    Unfortunately this patch isn't quite correct.  It passes data in the body
    of the message, but the API specifies passing in the url parameters.  This
    results in user parameters not being passed to the instance properly.
    
    This reverts commit 4679fb01c641053d45a197b598e28552144391a9.

commit 07e99ea570dbc20999f267aea4d7e220bbb60ca0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 3 16:27:27 2012 +1000

    Do mimimum to work with anydb.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 20cdc46a948a85bd9b49d4b35b007a1794276afb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 3 15:39:29 2012 +1000

    Add support for the Output section.
    
    Implements issue #51
    
    To see the outputs run "heat describe <stack name>"
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 59b89dfbe20fab67ef5398a62804ae95c2162640
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 3 14:13:09 2012 +1000

    Add an Outputs section to the template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit c7d3e2179c61da096f878c3452d277f87ef251d0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 3 14:11:35 2012 +1000

    run dos2unix on the templates
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 447e73a82f5ada79c933f77f576c954d6d60d5d5
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 2 16:17:06 2012 -0400

    Updating the README to point to the Getting Started Wiki

commit 04d73a59ba00f0c73e04271a2c13f31f8f23cc51
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 2 08:12:33 2012 -0400

    Adding the sqlalchemy db implmentation

commit 4679fb01c641053d45a197b598e28552144391a9
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Apr 2 18:00:00 2012 +0200

    Allow templates specified from local filesystem
    
    Fixes #47
    
    Passing a template file (as opposed to a URL) to the CLI:
    
          ./heat -d create wordpress \
            --template-file=../templates/WordPress_Single_Instance.template
    
    caused a 'URI too long' error. The reason was that we were passing the entire
    template contents to the Heat API server inside the URL params.
    
    This makes sure that templates are passed around inside HTTP body rather than
    the URL.

commit daa4fc256b16d90d437df1590e8f64fe8f88967f
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 2 07:03:40 2012 -0700

    Updated openstack script to print a note about the default network
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit e354226876fd64a28672841efedf6d86880f249f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 2 23:04:35 2012 +1000

    Beginings of Volumes and VolumeAttachments
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit be476524a13c735892bd76bc46dc4315c023b7f4
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Apr 2 14:46:59 2012 +0200

    Update readme with the Keystone service setup

commit 4018da01860671973b41bf4511f96d41f3fc4412
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Mar 29 15:14:21 2012 -0400

    Add a heat database to store templates, state, and events
    Fixes #39

commit 1f861a50cdad5096886fe89102e5323072513b00
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 2 15:48:00 2012 +1000

    Make the "heat delete" command work.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 986e39c3b6e600f449412e6c8f2dce0ea92f75bc
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 2 15:15:10 2012 +1000

    Fix a crash in "heat show/list"
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 7daa8884bdd2a8bdc550d39c6b86ea3eec407b1c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 2 13:54:47 2012 +1000

    Fix keystone creds in parser
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit db5b63733e81e934b5cb2be1455bef7948015b4e
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 19:15:21 2012 -0700

    Make wordpress template leave mysql+http running, and start/enable them by default
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 8d372fcb16b2da3346446dc16a3b9bd8fcc7f1be
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 2 12:00:21 2012 +1000

    Pass the keystone creds to resource.py so usable from run-parser and heat
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 7d11d4abf6437dc34ba0d88f501d6b6b693ac219
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 2 11:59:18 2012 +1000

    temporarily hack out the keystone auth.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f4fa8645fba184b71b124a4c1cd68122c7c3ad1f
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 16:59:51 2012 -0700

    Updated wordpress single instance template to have quotes in proper place
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 9539f7aad304d260818ab6a85100f9c00afdfa49
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 15:36:57 2012 -0700

    F16 updates broken- Delete F16 and F17 update repos and don't yum update
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit d924d9db067a107b52647d2e4ebe680263b83558
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 13:40:37 2012 -0700

    Start userdata script after decoding
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 7dee96f56d4225afebdce90eedc0ca3ccd2dcb5c
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 13:35:53 2012 -0700

    use << intead of &lt;&lt; in Wordpress example
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 3b26a54014f2ce918579c52fd734ef5e56a54cd2
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 12:50:25 2012 -0700

    Add FnBase64 encoder, encode user data, and feed to nova userdata
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 0fbfc437ae047fb0b802072ea9ac5a1d0cca88e2
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 10:35:35 2012 -0700

    Add installation of cloud-init to the JEOS creation operation
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 5b400fbe189c664eb729df8bb767568e18f6998e
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 10:33:28 2012 -0700

    Show how to create a network after using the openstack tools script
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit ade5e43c46f8f26557bada7e5c4a94acd1a4dedc
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 30 14:27:18 2012 -0700

    Remove errant debugging print from run-parser.py
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit bc7bc4ee01f7f99f0b2f033e1b88bf91276f2624
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 30 14:24:15 2012 -0700

    Update to setup directions
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 75f80851715e6838888aa5b08a52483cddfe5952
Author: Ian Main <imain@redhat.com>
Date:   Fri Mar 30 14:05:36 2012 -0700

    Stack list now communicating end to end.  Time to hook some stuff up.

commit cfdd2e4545a36f342866664df206d8397b749a93
Author: Ian Main <imain@redhat.com>
Date:   Fri Mar 30 13:38:48 2012 -0700

    Change default exchange to heat-engine from nova.  Hook up 'list' though
    it doesn't work yet.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 9b0af6de59350e94d41028c303a8916cca38f436
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 30 10:46:29 2012 -0700

    Make create Working with recent glance mysql changes in F16/F17 RPMs
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit a1e9714473c8ee31e47e782d9745fe9e71e5f09b
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 30 08:51:42 2012 -0700

    Add mysql db creation for glance
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 1cc0f413ecbf61b8d073ee625fbc8f3a3f67d01b
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Mar 30 15:20:37 2012 +0200

    Fix run_parser.py to work with the db updates

commit ba17e5286b78ce6e0189b96352327ce1dab934a9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 30 21:28:37 2012 +1100

    Move simpledb to db/anydbm just so we are using the new API.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 93726e056706196530ac78c015348f1be68f477c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 30 15:36:26 2012 +1100

    Fix the service toke and endpoint
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 682f1041c502051b8558e95cd4b115ea9480f18d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 30 13:51:24 2012 +1100

    Add script to add heat service catalog into keystone
    
    Note the user add is not working for me. But could
    be because I have partly done this a couple of times.
    
    This is based off of:
    https://github.com/openstack/keystone/blob/master/tools/sample_data.sh
    
    Related to issue #31
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit ac1ab674c8ee2481fea447cbfbc02d4e1d2d7967
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 30 13:02:28 2012 +1100

    Get simple rpc.call working
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 8962ca3f84b0444d423fc13ffdc13dd94b435e22
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 30 12:42:01 2012 +1100

    Add needed strtime functions from nova
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 3c0de821ff8f4ee7c5290fbfc1f33d68f3eb419c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 30 12:26:12 2012 +1100

    Add missing references
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 12897989c0ac7bb8850f19f5e0b29c84e33296fd
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Mar 29 16:25:11 2012 -0700

    Wait for server to enter the ACTIVE state or ERROR state and send events
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit fcaea6527b9550c9e7aae5d055150422830e67b4
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Mar 29 18:02:16 2012 +0200

    Stub out the database access API

commit bf651f4207e81ef47e4495402a82e230f533de43
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 29 22:22:33 2012 +1100

    s/image/heat in auth code.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit d94b53c31289f9bf322a7f3549763580d68dd63a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 29 22:20:59 2012 +1100

    Copy some glance/common fixes
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 2b0465c30d9b3252e772adf50ad3a4dedc849be9
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 21:55:36 2012 -0700

    run_parser.py creates an instance now
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 1ccc461f594da12ad51f5e105060f88c3c85fb33
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 21:30:14 2012 -0700

    Updated run-parser.py to work well with WordPress template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit f1ddc407d3cf4b2898d38fcb1fae922aedfa022d
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 21:29:30 2012 -0700

    Updated README with more precise setup directions
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 61b54e7b7c2bce91ae66b1267ed780ce4d62dbbc
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 14:57:48 2012 -0700

    Produce proper distro-arch variable for use with launching
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 4c93dcf75a9dfeba643898fbbf014aed30d5bd2c
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 13:51:35 2012 -0700

    Update run-parser to work with proper user parameters as sent through the apis
    
    Fixes Issue #42
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 1e7c0eff6ca7f83e29d237da2f7ad207301f41c9
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Mar 28 16:23:15 2012 -0400

    Security credentials are now passed into heat engine from cli
    
    The request parameter KeyStoneCreds has the values for username,
    password, tenant, and authurl
    
    Fixes #30

commit 5b78cd7f6b781768842ec456ea87220698de1f41
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 11:23:25 2012 -0700

    Fix spelling error dependancies->dependencies
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 2198a722a47248afa002eae12993a736f01d78c7
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 11:22:30 2012 -0700

    Fix spelling error
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 98bf9b95ddf0ed99bc9d0800c9084671457b214c
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 10:52:54 2012 -0700

    Tidy up README.rst
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 589eaa75e42960a8fc927f9e9f2f777e88e522e8
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Mar 28 12:50:49 2012 -0400

    Removing OpenStack LLC copyright

commit 6d9387bb286e1194ceb4c74a4dfc8a61565d3d01
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Mar 28 12:43:54 2012 -0400

    Adding F17 JEOS tdl
    Issue #25

commit a4b8e8afb8d3db5cabb52cfd88624e5023d3ae11
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 28 19:36:49 2012 +1100

    Fix some tabbing.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 3bc820fba48fd725a80c6bf0237b205121340ea9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 28 19:36:18 2012 +1100

    Add the ValidateTemplate API.
    
    Implementing the validate is still a TODO.
    
    Re: issue #1
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 3b49124ee356c9b51f1f2f1615d66e83d47cde1f
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Mar 27 22:45:42 2012 -0400

    Fix misspelling of Ubuntu so tdl is properly found.
    
    Found while looking at issue #29.
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

commit 5a66af974bef2d44f16102f04e3d1a959a0f58f5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 28 13:32:20 2012 +1100

    Get the heat --parameters to work.
    
    So now this works:
    heat create pile \
     --template-url=https://raw.github.com/heat-api/heat/master/templates/WordPress_Single_Instance.template \
     --parameters="InstanceType=t1.micro;DBUsername=angus;DBPassword=fruity;LinuxDistribution=F17"
    
    Fixes Issue #40
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 7dd042134c7d96e735af6172fb2c545d73793ecf
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Mar 27 18:57:25 2012 -0700

    Add ami conversion to OpenStack style architectures
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit b7377176be45dffe52499170b305203375de2c0e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 28 11:45:53 2012 +1100

    Account for missing Properties
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit d35f4ac6482b43859eb40d6b0d539fa60095f6bc
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 28 11:41:19 2012 +1100

    Install /var/lib/heat directory
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 6153879cff2c2333dde5053456c3a1a4cbca0924
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Mar 27 17:34:30 2012 -0700

    Fix order of parmeters issue
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 21f1f7abd279e53ad6dc9a6f2065ec3a0bda2f1a
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Mar 27 17:02:27 2012 -0700

    Fix heat jeos_create F16 x86_64 litters files
    
    Fixes Issue #41.
    
    Output the file to /dev/null instead
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 9b23feadaea69a20ed674470b956413062c0dcfa
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Mar 27 16:26:01 2012 -0700

    Remove unneeded deps
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 8b005f95143a6a2ff51f7a6fb6110ed9a0ead487
Author: Ian Main <imain@redhat.com>
Date:   Tue Mar 27 11:56:30 2012 -0700

    Fix up some imports so they work.  I think this is right now. :)
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 903529c05a7767344c5ea56bf77820257b3e5be2
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Mar 27 10:35:47 2012 -0700

    Add README to tools directory to help point out what files do
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 5c30a02e00a1dcb58ca2aa6caef4ed835fc53deb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 27 11:38:48 2012 +1100

    Initial work on migrating heat-engine to rpc
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit fbd62cb9c7a6c15fa4a647b5d9802fd7be9b4467
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Mar 26 09:30:18 2012 -0700

    Add error checking and help to tool
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit b4b6ac333e92dc9d34fcf85d9353b214a554b94d
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Mar 26 09:20:02 2012 -0700

    Add a missing tab
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit d6fb3be1566649718255601923b6ca137aeb855c
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Mar 26 09:18:21 2012 -0700

    Add code that shows how to create an instance
    
    This creates an instance with a keypair, and saves the private key to
    /tmp/private_key.
    
    Then:
    ssh -i /tmp/private_key 10.0.0.x where x is the IP address
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 072cc84d4996d8219a0f1df99492134d462e0e5c
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Mar 26 15:50:46 2012 +0200

    Consistently use Keystone auth from environment
    
    Fixes #33
    
    All mentions of non-keystone auth environment variables were removed. Acessing
    the proper Keystone ENV was localized into parse_options.
    
    We can now consistently use the `options` object instead of writing
    `options.username or getenv['OS_USERNAME']` all over the place.

commit 91ee085a0dd65ae408d29bb494d0208530435203
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 26 16:45:06 2012 +1100

    Begin the change to a python only implementation.
    
    - Don't start pacemaker-cloud cape, instead start the
      resources (soon to be implemented).
    - kill off systemctl, capelistener and json2capexml
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 88b77d2bedda3b08eb55ef163de577e775c6bb26
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 26 15:18:29 2012 +1100

    Add an experimental ssh monitoring script.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 2846b18251096a22cf0a98f289719f4173f757a4
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 23 14:43:07 2012 -0700

    Covert AWS instance types into Openstack Flavors
    
    Issue #34
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit a2523790919b053d49928fcb3add6fb556bdedf3
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 23 13:17:09 2012 -0700

    Change run_parser.py to run t1.micro rather then m1.large
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit bce24c6aa63f5b14bdef6bbbd6d28cc0cf0b0b85
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 23 08:37:59 2012 -0700

    Some glance keystone changes from getting started guide
    
    https://fedoraproject.org/w/index.php?title=Getting_started_with_OpenStack_on_Fedora_17&diff=prev&oldid=279696
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 51ecb350c975c63ca4d9a8852df668020368ed27
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 23 08:16:29 2012 -0700

    Updated with latest F17 nova auth fix
    
    https://fedoraproject.org/w/index.php?title=Getting_started_with_OpenStack_on_Fedora_17&diff=next&oldid=279621
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 7d290c20327ae24e618ab4230a50769d62a53e48
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Mar 22 23:54:46 2012 -0700

    install/erase working better
    
    nova command operations not quite right yet
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 6c39ee3521f4bb30884b05775828d15b676efa6c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 23 15:54:46 2012 +1100

    Add a openstack helper install script
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit ea6571d29b202bd8c8e83d2fccdf72029fd2a24f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 23 12:04:54 2012 +1100

    Add elastic ip association to parser.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 622bb9a702617e4754784a04de66a21c9e2a4e1a
Author: Ian Main <imain@redhat.com>
Date:   Thu Mar 22 17:37:17 2012 -0700

    A few cleanups and some comments.  Nothing major.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 024ccee73475d227040c7927c3f6151614a3092f
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Mar 22 09:08:16 2012 -0700

    Use keystone auth environment variables
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 6dc00394685238d717317e72d1a6e6e7ebfff967
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 22 23:16:48 2012 +1100

    Improved "test" parser for python orchestration.
    
    ./bin/run-parser.py <template>
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit d1daeb01d0acfa593e9d12026e3f02d1a99c9cf1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 22 10:18:43 2012 +1100

    Record events and retrieve them via "heat events_list <stack_name>"
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 4cea0f15890b88bd2c12effb1f7a5ea30642dc68
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 22 10:05:26 2012 +1100

    tweak the templates so the defaults are actually what we want.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 8693984a9b8b905977b3a21ba946707870216796
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 21 11:32:41 2012 -0700

    Use full distro-arch as name of image registered with glance
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit faddc4daaebcefa4c92d7b8fe2f9c4ea8cf66633
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Mar 21 17:24:53 2012 +0100

    Properly handle templates of invalid format
    
    Fixes #19
    
    When we receive a template that's not in JSON, we display a meaningful message
    instead of a stacktrace.

commit 8acb771bb9a80ad87ddd69ba5e9b276d2405e33d
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Mar 21 17:07:14 2012 +0100

    Display error message on invalid template URL
    
    Fixes #19

commit 53859a38cac8df4a4a6c57b6ac6a95becc2549b5
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Mar 21 16:41:54 2012 +0100

    Display message on heat-api and heat-engine startup
    
    When a Heat server is started, the user will now see a message that says so and
    shows the port number the server uses.

commit 5d8d645f4e544bd92ec42bf7ca0c23cf464b5be4
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Mar 21 10:52:54 2012 -0400

    Removed the *.log from the .gitignore so I can add the dummy files

commit d38de842e0e6e442c10cb4b367214cd4b295be24
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Mar 21 10:14:00 2012 -0400

    Removing some of the cargo cult copy paste shrapnel

commit 33c4b5f762dda0143dda38ebb1eb0fe318dee4fc
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Mar 21 07:44:44 2012 -0400

    Adding rpm packaging for heat packages

commit 68d8778cca337a0a1119b0ead7cd7d48bf747b55
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 21 22:27:14 2012 +1100

    teach jeos_create about the debug option.
    
    Now this command produces lots of output (nice for debugging):
    sudo heat -d jeos_create F16 x86_64
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 175fa188316df8ef7d5528c575613948864d940b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 21 21:55:30 2012 +1100

    Improve the error checking in jeos_create
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit f5e43a3ffca5d1ad0c2f9b510bf406d2d928aed2
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Mar 20 09:50:09 2012 -0400

    Updating template example github link

commit fb2227b804c31af6037e4618c741adee2edeb573
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Mar 20 07:26:40 2012 -0400

    Minor text edits

commit 948212722397a89f574ce52d79bff798f43d179b
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Mar 20 07:16:06 2012 -0400

    Directives to not use variable names that conflict with pdb

commit 1b44c7d46d8b0645f0368dad4938a55c5e6935e1
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Mar 20 11:19:01 2012 +0100

    Fix a module import failure
    
    Running heat-api resulted in:
    
    heat.common.exception.ImportFailure: Failed to import requested object/class:
        'heat.api.v1.API'. Reason: No module named openstack.common

commit 49ed27480e4ac97a7d233fafbe60fa2eda0ff7fd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 20 13:17:17 2012 +1100

    Fix README bullets
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 2f041a999f318b3f8ac055ca56f6268def915a96
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 20 13:14:02 2012 +1100

    Fix README headings
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 939ee8d1a8f73350646444bea8326bb437e25819
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 20 13:11:53 2012 +1100

    Update the README
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 6161c7aa85023e1ea5b3acabd74f354f4e685116
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 19 21:25:20 2012 +1100

    Start separating the api and the implementation.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 4abbc9393e32322eee11bfe6b8f6d49a0733c0ca
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 20 12:01:37 2012 +1100

    fix delete params (was treated as body)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit c7a01f18ad17080c75c68106c7cede968c34b0f7
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Mar 19 17:58:39 2012 -0700

    Update readme with correct "raw" url for template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit a7025cdeb504463a1db08a37c821e045d90d76cd
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Mar 19 17:10:58 2012 -0700

    Remove erroneous setup operation
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit c1e3fea7a65624f2af272db248514fe5a338254c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 20 11:08:24 2012 +1100

    Install config files properly.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 2cf38556bf1d7c07d8e0c5090a5dbd9ade11abbb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 19 22:46:46 2012 +1100

    Rename the etc/ files to what they need to be.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 248a69358101713b761fe08b82c8d1374740b2be
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 19 22:51:55 2012 +1100

    Pretty up the README
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit d3ca2e3d37a08f0f8dd07fc8da7b48c64c6aaa33
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 19 22:44:25 2012 +1100

    Add etc to the manifest
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit d67fcf180d31e194d62fafd93cacbde7d442315b
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Mar 18 21:55:19 2012 -0700

    Add a jeos create operation using oz
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 61c12cfebbb20ea9666db7f2524d6831064e68ee
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Mar 18 20:24:23 2012 -0700

    Updated README with install directions
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit aa68472a382ee85103b04dd94053be093a8a3c3a
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Mar 18 20:20:41 2012 -0700

    Add MANIFEST.in and add a oz tdl for a F16 jeos
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

commit 5635b453b4d7dc682bf4dbb0602714402fd0d94d
Merge: d725691 cdc7f5a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 15:09:41 2012 -0700

    Merge pull request #12 from markmc/sync-cfg-from-openstack-common
    
    Sync cfg from openstack-common

commit d7256915aaca3e4839af0ccd73dccf01170e0695
Merge: 0141f6d 4e4126b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 15:05:30 2012 -0700

    Merge pull request #11 from markmc/unused-util-code
    
    Remove a bunch of unused util code
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit cdc7f5a49ca873021611f8320987292477a5e33e
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Mar 16 11:47:07 2012 -0400

    Sync cfg from openstack-common
    
    Use openstack-common's update script to sync it to the latest.
    
    Add some dire warnings that changes should be made in the upstream
    copy of the code first.

commit 4e4126b9e57afd7bc8ae14b18df12c4b6b931610
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Mar 16 11:28:34 2012 -0400

    Remove a bunch of unused util code
    
    Eliminates the dependency on the iso8601 module.

commit 0141f6da2fb8c1c4d8c71a57a39e2361581e0703
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 23:24:52 2012 +1100

    Add a cape event listener.
    
    For the moment just log the event, could do more
    with the events later.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 0a26758da05efa5ba758dc620bc81d19da5a53d4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 12:09:42 2012 +1100

    Catch errors better when creating the stack
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a5fbf17743235d2fa5f7d5de77367ae953da450a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 12:08:53 2012 +1100

    Remerge common code with glance.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 3fad43a5e21cab9338a481a87e517a7ec2b11598
Author: Ian Main <imain@redhat.com>
Date:   Thu Mar 15 17:15:05 2012 -0700

    Add config cp to README doc.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 072800e2c2af7303cbf6730f85f1be896e2a4e13
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 11:02:00 2012 +1100

    Don't crash if there is no "AWS::CloudFormation::Init" section.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 82888427f3efb57926dfb747d8923375599b5f7b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 10:12:45 2012 +1100

    Move the default port number into common.config
    
    It was defined in multiple places.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 0f6375a93130214fc656021f95af25eaed796d1c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 09:05:20 2012 +1100

    Change the default port references to DEFAULT_PORT
    
    If we need to change it again then this will make it easier.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit b987031f7c0a54ee8b6177195aae8b9595f44764
Author: Ian Main <imain@redhat.com>
Date:   Thu Mar 15 12:22:00 2012 -0700

    Fix missing paren.
    
    Signed-off-by: Ian Main <imain@redhat.com>

commit 077ff505d2d8930a3f52a19597826f8a7176a1b3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 22:25:45 2012 +1100

    Add a call to start cape process.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a76d02e790357258f8f57a5b33a0d2fe794a3714
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 22:24:42 2012 +1100

    Hook up the update and delete (not quite working)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a321e3c8801f8e945e5910ea52323ad5877c5187
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 21:34:43 2012 +1100

    Add a very rough-and-ready conversion from json to xml for cape
    
    This needs lots of improvements. And is only tested
    with templates/WordPress_Single_Instance.template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit a5ea8a4c558d38592d1ef93857485e4fb1cef884
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 21:22:05 2012 +1100

    Add support for getting the template via url else we get RequestUriTooLong
    
    The nutty cloudforms api passes the template in via parameters.
    TemplateUrl is better.
    
    try:
    ./bin/heat create my_stack --template-url=https://raw.github.com/asalkeld/heat/master/templates/WordPress_Single_Instance.template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 97b6c95df0138b76dc1b75dd266f4d7c4ff37b70
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 16:49:50 2012 +1100

    Add missing RequestUriTooLong exception.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit da35a068e9dc3fe6b33bce1ed7e6fc877b40d31c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 16:49:10 2012 +1100

    Fix the systemd service section in the template.
    
    To be consistent with the sysvinit one.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit c0b95312c42aee27801f5d9d7e3680afeff35446
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 15:08:59 2012 +1100

    Add a disto mapping to get the image name.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 83ba8d951939fe03329c388d614102e73a571a7e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 13:43:15 2012 +1100

    Simplify the template more.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 7739de101e81246237fd899adf302f973eac705d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 10:40:02 2012 +1100

    Add a simple single instance wordpress template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 2fde25bc115efbfaf4a953633be3bc1321aa2170
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 09:36:51 2012 +1100

    Remove openstack copy right assignment as we have not done that yet.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit fc413d93278706cc8e62f3033fdaf4815fc32784
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 14 13:02:53 2012 +1100

    Add a simple in-memory "db" so we can create/list stacks
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 41d167c5609a3a67715004cd006eef1aedee4beb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 14 09:25:54 2012 +1100

    Add setup.py and friends
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 38de4d2564b75316ef5a61eb0b1a87b22a19731c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 13 22:27:42 2012 +1100

    Add simple readme
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit ca303152e64c87610723a934a2a4623d2fa062f1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 13 22:20:40 2012 +1100

    Fix Parameters
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit 3b9c41fb6ccdd0e48d22d43ed4855ff03e0fdc88
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 13 21:48:07 2012 +1100

    Initial commit (basics copied from glance)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>