From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 1 Jul 2014 14:26:36 +0000 (+0800)
Subject: Merge tag '2014.2_b1' into debian/juno
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a956ca9a3c496a91f2e3e9ccffd60ca36e1c9539;p=openstack-build%2Fcinder-build.git

Merge tag '2014.2_b1' into debian/juno

Cinder juno-1 milestone (2014.2.b1)

Conflicts:
	cinder/locale/ar/LC_MESSAGES/cinder.po
	cinder/locale/bg_BG/LC_MESSAGES/cinder.po
	cinder/locale/bn_IN/LC_MESSAGES/cinder.po
	cinder/locale/bs/LC_MESSAGES/cinder.po
	cinder/locale/ca/LC_MESSAGES/cinder.po
	cinder/locale/cs/LC_MESSAGES/cinder.po
	cinder/locale/da/LC_MESSAGES/cinder.po
	cinder/locale/de/LC_MESSAGES/cinder.po
	cinder/locale/el/LC_MESSAGES/cinder.po
	cinder/locale/en_AU/LC_MESSAGES/cinder.po
	cinder/locale/en_GB/LC_MESSAGES/cinder.po
	cinder/locale/es/LC_MESSAGES/cinder.po
	cinder/locale/es_MX/LC_MESSAGES/cinder.po
	cinder/locale/eu/LC_MESSAGES/cinder.po
	cinder/locale/eu_ES/LC_MESSAGES/cinder.po
	cinder/locale/fa/LC_MESSAGES/cinder.po
	cinder/locale/fi_FI/LC_MESSAGES/cinder.po
	cinder/locale/fil/LC_MESSAGES/cinder.po
	cinder/locale/fr/LC_MESSAGES/cinder.po
	cinder/locale/gl/LC_MESSAGES/cinder.po
	cinder/locale/he/LC_MESSAGES/cinder.po
	cinder/locale/he_IL/LC_MESSAGES/cinder.po
	cinder/locale/hi/LC_MESSAGES/cinder.po
	cinder/locale/hr/LC_MESSAGES/cinder.po
	cinder/locale/hu/LC_MESSAGES/cinder.po
	cinder/locale/id/LC_MESSAGES/cinder.po
	cinder/locale/is_IS/LC_MESSAGES/cinder.po
	cinder/locale/it/LC_MESSAGES/cinder.po
	cinder/locale/it_IT/LC_MESSAGES/cinder.po
	cinder/locale/ja/LC_MESSAGES/cinder.po
	cinder/locale/ka_GE/LC_MESSAGES/cinder.po
	cinder/locale/km/LC_MESSAGES/cinder.po
	cinder/locale/kn/LC_MESSAGES/cinder.po
	cinder/locale/ko/LC_MESSAGES/cinder.po
	cinder/locale/ko_KR/LC_MESSAGES/cinder.po
	cinder/locale/ml_IN/LC_MESSAGES/cinder.po
	cinder/locale/mr_IN/LC_MESSAGES/cinder.po
	cinder/locale/ms/LC_MESSAGES/cinder.po
	cinder/locale/nb/LC_MESSAGES/cinder.po
	cinder/locale/ne/LC_MESSAGES/cinder.po
	cinder/locale/nl_NL/LC_MESSAGES/cinder.po
	cinder/locale/pa_IN/LC_MESSAGES/cinder.po
	cinder/locale/pl_PL/LC_MESSAGES/cinder.po
	cinder/locale/pt/LC_MESSAGES/cinder.po
	cinder/locale/pt_BR/LC_MESSAGES/cinder.po
	cinder/locale/ro/LC_MESSAGES/cinder.po
	cinder/locale/ru/LC_MESSAGES/cinder.po
	cinder/locale/ru_RU/LC_MESSAGES/cinder.po
	cinder/locale/sk/LC_MESSAGES/cinder.po
	cinder/locale/sl_SI/LC_MESSAGES/cinder.po
	cinder/locale/sr/LC_MESSAGES/cinder.po
	cinder/locale/sv/LC_MESSAGES/cinder.po
	cinder/locale/sw_KE/LC_MESSAGES/cinder.po
	cinder/locale/tl/LC_MESSAGES/cinder.po
	cinder/locale/tl_PH/LC_MESSAGES/cinder.po
	cinder/locale/tr/LC_MESSAGES/cinder.po
	cinder/locale/tr_TR/LC_MESSAGES/cinder.po
	cinder/locale/uk/LC_MESSAGES/cinder.po
	cinder/locale/ur/LC_MESSAGES/cinder.po
	cinder/locale/vi_VN/LC_MESSAGES/cinder.po
	cinder/locale/zh_CN/LC_MESSAGES/cinder.po
	cinder/locale/zh_HK/LC_MESSAGES/cinder.po
	cinder/locale/zh_TW/LC_MESSAGES/cinder.po
---

a956ca9a3c496a91f2e3e9ccffd60ca36e1c9539