Removed OVS_lib_defer_apply_doesn_t_handle_concurrency.patch applied upstream.

Change-Id: I0bc29f8e5a2ff571cc170824bec06fe1308acfca

Rewritten-From: 7010ceb5c900048d085d39f2836ddeb07bcd0fb1

Now packaging upstream release 2014.1.1.

Change-Id: I673230a1b40fba4f1b2ed0e6e984e34fe48402fd

Rewritten-From: c765749cccea47c317f385d65108e9ceef59d1d3

Also patches dhcp_agent.ini

Change-Id: Icdadf7f68710987d97875e6758769631d46abdce

Rewritten-From: 95a9602353de0c21b61c7dfa33709d5448fedc4d

* Added sane-defaults-for-ml2_conf.ini.patch
* Fixed debian/changelog

Change-Id: I70ad50cae04ebfd52c4f4a0f2f84e6091a40d309

Rewritten-From: b220d41d6724a85b0b756a2bd2ebb1e410bed4b6

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

Conflicts:
debian/changelog

Rewritten-From: 039e18d7b9b8e5c361811ad757c707a5f170e5b9

  * Updates the OVS_lib_defer_apply_doesn_t_handle_concurrency.patch patch
    (Closes: #750415).
  * Now build-depends on openstack-pkg-tools (>= 12~).

Rewritten-From: 12a8091e4edf2280561a2f2f2768124a2a371bf8

Added missing dbconfig-common dependency.

Change-Id: Ie97b19b17857b3c026a08dffd97420ef9a1c9114

Rewritten-From: 656d67024e267ddafa962171797666c1418055d9

Adds Install_SNAT_rules_for_ipv4_only.patch. Note that without this patch,
it's possible to destroy an OpenStack cloud network, which is why I'm
putting urgency=high in this upload.

Change-Id: I34aa3c656f0218a1986ef6b78f7e28132d6172a6

Rewritten-From: 5cb05ffad81859b3803f432cbaa3a2b0ff1567fc

Switched from restarting daemons to copytruncate for logrotate.

Change-Id: Id7529a82ba4baba916ced64e7b12b4e7a88520d3

Rewritten-From: 0116ea5163191091a76d039fd1505dbc613c925e

Fixed linuxbridge init script.

Change-Id: Ia46155d2e5f5c739f06b0d1241fcb446599c0391

Rewritten-From: fd63ba33363aaf0018d793850a6ff1494a3af34d

Added Russian Debconf translation, thanks to Yuri Kozlov <yuray@komyakino.ru> (Closes: #746939).

Change-Id: I3798cc693cdb6f6738bcae7d3b40372fc0dc5f5f

Rewritten-From: eebdaff4c1bc731cff2b88b8e525844e896f165e

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

Conflicts:
debian/changelog

Rewritten-From: 6298c540b10f60b58e73476f5fb79c99b4810eb2

Fixed fr.po, thanks to Christian Perrier (Closes: #745249).
Added it.po thanks to Beatrice Torracca (Closes: #746575).

Rewritten-From: 88ed2c9a321722f7be93afc0be9433d2f1cd4055

Added a Provides: neutron-plugin-ml2 in neutron-common (LP: #1309858).

Change-Id: Id9a98e99c6d5d05bb574424647f85384db7b9896

Rewritten-From: a9184dd6e59bc61d5d13461804a22e6a3af03117

Fixed fr.po (Closes: #745249). Thanks to Christian Perrier for this.

Change-Id: I8084032bdb0a9d2fd8b40e9885681280d3541cec

Rewritten-From: d132886d30f7bdb1a9ac20923ae4148a41496486

Uploading to unstable.

Rewritten-From: 0bf2119b295a1cbe1da1bb9fae269e5b8f204236

Packaging Icehouse first release to unstable.

Change-Id: If6186892352e0686efccfc3a41f529430ed5d946

Rewritten-From: 0efde0a45d19bcecb0deeaed11946e386f0dc1f2

Fixed 11c6e18605c8_pool_monitor_status_.py migration

Change-Id: Ic6c16c99635505b61b44dc8fce1ccbd10862482a

Rewritten-From: 4c43e457371e7436fe9f1ce6e059e7aa27ee016d

re-adds 0001-Add-parameter-and-iptables-rules-to-protect-dnsmasq-.patch

Change-Id: I76512e455a321952870e3d57fd1e5c74f06d5ad1

Rewritten-From: b4a1fb175ae13541e4a1bdb4946cdc11ef4bf23a

debian/changelog: documents re-addintion of 0004-Fix-Metering-doesn-t-respect-the-l3-agent-binding.patch

Change-Id: Ia33d0a7fa31c4cdd55d4cc88cb9d394e35d03272

Rewritten-From: 0e51bdd06b89712f5c77bab4030518ff57e269ed

Re-added 0004-Fix-Metering-doesn-t-respect-the-l3-agent-binding.patch

Change-Id: I68fbd4f84ba31430ec110fc31148610798fa56cb

Rewritten-From: 95731a06f1325efe51a5e25cc384a5ba31a394ee

Documents: Allow selecting log destination for Neutron daemons

Change-Id: I20d3c211db7735f69e6a2b1444e8901c927df375

Rewritten-From: e3e8fdf29134fd1091e5440643025b874284ccf8

Allow selecting log destination for Neutron daemons

Rewritten-From: 30c98fe2c071ac7de697da76dbbb312eaf561f3a

Now packaging Icehouse RC2

Change-Id: I9430e892bd90122111526481d4392b3850ac1a21

Rewritten-From: 5eec0ad57181115eabd82d593369936ae2158dc0

Adds OVS_lib_defer_apply_doesn_t_handle_concurrency.patch

Change-Id: Ie1e469decd5ec1068133efffe29e15463812e086

Rewritten-From: 89bdc04ff97d1328aea97f53fa8ae0c662f99873

Merge the 2 Alembic migration patches into a single one.

Change-Id: Ia312c97c1b443bcd5df3ff5824d9a70f2dab0abb

Rewritten-From: 6081c836466cc397518c512447359b0ba89eae2e

More SQLite patches.

Change-Id: I4ce294fbdf39f5f4b70258d54dd0e2e6a0732c4a

Rewritten-From: 8d317b2b7da7105834cb2a9ab9cb757e8cae845b

Releasing rc1

Rewritten-From: 68ba9e4cfd069b52bcd8df07acf5a8ca0cb94aba

Using ml2 as default plugin

Change-Id: Ifb1cb9415522d97f357779306a561b543a17930f

Rewritten-From: 72e7874f32194c58a53470781427540a06f084d1

Fixed service_plugin

Change-Id: I78eceab45ee0bf0bb786de4eda2cf919fade5833

Rewritten-From: 130d37e5d146bd72be06ffd64f7433535cea921a

Fixed default service_plugins value again.

Change-Id: I99ea1945d1ec7f34d0635bd3ecf2124f80de5b24

Rewritten-From: 07d71da37b7f375ef8686f2665ff013536df1d19

Activates tunnel_type = gre by default.

Change-Id: I28b76e09cbc073783ca5be55eb8a52d37314ec64

Rewritten-From: 5fb1da0fed64d632810efa854683350972154e8b

Fixed service_plugins default value.

Change-Id: Ida38e706fadc1341587865e179477de5710f52eb

Rewritten-From: 76c46d730b7353f73af1402a167a16a626f6aa6e

Fixes an issue using ml2 and openvswitch plugin

Rewritten-From: b737899a2cdf29398861e16c1f78f4707d5388f2

Fixed new (build-)depends.

Change-Id: Ib3f371f3a46aa58af54a35c211bd5484e76f874a

Rewritten-From: e180caa3d5ce734b453f9c11596eb2e4d464d993

Refreshed better-config-default.patch

Change-Id: I1a04a29d091dd2ef89c5e03da08ae5ffe69fbdff

Rewritten-From: b24af572c6c6e9287fe2349601eaefb6daaec22c

Refreshed fix-alembic-migration-with-sqlite3.patch

Change-Id: Ib69cefb5e218a33193e494c81d43227c958d7b40

Rewritten-From: dd90ffd31808f672d4932f333b755b043505b0ad

Removed SQLAlchemy version in requirements.txt patch (now useless).

Change-Id: I114320c4ec46319382a5ac09954996f86b06e570

Rewritten-From: d78f5334d0c29e1146f46c4216fea591806f3370

Now packaging upstream release 2014.1~rc1

Change-Id: Iff6ad4f3b7da6573d6e8f2093333d4261ff4458a

Rewritten-From: 82f109bc8f1868dc8ac4258eda15c7890d32bb6b

Reviewed (build-)depends

Change-Id: I492e63668e31297c9d9ed80b0e4bea9106fafe56

Rewritten-From: ccc16d25209463d3872d1afb861c59d6bebd9c7b

Refresh patches.

Change-Id: I8c18e75a306fbc42f84297d1182069acf5965bf0

Rewritten-From: 4455ad0fe76d231cff2f3bfc4d94ec9a03187d30

Now packaging Icehouse b3.

Change-Id: I71a16210c51b620f37043dca2e84a9880fa91d4f

Rewritten-From: 7118f3a0f5d60bfddc5c2cf57ba3153f39e1d68d

Review (build-)depends

Change-Id: Ib04b481742a7eb102c905a1dbea030a95dc1c105

Rewritten-From: 3ec7a8f83feb060807aa802fa3c3e133463f7e84

Added de.po

Change-Id: I013244d4e9fef736653fb6f77a2f4edd478025ab

Rewritten-From: 7008371ae33af225591f4ad9c06b15349e09e919

Fix openstack-pkg-tools build-depends

Change-Id: Iedbd996c992a443aa8d32603355c72cb5d1252e1

Rewritten-From: 04b4c20309451486652dec7523f852445d519fe0

Applied changes from the Havana branch.

Change-Id: Idf16b5d2546c94864dcf9e135ac1f80d6bbec798

Rewritten-From: 02e51934662ce2573f9f5b14dbce1a858e66f6ab

Fix /var/lib/neutron and /var/lib/neutron/dhcp folder rights.

Change-Id: If0f2ab1ad50d12dc9af155314b962cbc25052167
(cherry picked from commit 619a80f61fbf5a65234ea2684952abb8cc991f3e)

Conflicts:
debian/neutron-common.postinst.in

Rewritten-From: ced2f4baa8f89b915a9128c6fb6e52f801217be0

Restart daemons after logrotate

Change-Id: Ia989bdde7ae136c1e49a349cd3694276207ff7a3
(cherry picked from commit bd3e2763cb1fa4aca94f89295820e313d5d2e3f1)

Rewritten-From: d4dc27b456309309d530616df9ecb673d6d7ca0c

Fixed (build-)depends for Icehouse b2.

Change-Id: I300c3a2db00349173ff680680c39478db345276e

Rewritten-From: 78f432de572cb22d82ebd74cb0b526ba241f682d

Refreshed patches.

Change-Id: I22fc6c09e64cae9af11340f416f898abf4741b80

Rewritten-From: a554ceb2721bb4a90dd429fd3ffe73aa0a6db8f2

Now packaging icehouse b2.

Change-Id: I3b476109e8aeb7d262e5cf6555b878e2e8d3c538

Rewritten-From: 6b42fc8979d9c9ebaa57f37b1b41e70468c8d136

Added new es and sv po debian/po/*.po files.

Change-Id: Ia485215222a88868069e784770b4ea34573127da
(cherry picked from commit d1a0fa1a7bbeca628ab01bd8e3a8fd1dbeefcc9a)

Rewritten-From: 95501a4fb02a2fccb7762b53420630fcb5be0cda

Added openswan as dependency for the vpn-agent.

Change-Id: I01150a2facee4e95977a997af71e01df9fce702b

Rewritten-From: b6d33ebc116e94b42512745943494958b20b9cdf

Fixed -iso8601 and -six versions.

Change-Id: Ic209125774ec9cd12ad21e5d781f99e070930f72

Rewritten-From: e1aa967183625b13b4f7fb592fbb3bb82049b90b

Added python-neutronclient (>= 2.3.0) as dependency of python-neutron.

Change-Id: Ic675303b3cb80811e771e4a7cf76bcb14be23040

Rewritten-From: 8b0c2b372fd40a8b713145e742523b27e275e8a6

Fixed /var/lib/neutron/dhcp folder rights for Ubuntu.

Change-Id: I3125b6e5bbb93184a7e399b3b8a5bfa4fd9e979d

Rewritten-From: 04a8b7918a170c1dfec4194f29ba7070cda6284e

Fixed upstart script for the ovs agent.

Change-Id: I0c62edf13269a6fd1ddfed6b9012f17624fa0442

Rewritten-From: dd6ccb5a7e9ff7b94e0ad52123e6e5531e810362

Refresh better-config-default.patch

Change-Id: Ic69d2b234c1d7dc512e283c1ef4c02dd5e105854

Rewritten-From: 5a3243851bc70a3160899c26d59b0d9500f8e744

New upstream release (Icehouse beta 1).

Change-Id: Icbf1ebd0f1c34975dad3b5c096928f8e52540c8d

Rewritten-From: b67890deee7810d560bf6b783ac4e436d15feef2

Do not call neutron-db-manage --config-file /etc/neutron/neutron.conf upgrade head if the user didn't ask for db management through debconf.

Change-Id: Ic129018979f78fafdd1204bbb5dc7495c9a3c48c

Rewritten-From: f5eaa6f9cdd641c19d98eb25de2e74e2e167e787

Added missing handling of ml2 plugin in neutron-common.postinst.

Change-Id: I3fce2638416e7d0775476a1b90f7818cd972b0bc

Rewritten-From: 6b23a3c64d5babd9be7e12cd5eafd1862f9a0b1e

Configures service_plugins = neutron.services.l3_router.l3_router_plugin.L3RouterPlugin as default.

Change-Id: I135dd34db0d42136764511aa7342131aeb856869

Rewritten-From: 7fd23b2f69e3b0be51c2ac628748b276dca31751

  * Added new debconf templates translations, with warm thanks to:
    - French, Julien Patriarca <leatherface@debian.org> (Closes: #728764).
    - Portuguese, Américo Monteiro <a_monteiro@gmx.com> (Closes: #729928).

Change-Id: I7bbd25ef420c35484ae1fa5d5f772feee5ee27fb

Rewritten-From: 1219927fc8bbb4db20e35e0e507cd8e55998a3f3

Fixes the core_plugin setup in neutron-common postinst.

Change-Id: I5d33882d23b9e26d4582b9c9de5647856887e63b

Rewritten-From: ee5252dbf13df2715116b2a00a56d9dd18958577

Removes openvswitch-switch from depends since it's in pre-depends.

Rewritten-From: 2d351dee7b107363e8d2a64e34726faf60ab484b

Merge branch 'debian/havana' of ssh://git.debian.org/git/openstack/neutron into debian/havana

Rewritten-From: 493ee88ac3c9e75f58b9adc43a1f66527c36ccb4

dependency on openvswitch updated

Rewritten-From: a19b4ea0332b03e69105b1f9408d3eae107fc450

watch file updated

Rewritten-From: d4b23ba2e88b3bbe4d84ec6ee8e297672433769d

Releasing to unstable.

Rewritten-From: 90c47a8895c31e0f1fdedd6099faf4cd3727f193

Fixes the sqlalchemy requirements.txt that restricted to SQLAlchemy <= 0.7.99.

Change-Id: Ic45f467fd3003a8f2b699eb215b3b2f259bec01e

Rewritten-From: 0398d57564e7f0d11c60d9c892a9dd8b95e3ee30

Fixed the cron.d files for lbass, dhcp and l3, so that they are on a single line instead of broken lines with \ (this doesn't work otherwise).

Change-Id: Id95a56ffadcc8fe01c517d39bb0716d320ccdc19

Rewritten-From: d395869912e22c30d435919c902fcfd8eb59c790

neutron-l3-agent & neutron-vpn-agent now conflicts with each other

Change-Id: I84c0ba547c08c985b8278f7fec8ad8f1e9f72d0c

Rewritten-From: 2847521ecb8fac316bdc8c878c7bb1b40ff375bc

Now sets the OVSHybridIptablesFirewallDriver as default firewall driver.
Adds creating of /var/lib/neutron/dhcp as nobody:neutron if running on Ubuntu.

Change-Id: I8d31192da7e68244957cefde714e6ee999f3ab88

Rewritten-From: 82a08513d7726edcc5c574c603624b17ba8512ce

Now starts the openvswitch agent using the ml2 config if this is the plugin which is in use in the core_plugin directive.

Change-Id: Ifb42e1993d86072656db9244b84c41167d93b5f8

Rewritten-From: a68feb4b73deebd82c5e187bc0ecf02909257791

Merge branch 'debian/havana' of ssh://git.gplhost.com/var/cache/git/openstack/neutron into debian/havana

Conflicts:
debian/changelog

Change-Id: I34008fbaa4cc78feede1dbf05ad76c9dc185cfb1

Rewritten-From: 0ecef04a6bc481d33b02e3b841a232024d4d9eea

Revert "Adds ml2-agent daemon and package."

This reverts commit 2bc038db887995b9a5eb0edb7291932c8764906a.

Rewritten-From: 81a70659b220e500d525b6e0949bdbef5753e41d

Release release 6

Rewritten-From: 8a7fc99ee93930c451e1e79301dba2c461952c05

Merge branch 'debian/havana' of ssh://git.gplhost.com/var/cache/git/openstack/neutron into debian/havana

Conflicts:
debian/changelog

Change-Id: I80be5c523a9df5888bfdef1f07dc619bf0ed0f00

Rewritten-From: bb20bd0fa4db1d91a9c1bb8b7e7953bc3a53e8a0

Adds ml2-agent daemon and package.

Change-Id: I2eb6c602d252da432d1e9be2750c9d5cdfa1d221

Rewritten-From: 2bc038db887995b9a5eb0edb7291932c8764906a

Revert "Updated VCS field to git.gplhost.com."

This reverts commit b1fbfb7c9e94a7b39a9d16122a5e7171c0425d06.

Rewritten-From: 153e77a387991904fc25f93eeadc68fd07dc27a6

Now releasing to unstable.

Rewritten-From: aab97fb053b2f7dfad4a437fec99d04212aa15a9

Revert "Updated VCS field to git.gplhost.com."

This reverts commit b1fbfb7c9e94a7b39a9d16122a5e7171c0425d06.

Rewritten-From: 2a4c70e97f1ba08ec1684671a62eac0063c0a19f

Updated VCS field to git.gplhost.com.

Change-Id: I6a4ee5d2971f362c8618263b85880b07c6c12e73

Rewritten-From: b1fbfb7c9e94a7b39a9d16122a5e7171c0425d06

Adds missing RabbitMQ debconf configuration code.

Change-Id: Ib31ca61e9bbcfcb15bf626eb60568d689cc70a63

Rewritten-From: 373e4dea7d3d664a8510f199109562f3cd58290f

Added missing python-babel depends in python-neutron.

Change-Id: Ic5b652cb31ca624e612ccf320cdfd48bd1a21054

Rewritten-From: 8f23df70a7d9099691809eb8c70f50e0243201f8

Uploading to unstable.

Rewritten-From: 4bd676374edbb668655ca22299c044fd4078aa33

Adds find . -type f -name "*.pyc" -delete in dh_clean.

Rewritten-From: b4a29980db7873ac4032e2e2dee3f03efb219d92

neutron-*-agent packages are now breaking + replace only old versions of Quantum packages: those who were not transition packages (Closes: #727235).

Change-Id: Ib27461afbcc2756ac8577bf2dbd349d189639ecc

Rewritten-From: 165fce8b027f8a1ff6d3030996c97d823bfdfad4

Really fix Alembic migration with SQLite 3.

Change-Id: Id02fc70114ad1b78826412cf75af9c7bc3be2cf5

Rewritten-From: 9a74ef71a5f1585872fa0d7e76e755d1cfd212e2

debian/patches/fix-migration2.patch

Rewritten-From: f92751ff9d3b4ce2040ff44852b51b504122f6c4

Really fix db setup (Closes: #726719) again.

Rewritten-From: 96677ac55a7f8010964975f95a58e8ea804ccd75

Really fix db setup (Closes: #726719).

Rewritten-From: 4e9fe241a99da75725ba1ea87a0a4665e328055a

Adds upstream fix for db setup (Closes: #726719).

Rewritten-From: ab42cf6cb793e02fec390f8bb7580471eed0de80

Now packaging 2013.2

Rewritten-From: 0ea87e1ae01247b9548cfe8286e95e68f65d4295

Now packaging 2013.2~rc3

Rewritten-From: 36ccf60b91cee01ef756226ed002d2089dbab48d

Ran debconf-updatepo

Rewritten-From: 045e7df4fc7778ecb1aac02cbfe565f8fe33d2e8

Building for debian experimental

Rewritten-From: dc8bef845ed22f604ce73735923ff758fd16dd19

Removed lines refering now non-existent templates in debian/po/POTFILES.in (those have moved to neutron-common).

Rewritten-From: c304ab72abd00a943e17528bd7fd0f3ca50dc592

Now packaging 2013.2~rc2

Rewritten-From: d0f8359571ca7b991a0edbf4e57ab1b22c18da49

Changelog should release -1 not -2

Rewritten-From: c4e07339ec7651f825e5547a21f28ddfe27e27ee