Merge branch 'debian/icehouse' of ssh://git.debian.org/git/openstack/heat into debian/icehouse

Conflicts:
debian/changelog

Rewritten-From: 50761deeb793d393bb411707ef55d8de4d0bfe3f

Updated Italian debconf translation thanks to Beatrice Torracca <beatricet@libero.it> (Closes: #745389).

Rewritten-From: b4e95cf0b67f73006527582642de712ff44faef7

Updated Italian debconf translation thanks to Beatrice Torracca <beatricet@libero.it> (Closes: #745389).

Rewritten-From: 1eda4d4ece5987b9bed2d2500bef9b4857ad8dfe

Now packaging Icehouse first release.

Rewritten-From: b58584f1c01af239f1964ec6b1c67ee82f73dce6

Fixed new location of the connection directive in config file.

Rewritten-From: a0dc030bbfa3fd6ed1bf1ca314a971635732d1aa

Removed now useless requirements.txt patch.

Rewritten-From: ccf58549e7bd304c7217df8a1729301631a97859

Fixed (build-)depends for this upstream version.

Rewritten-From: a48ac2482ac44c084e4dd192f87d8deaa26d23ed

Now packaging Icehouse RC2

Rewritten-From: 47dad2964fa7c4cfaafdf7c5f0c1f8ed0f9a9eaa

Allow unit tests to fail.

Rewritten-From: 462e7ead13e5fc6f7b9f0a3a0678d585f3ab0287

Fixed the connection=sqlite:///var/lib/heat/neutrondb as default in the shipped heat.conf.

Rewritten-From: 075762fa4d23821504d1ef102f8b18fd43c6975f

Fixed dbsync for Icehouse (using heat-manage db_sync now).

Rewritten-From: 36d7934606d2ea3990f06f45b7ad5ba7cd086de6

fix sqla verison in requirements.txt

Rewritten-From: 67455bf226503be902145f0cf8b03d3e286b4ae1

Reviewed (build-)depends

Rewritten-From: d163b79f0bb5a82a33a1297a1962d6aee36b7c62

Now packaging upstream release 2014.1~rc1

Rewritten-From: 87088cc9b988131b0def04778d7591b11ad1e8d4

Using testr directly instead of run_test.sh

Rewritten-From: 4edd1222d97901d673fe8e07e91f31b0b227b030

Fixed (build-)depends.

Rewritten-From: 2650530222218e11e0bc6cd51a825dfde7b6a419

Now packaging Icehouse beta 3.

Rewritten-From: add0f08fc018259ce24f454d56238e0bd6f2ad43

Updates da.po

Rewritten-From: c818d49bfba34ff7825d5a9491787eea4899dffc

Applied havana branch changes.

Rewritten-From: fc5a90d6b80ff3baa0e4509b7f0cb9d5ffa6a4a5

Restart daemons after logrotate

Rewritten-From: e7d16b8dc4607ebfdc9c18be8f5c063efa32448a

Fixed the new neutronclient >= 2.3.3 (build-)depends (which was by the way missing from requirements.txt)

Rewritten-From: 4840e1650be663a14ec16a2f380a3e2adfe6c498

Fixed the french debconf translation file.

Rewritten-From: 84e45b2d705e031b49d498961b10e582b1635700

Updates Standards-Version: 3.9.5

Rewritten-From: 2895a286c929b2e79dab993b626a9ae26c31789e

Ran debconf-updatepo

Rewritten-From: 858acfb69adae66d6818877b38ff4a3bf2b02df2

Now building the doc in a heat-doc package.

Rewritten-From: a8dcce6bdb6292ba71415c45e16ec37c70bfa7e9

Reviewed (build-)depends for Icehouse b2.

Rewritten-From: 147044f493cd5ad7ddee034f46afa6a935c5c5e0

Now packaging Icehouse b2.

Rewritten-From: 27f88f907882eb9cbcdddc08b5771c46fb240cef

  * New debconf template translations:
    - Martin Schauer (Closes: #734738)
    - Swedish: Martin Bagge (Closes: #734619)
    - Spanish: Matias A. Bellone (Closes: #732536)
(cherry picked from commit 5932a873219e22788f5cfc53c42decaeb9c8d94b)

Conflicts:
debian/changelog

Rewritten-From: bb9e26c738fe1ade9cddcadfb050585194818750

six and iso8601 versions.

Rewritten-From: 4985eb3b4d4fb7a7adc33521860aec945125b338

Added new (build)-depends python-heatclient (>= 0.2.3).

Rewritten-From: 0a5b66f9f1dc5da7525558b698e35b78c46f2eb0

Removes coverage call patch, now applied upstream.

Rewritten-From: 662b00020881ed0057fcbc90e63069ae098e1362

New upstream release (Icehouse beta 1).

Rewritten-From: 0f38a115dd5f2945927871ea441a8fb39200441c

  * Updated debconf translations, with warm thanks to:
    - French, Julien Patriarca <leatherface@debian.org> (Closes: #728767).
    - Russian, Yuri Kozlov <yuray@komyakino.ru> (Closes: #729776).
  * New debconf translation, with warm thanks to:
    - Portuguese, Américo Monteiro <a_monteiro@gmx.com> (Closes: #729903).

Rewritten-From: 7703c0e58434fbb26471598a9432b2fdfca2a31f

Added missing configuration files in /etc/heat (Closes: #730122)

Rewritten-From: f317b8fc017a4b08bdaf4dba0d6038d5e4e16b59

Added missing python-babel depends

Rewritten-From: 1709c650a22514ccd3afad4ce55c8771a12dbafd

Added upstream patch to fix the /usr/bin/coverage call and use "python -m coverage" instead.

Rewritten-From: 8281ef2232cb0103015589ef8e897df071d1eb68

Now packaging 2013.2

Rewritten-From: 988e7acdf859764202cfd9b34295764a92362193

Now packaging 2013.2~rc2

Rewritten-From: bf5ce7cf83f7194f659bb1f60f252104fff41422

New date for latest changelog entry.

Rewritten-From: 7520a71a00fb333a32828ca5a7079d65651dbe5e

Switch back to use ./run_tests.sh

Rewritten-From: c4cf7214a42e8014236b95f6a566e5f1c3ea889c

Added old debian/changelog entries for grizzly in this havana branch.

Rewritten-From: 352cb218c952cc9530dcc8d1556100744c43fb59

Fixed versionning of (build-)depends

Rewritten-From: 5ee8f90588d6e1d62646c17586953846ba37996d

Now packaging 2013.2~rc1

Rewritten-From: be0c1d5a4bf0f86c0330f2ec5a094c8bc49f8890

Added missing build-depends: python-subunit

Rewritten-From: 3e7d3432f71f0734ff0de06c0727d9e9a8c4ac1f

Added --testr-args='--subunit  ' when calling testr

Rewritten-From: a9227e3183c9a7e0746c23d03fbad5624a4ff660

Fixed templates to use heat-common and not heat-engine anymore.

Rewritten-From: a65cc456381988b614a186f8dbc68954aa05a8d2

Fixes heat-common.config.in for the dbconfig-common package name.

Rewritten-From: 3231459602ca9173d20cb842cb9a66538757c5a1

Added missing debconf include in postinst, fixed postrm to purge db if user is ok with that.

Rewritten-From: b1c563731a1a48a5401a689a81e471ac94182924

Fixed the debconf templates (_ vs -)

Rewritten-From: 8a7fb001bc7809d8293aca85345907f56ace2551

Do not fail unit tests.

Rewritten-From: 7686e9f6b73b3cb1f854b4ac4efa9bbb47af8ff9

Added automatic Debconf config for RabbitMQ.

Rewritten-From: 944add32da558b73c080484db504559d88e1bb8b

Added new debconf translations.
(cherry picked from commit 0a40432be44bbcfd9581afcef23f0f046c817ea9)

Rewritten-From: ad4b1ee7474ec4025ca9141a31d17254e3d6a2a1

Now using a single heat-common configuration system, since there's also a single config file.

Rewritten-From: 8ade1e48db6c237c6c05d8c87a3b8996ece2fe3e

Now using testrepository for the unit tests.

Rewritten-From: 103ae7e13c3f964931e7e7c0419b0fc3e3d0d3d1

There's no heat-cfn manpage anymore

Rewritten-From: 7d69602792d75802dab3793b9129819ed947c20b

We don't need to override dh_install anymore

Rewritten-From: 3154f8c1f4c2182b5fc26821660ad1dd09df98cf

heat-api-cloudwatch.conf doesn't exist either

Rewritten-From: 798e7c9088f8e779ca065a830791a5b180de6f32

Do not install heat-api-cfn.conf which doesn't exist anymore

Rewritten-From: 25980e6215b91537d00234be83a5220377f5ce1d

Do not install now non-existent heat-api.conf

Rewritten-From: 56185b42cff01b086a7a4489ce69035aaa917a4f

Do not install now non-existent heat-engine.conf

Rewritten-From: 8522a98e22e32c2d49ed9b62098cb3db56a67661

Removes some uploaders.

Rewritten-From: 05b00eb72c7e005089de8e6053a7781f22264725

Removes heat-watch from heat-common (it doesn't exist anymore), and adds heat-manage

Rewritten-From: 347ea8588901f68e848b4a21b0a05148bafa13ef

Removes heat-cfn which is gone.

Rewritten-From: 4e2e0938f03655254cb98d0caf0177ee3f55ffe7

Removes heat-boto from installed binaries (it's not there anymore)

Rewritten-From: eb8c0d877c8857f22ed84dad4aab6257363bfff4

Allow unit tests to fail.

Rewritten-From: c422f9cd36566532c925304e08ac7a306b42714a

Review (build-)dependencies for havana b3.

Rewritten-From: 7277df195e09a1b3c42732903053719f9608d3d5

Now building havana b3.

Rewritten-From: 5040704ac83ea6aa3e5b89e7f631fa86f5349e95

Added 3 debconf translations.
(cherry picked from commit 810e7dfa7fab144f25681be67f5e4560df5e364a)

Rewritten-From: 8ae472bb11f319f3855aa522a5ef9059fd40b5b7

Review build-dependencies for havana b2

Rewritten-From: 7b2226a9ad005c8ac0878e361723607ce3d79be7

Now packaging 2013.2~b2

Rewritten-From: e1d5afa7066d554e76820a72236acf9b1c64edd4

Modified templates accoding to the review from the debian-l10n-english. A big thanks to them (Closes: #708748).
(cherry picked from commit 2ce14cf26fb21fe87d235073e9834af44166a6f1)

Conflicts:
debian/changelog

Rewritten-From: aec2cb1dde4e19aa813d6eead7ff88448ad18007

rm -f run_tests.err.log

Rewritten-From: 10973b58bfcaf5d87e14bdea4596c4eaf910c2fa

Added missing build-depends python-d2to1, python-pbr

Rewritten-From: 5133b3ea4c251c308ba1133f41b5d2eb97d0e72b

Updated (build-)dependencies for Havana.

Rewritten-From: b460b577aeedf068f0a22e977ca341fadcff64b2

heat-api-paste.ini, heat-api-cloudwatch.ini and heat-api-cnf-paste.ini don't exist anymore, using heat-api.conf, heat-api-cloudwatch.conf and heat-api-cnf.conf instead.

Rewritten-From: 2149ba88d78fcea498c8254da7f9bb17b90f1914

Removes all patches:
- removes-lxml-version-limitation-from-pip-requires.patch
- fix-package-version-detection-when-building-doc.patch
- Subclass_keystone_middleware_to_set_headers.patch

Rewritten-From: 36652a21aaff08d1c27226e3a01f9c037f7fb86f

New upstream beta release 2013.2~b1

Rewritten-From: d7d8cde085cdd51060373a492511f71e67f32178

Added missing policy.json in heat-common.

Rewritten-From: 57ddcb49d630d8693ba205062a9fee58d13b81e0

New upstream release.

Rewritten-From: a89b825522a408f00c3152202dcc3c2f173700d7

Also deletes /var/lib/heat on purge.

Rewritten-From: c930c7e5ed2aa5a340a010b011115454dc67cba3

Ran wrap-and-sort.

Rewritten-From: 00c3b7fd830b351c31d0d1f7edffccb6e50cef3f

Added Subclass_keystone_middleware_to_set_headers.patch

Rewritten-From: 96bc6843dd5cf9acc957dbda5997ac354ad826dc

Added missing dependency python-mysqldb.

Rewritten-From: d29ffee53b357b7d8d62a2c01833a14fcff456d3

Fixed the prerm script of heat-engine that was calling dbc_go heat instead of dbc_go heat-engine.

Rewritten-From: 9ebdd3b732e667a26ac5f0b0c6c59f32f36e03ea

Fixed the dbsync to the new thing upstream is using

Rewritten-From: 7e2c6d896cd211d46bf61190723091fc6caafeaa

Added missing dbconfig-common depends (Closes: #709126)

Rewritten-From: 8deabfd70ce912c99bb5666cc71d91e6e51de988

Edited debian/changelog

Rewritten-From: 322760ab54820bcdb56dfad6278458017db68090

Cleans the doc/build folder.

Rewritten-From: aa40f89307935fc5b8fd4383b8d35068902e0bcc

Fix version detection when building docs.

Rewritten-From: a1e669328cd51cfd35b5e546b473869af102a5ef

Calling: python setup.py build

Rewritten-From: a37698169c77927eaa44b21fcf0b9fb809466645

Removes the <=2.3.5 from python-lxml requirements.

Rewritten-From: 72ed0152cc186aa06a8cb434199eed5d70049f3d

Removes the << 2.3.5 versionning build-depends of heat.

Rewritten-From: 12fffdfe73c3bd64b2755028f004e4d52563c71c

Uploading to unstable.

Rewritten-From: 7603e5c970437de3a3de01520e46c9f185c997c0

Added missing (build-)depends on python-paste.

Rewritten-From: 3dbf650d45b5217ebe15012ef740c4722b8109b8

Merge branch 'debian/grizzly' of ssh://git.debian.org/git/openstack/heat into debian/grizzly

Rewritten-From: 3901c4b0ba1044aec933404f88d6b107b5a1b070

Review long and short descriptions.

Rewritten-From: cc9e4a0dd950c9fa5584259652bc0a0ee4544620

Edited debian/changelog, as previous version got rejected by FTP masters.

Rewritten-From: 6f7306852cf43b1db60a783041fca8cbc4a00f12

Fixed Section: to be web.

Rewritten-From: 443790deeeb2907656462f491a33bc4faf81ffe9

Now packaging 2013.1

Rewritten-From: e2595ba84d45f0e3e4ec5661dd7c56ca5cc1c0de

python-heat shouldn't depend on pep8

Rewritten-From: 42dc093f8df0175513be6dbb8bdf7e013951aba9