Reviewed:  https://review.openstack.org/302565
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=eeed79b7a2da4a8f7fcbe0c8a7c7a069f304ae11
Submitter: Jenkins
Branch:    master

commit bea576f802f993204aaaaea82812820f2f51c668
Author: Pavlo Shchelokovskyy <email address hidden>
Date:   Wed Mar 30 16:09:29 2016 +0300

    Sync integration tests requirements
    
    The patch that auto-generates integration tests requirements [1] missed
    Mitaka release.
    
    This patch manually syncs the integration tests requirements hopefully
    for the last time.
    
    [1] Ie79338cc10cc101fbf15b51c7923e3a7b8e4fbb4
    
    Change-Id: I3f001bcb7900f6d822055bf3567773b3a594227d

commit 950505d956e99bc9eed7d6fb0223800251d88b95
Author: Rabi Mishra <email address hidden>
Date:   Wed Mar 30 09:34:36 2016 +0530

    Revert "Check RBAC policy for nested stacks"
    
    This is causing issues with tripleo failures
    with ValueError, when trying do stack-preview as
    part of policy enforcement for stack DELETE.
    
    This reverts commit a8accbba98b5fc15562864030f49d20570bf8412.
    
    Change-Id: I366316f27f24c650bd435e67dd17abd8676cedf4
    Closes-Bug: #1561172
    (cherry picked from commit 354f1bcef038340d95f7dc4bc29268c9efed642e)

commit 184b09a40672ccfe1964bbf4fc72234d4cd012b6
Author: OpenStack Proposal Bot <email address hidden>
Date:   Wed Mar 30 06:08:07 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I656cedd8162b5a7d1682a33ab9b836ba25d22de9

commit 0c407b8596499466b93d5b511e19b0de130b6f03
Author: Zane Bitter <email address hidden>
Date:   Mon Mar 28 17:19:47 2016 -0400

    Add translation rule to delete ssh auth key from Magnum baymodel
    
    Add a translation rule to ensure that users with existing templates will
    not have them break when they update due to the 'ssh_authorized_key'
    property having been removed from Magnum and hidden in Heat.
    
    Change-Id: Id73bace93bfc2379e80777da7dc0c0bb059d6cd3
    Related-Bug: #1560284
    (cherry picked from commit 0ab68f891348eeafa1efa219070ef39f776cb6c6)

commit db06ee4514b0cc8037f037788c34631c272cfc6b
Author: Sergey Kraynev <email address hidden>
Date:   Thu Mar 24 04:30:39 2016 -0400

    Increase timeout of WaitCondition due to ConcurrentTransactions
    
    Currently we have retry logic with random period of delay.
    There is a chance, when we have several re-try attemts with maximum
    timeout, so it can be a root cause of floating fails, when we have not
    enough time for getting all signals.
    
    Also decrease number of signals from 30 to 25, due to small risk, when
    one of signals goes to ConcurrentTransaction error.
    
    Note, that all these changes are made in corresponding functional test
    and don't affect main code.
    
    Change-Id: I9ca85c4378d0f62e316f4f40ff73597ffaaabadf
    Related-Bug: #1497274
    (cherry picked from commit 8f370d6174c7574c6ee611b5089eac8a4c37dbf2)

commit 145be139cc8a34c57f84e1991031cfc2595477ba
Author: OpenStack Proposal Bot <email address hidden>
Date:   Tue Mar 29 06:50:00 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: If0c7528de1e5ce363dc807fcbaa3ea2b5107f763

commit a2a6fa77118aa718fdd19ecc8483db8d4cb67d7e
Author: Rabi Mishra <email address hidden>
Date:   Sat Mar 19 19:33:42 2016 +0530

    Fix update issues with autoscaling group
    
    - Fix update stuck in  IN_PROGRESS if issued within
    the cooldown period after CREATE_COMPLETE.
    
    - Fix update stuck in IN_PROGRESS if issued when scaling
    is happening.
    
    Change-Id: I31074783f525ea811056e8df7ff46545e58075b5
    Closes-Bug: #1559132
    (cherry picked from commit 6bd7352dc4838b8ef782f2345a4dfdf57ba3e356)

