Updated from global requirements

Change-Id: I73c3798ede53e2c4d936f997d9a502e1b5cfa462
Merge "Updated from global requirements" into milestone-proposed
Opening stable/icehouse

Bump version to next stable release on icehouse branch, and set
defaultbranch in .gitreview for convenience.

Change-Id: I70ddfb8cc70f9d7fca4ff63f95d5bd9c7fb7ef81
Added missing plugin .ini files to setup.cfg

Some plugin .ini configuration files were missing and hence not
installed via 'setup.py install'.

Conflicts:
	setup.cfg

Change-Id: I31f096e7fbf9f7a182ba8535ca8cadc4fecc6632
Partial-Bug: 1324487
(cherry picked from commit a75e156af64afb61f3ebf928eda132325e5a46f5)
Updated from global requirements

Change-Id: I64dcc6f9552cf7f8b6ff3503923e9acc58e3f5bd
Added missing core_plugins symbolic names

Some plugins miss short symbolic name in setup.cfg, specifically Nuage
and Metaplugin.

Conflicts:
	setup.cfg

Change-Id: I0198ae98654bbdddf8f2ba8dd3b80d0d447d6341
Closes-Bug: 1324487
(cherry picked from commit 664bdcdc7d714bcdfe503db8f59c6a3f97668df2)
Merge "Added missing core_plugins symbolic names" into stable/icehouse
Bump stable/icehouse next version to 2014.1.2

Change-Id: Id7181755d3609c0ae91c2402b34f2de02c06a1f0
Merge "Bump stable/icehouse next version to 2014.1.2" into stable/icehouse
Updated from global requirements

Change-Id: I24c366cc4bdac1f635968136f46dd8b850dba8b4
Updated from global requirements

Change-Id: I1b725d6e6d154ed4211cf866bb0b4c7d9a76dafc
Set python hash seed to 0 in tox.ini

New tox (>=1.7.0) sets a random python hash seed by default. This is
generally good for testing because it will help keep projects working
regardless of the hash seed, but neutron unittests don't currently pass
with a random hash seed so set it to the python default seed.

This change will allow us to use new tox again and remove the
restriction on tox<=1.6.1 to run unittests.

Note this change will need to be backported to the stable branches to
keep unittests there working with new tox as well.

Change-Id: If151efeb8caae3111515191e238d6e6ae491cd44
Merge "Set python hash seed to 0 in tox.ini" into stable/icehouse
Updated from global requirements

Change-Id: I8a961048d66c5164726c6bc125844bf22f17f85c
Fix deprecated opt in haproxy driver

If Neutron was updated from Havana, lbaas config file defines user_group
and loadbalancer_state_path in default section but since Icehouse these
settings were moved to haproxy section.
This patch adds DEFAULT group to DeprecatedOpt.

Conflicts:
	neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py

Change-Id: Ic92d4bc81ff6a3b16799414d17ac52e7a4801796
Closes-bug: #1349767
(cherry picked from commit cd3f4f7d24c92475ca698906c57f60375861b83f)
Add dsvm-functional tox env to fix functional job

Fixes for the bug in question landed in master to get the functional
job working again, and the first step in backporting those fixes is
ensuring that the {gate|check}-neutron-dsvm-functional jobs can invoke
the dsvm-functional tox env.  There is no good backport for this
addition because the patches in master are highly coupled so as to
make cherry-picking basically impossible without this patch.

Change-Id: Ide15f6925d516c18cae1afa98f5661f0609bb50e
Partial-bug: #1336172
Merge "Fix deprecated opt in haproxy driver" into stable/icehouse
Bump stable/icehouse next version to 2014.1.3

Bump stable/icehouse next version to 2014.1.3

Change-Id: I7a71b42bc99b66dedc99fb8b299e898d51d6e62b
Signed-off-by: Chuck Short <chuck.short@canonical.com>
Remove explicit dependency on amqplib

kombu already depends on amqp or amqplib depending on its
version, and no explicit access to amqplib exists in neutron code.

Conflicts:
	requirements.txt

Closes-Bug: #1317094
Change-Id: I5cf189d7173b732cba6df3f9b6aff1d2bb85cdfe
(cherry picked from commit 39ffcb0dd75d9dc5d8a249f2974a67f0def5204b)
Merge "Bump stable/icehouse next version to 2014.1.3" into stable/icehouse