]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
Merge tag '2014.1_rc1' into debian/icehouse
authorThomas Goirand <thomas@goirand.fr>
Tue, 1 Apr 2014 16:24:00 +0000 (00:24 +0800)
committerThomas Goirand <thomas@goirand.fr>
Tue, 1 Apr 2014 16:24:00 +0000 (00:24 +0800)
commit066269e9835fdaf80fb5f1b40a67d68b789982d2
treea0de15dc025e08b1142db0275fafe636f2087017
parentccc16d25209463d3872d1afb861c59d6bebd9c7b
parentb4b3c973a30beb7399ae505f31fd07dc4f2d5030
Merge tag '2014.1_rc1' into debian/icehouse

Neutron icehouse-rc1 milestone (2014.1.rc1)

Conflicts:
neutron/openstack/common/rootwrap/__init__.py
neutron/plugins/ibm/common/constants.py
neutron/plugins/nicira/vshield/common/__init__.py
neutron/tests/unit/nicira/vshield/__init__.py
neutron/tests/unit/vmware/extensions/test_addresspairs.py
neutron/tests/unit/vmware/extensions/test_networkgw.py

Change-Id: I4c423fb197f97f6eed0616fb094e0a8a5e9e6de6
74 files changed:
neutron/agent/linux/dhcp.py
neutron/locale/ar/LC_MESSAGES/neutron.po
neutron/locale/bg_BG/LC_MESSAGES/neutron.po
neutron/locale/bn_IN/LC_MESSAGES/neutron.po
neutron/locale/bs/LC_MESSAGES/neutron.po
neutron/locale/ca/LC_MESSAGES/neutron.po
neutron/locale/cs/LC_MESSAGES/neutron.po
neutron/locale/da/LC_MESSAGES/neutron.po
neutron/locale/de/LC_MESSAGES/neutron.po
neutron/locale/en_AU/LC_MESSAGES/neutron.po
neutron/locale/en_GB/LC_MESSAGES/neutron.po
neutron/locale/en_US/LC_MESSAGES/neutron.po
neutron/locale/es/LC_MESSAGES/neutron.po
neutron/locale/es_MX/LC_MESSAGES/neutron.po
neutron/locale/eu/LC_MESSAGES/neutron.po
neutron/locale/eu_ES/LC_MESSAGES/neutron.po
neutron/locale/fa/LC_MESSAGES/neutron.po
neutron/locale/fi_FI/LC_MESSAGES/neutron.po
neutron/locale/fil/LC_MESSAGES/neutron.po
neutron/locale/fr/LC_MESSAGES/neutron.po
neutron/locale/gl/LC_MESSAGES/neutron.po
neutron/locale/hi/LC_MESSAGES/neutron.po
neutron/locale/hr/LC_MESSAGES/neutron.po
neutron/locale/hu/LC_MESSAGES/neutron.po
neutron/locale/id/LC_MESSAGES/neutron.po
neutron/locale/is_IS/LC_MESSAGES/neutron.po
neutron/locale/it/LC_MESSAGES/neutron.po
neutron/locale/it_IT/LC_MESSAGES/neutron.po
neutron/locale/ja/LC_MESSAGES/neutron.po
neutron/locale/ka_GE/LC_MESSAGES/neutron.po
neutron/locale/km/LC_MESSAGES/neutron.po
neutron/locale/kn/LC_MESSAGES/neutron.po
neutron/locale/ko/LC_MESSAGES/neutron.po
neutron/locale/ko_KR/LC_MESSAGES/neutron.po
neutron/locale/ml_IN/LC_MESSAGES/neutron.po
neutron/locale/mr_IN/LC_MESSAGES/neutron.po
neutron/locale/ms/LC_MESSAGES/neutron.po
neutron/locale/nb/LC_MESSAGES/neutron.po
neutron/locale/ne/LC_MESSAGES/neutron.po
neutron/locale/neutron.pot
neutron/locale/nl_NL/LC_MESSAGES/neutron.po
neutron/locale/pa_IN/LC_MESSAGES/neutron.po
neutron/locale/pl_PL/LC_MESSAGES/neutron.po
neutron/locale/pt/LC_MESSAGES/neutron.po
neutron/locale/pt_BR/LC_MESSAGES/neutron.po
neutron/locale/ro/LC_MESSAGES/neutron.po
neutron/locale/ru/LC_MESSAGES/neutron.po
neutron/locale/ru_RU/LC_MESSAGES/neutron.po
neutron/locale/sk/LC_MESSAGES/neutron.po
neutron/locale/sl_SI/LC_MESSAGES/neutron.po
neutron/locale/sv/LC_MESSAGES/neutron.po
neutron/locale/sw_KE/LC_MESSAGES/neutron.po
neutron/locale/tl/LC_MESSAGES/neutron.po
neutron/locale/tl_PH/LC_MESSAGES/neutron.po
neutron/locale/tr_TR/LC_MESSAGES/neutron.po
neutron/locale/uk/LC_MESSAGES/neutron.po
neutron/locale/ur/LC_MESSAGES/neutron.po
neutron/locale/vi_VN/LC_MESSAGES/neutron.po
neutron/locale/zh_CN/LC_MESSAGES/neutron.po
neutron/locale/zh_HK/LC_MESSAGES/neutron.po
neutron/locale/zh_TW/LC_MESSAGES/neutron.po
neutron/plugins/bigswitch/plugin.py
neutron/plugins/ml2/drivers/mech_agent.py
neutron/plugins/nec/db/api.py
neutron/plugins/nec/drivers/pfc.py
neutron/plugins/nec/nec_plugin.py
neutron/plugins/vmware/dbexts/networkgw_db.py
neutron/tests/unit/cisco/test_network_plugin.py
neutron/tests/unit/db/vpn/test_db_vpnaas.py
neutron/tests/unit/hyperv/test_hyperv_utilsv2.py
neutron/tests/unit/nec/test_nec_plugin.py
neutron/tests/unit/nec/test_packet_filter.py
neutron/tests/unit/test_linux_dhcp.py
neutron/tests/unit/vmware/extensions/test_networkgw.py