commit ab8e7a2113c44e5a20d3db58b1aa8a4dd139df68
Author: Omar Soriano <email address hidden>
Date:   Thu Mar 10 09:44:57 2016 -0800

    Avoid cooldown when group size does not change
    
    Cooldown behavior changed in commit:
    50cc71e33c40a9e3be604b16f77d3c3cf030a63b
    
    Restore the cooldown behavior so that when a group does not encounter
    scaling activity, a cooldown period is not activated.
    
    Closes-Bug: #1555748
    Change-Id: Icf5df6a48afb9f56aa1c3f1622d33b9998aca39c
    (cherry picked from commit 6c25e8302db02203fcb933e5b104507c83b6672c)

commit 678fa7d14ab76eb51b3d0c7196e21af6ed4875a4
Author: OpenStack Proposal Bot <email address hidden>
Date:   Mon Mar 28 06:52:27 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: Id8fd86df399d0b11212dcd2ad47b3f14e38b4e74

commit c82b7520954a645edfbce834903e4371d35bec3f
Author: dixiaoli <email address hidden>
Date:   Tue Mar 22 10:35:42 2016 +0800

    Remove property "ssh_authorized_key" from OS::Magnum::BayModel
    
    This change marks the ssh_authorized_key property as HIDDEN from
    resource OS::Magnum::BayModel due to magnum has removed it in this
    patch: https://review.openstack.org/#/c/274452/
    
    Co-Authored-By: Hongbin Lu <email address hidden>
    
    Change-Id: I573918c77cf35fe98c6c0fb3eed7f70df39e03d0
    Closes-Bug: #1560284
    (cherry picked from commit 4ed57d8d5a4e85da30f04cfe20f824de361b0a79)

commit 74796308c22741db1398f7a1e8659fcc4e5411a4
Author: OpenStack Proposal Bot <email address hidden>
Date:   Fri Mar 25 06:46:14 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I32bcc9ac4d350228c1a3e0fbb2cadc6ec93a67e6

commit 443f867ceb65e2302229ef9a3d8c5afff51ae42b
Author: Sergey Kraynev <email address hidden>
Date:   Thu Mar 10 21:39:48 2016 -0500

    Fix race condition for WaitCondition with several signals
    
    This fix is based on changes introduced in patch
    Ibf9dd58a66a77d9ae9d4b519b0f11567977f416c.
    
    Follow changes were done in this patch:
     - According previous item code for calculating metadata of
       wait_condition_handle was moved to separate method -
       normalise_signal_data().
     - Same method was implemented for BaseWaitConditionHandle class, which
       returns original signal data without changes.
     - handle_signal method for BaseWaitConditionHandle class was updated:
       * all code related with updating and verification metadata was moved
         to merge_signal_metadata internal method, which will be called from
         metadata_set method.
       * if/else block was changed to raise error in case, when metadata has
         wrong format, so else section was deleted.
     - corresponding tests for waitcondition resource, which expect several
       signals was added.
    
    Change-Id: Ia25146a742ce79dbb0480d9053131216037e5305
    Co-Authored-By: Zane Bitter <email address hidden>
    Closes-Bug: #1497274
    (cherry picked from commit cb3183d0475ee959045dbf0098cd0d96b1ba1e98)

commit 71861f4f7c8063e618f95a72271ad0851e113f8f
Author: Sergey Kraynev <email address hidden>
Date:   Mon Mar 14 03:57:15 2016 -0400

    Handling concurrent transactions in metadata_set method
    
    There are follow changes in this patch:
     - Using exception ConcurrentTransactions for processing
       concurrent transactions during writing metadata.
     - wrapper @retry_on_conflict was used for metadata_set method to
       allow retrying in the event of a race. The same wrapper was added for
       _push_metadata_software_deployments method.
     - added new parameter for metadata_set method - merge_metadata.
       When RetryRequest exception is raised, oslo_db_api.wrap_db_retry
       re-call metadata_set method and in this case we need to refresh
       old metadata. It's mostly need for signals without data and id.
       For example:
         A and B signals come in the same moment and both get number 1,
       because metadata was empty. Then during write in db RetryRequest
       exception was raised for signal B. Metadata of this signal stores old
       number - 1. So we should re-calculate this value using new length
       of metadata and set number - 2.
    
    Change-Id: I1ddbad7cde3036cfa9310c670609fcde607ffcac
    Co-Authored-By: Zane Bitter <email address hidden>
    Partially-Bug: #1497274
    (cherry picked from commit 82b744042e39529eaca6660704ad4923c2442be9)

commit a0aee7ee40d0d723994c7076f3d377294d9779af
Author: OpenStack Proposal Bot <email address hidden>
Date:   Thu Mar 24 06:45:12 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I528c4e25a1b03f7cd7cc6c977f2160ecf7ca83f5

commit 0e846513a2d2999b3b4332d78cbda525b63ffe67
Author: huangtianhua <email address hidden>
Date:   Fri Mar 18 18:31:12 2016 +0800

    Make sure to delete the credentials when stack deletion
    
    If enable convergence, make sure to delete the
    credentials when deleting stack.
    
    Change-Id: I93096d691503bd914d1c059db3203d4f8ac5aec2
    Closes-Bug: #1558964
    (cherry picked from commit 8f3d8273e4c7c0c3e077205105adf68bfac6a964)

commit 368491cd582e6895fa9844e5e3faf770625594da
Author: Rabi Mishra <email address hidden>
Date:   Sat Mar 12 12:17:52 2016 +0530

    Add retries to avoid dberror for user_creds_delete
    
    Add retries for user_creds_delete.
    
    Also adds cascade_backrefs=False to the relationship
    between user_creds and stack.
    
    Change-Id: I0e242c008d3368d30708b52f83f998b77aff5f35
    Closes-Bug: #1545577
    (cherry picked from commit 45722e6cb448eb7a469d9910e495925842b58fc1)

commit 8a6566de65733eb68f9b696676e1eeb20a8f641d
Author: OpenStack Proposal Bot <email address hidden>
Date:   Wed Mar 23 06:34:01 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: Id6d76b9684680624f901fbda8d84b23a89dccef7

commit 23eb5458eb7c2de0d019cefbf78ab4bdfebdaa5a
Author: OpenStack Proposal Bot <email address hidden>
Date:   Tue Mar 22 06:42:32 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I0fcd65c378547f3cb5653b9e7f8b75aef6adb272

commit 419da6560411ee676815363002e87c1671f7062a
Author: Thomas Herve <email address hidden>
Date:   Thu Mar 17 16:03:08 2016 +0100

    Remove unknown parameters in patched update
    
    When updating a stack with the existing flag, we keep the parameters
    from the old template to be used against the new version. Sometimes
    parameters will get remove and won't make sense anymore, and keeping
    them would break update with a 'Parameter was not defined' error. This
    filters out such parameters so that the updates succeed.
    
    Change-Id: I6f2aa77da28d271dd001a137bb574b5470292f15
    Closes-Bug: #1558610
    (cherry picked from commit 90fc4fe89e76e18df8831e1163c064eae76fbf69)

commit 9b9584d080f0125a9288c60515658e9debdc9c97
Author: OpenStack Proposal Bot <email address hidden>
Date:   Mon Mar 21 06:42:10 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I835201af400c50392769fe1a796eeab34a07f097

commit b828eae0a203d45c8f3bc66a743bf7cd94f90051
Author: OpenStack Proposal Bot <email address hidden>
Date:   Fri Mar 18 06:22:48 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: Ica86f3a11c97fe42feec875809186e04495e7aac

commit a7403a9e5abd01946453d8b4a4015e705b6729d6
Author: Joe D'Andrea <email address hidden>
Date:   Mon Dec 14 16:39:30 2015 +0000

    Explicitly naming resources in "unsupported" warnings
    
    Warnings that a resource is not supported are now prefaced
    with the resource name and status (e.g., DEPRECATED). In
    addition, the warning is now logged via LOG.warn(_LW()).
    
    Previously, warnings.warn(six.text_type()) was used. In
    addition to being routed to the log file, it included a
    confusing reference to the last line of invocation, which
    was the fragment "info.value.support_status.message))".
    
    Change-Id: I006120a395007d88f3ba04a4af89283a1a077c3f
    Closes-Bug: #1524512
    (cherry picked from commit 7ccf4d045e81566c85ff7f09979bd1a6b607a395)

commit ddbe642f3b40287e2a7ca2ddf039a5a8f9c7dc2a
Author: Thierry Carrez <email address hidden>
Date:   Wed Mar 16 16:15:29 2016 +0100

    Update .gitreview for stable/mitaka
    
    Change-Id: I7a1a83bff5cf8d7a5d82bba0e2cc608bf5ba2e60