rabi 2407c86436 Ignore merged env if environment files are specified ... Ignore merged environment from the client, if there are 'environment_files' in the request for merging in the server. This would avoid the duplicates when 'parameter_merge_strategies' are specified in the first env file. Change-Id: I4ee274d69e42a47c4b8fd5a25567fb2eb144a8cc Related-Bug: #1635409		2016-11-02 09:16:58 +05:30
..
aws	Config: no need to set default=None	2016-06-28 15:25:15 +08:00
cfn	Remove unnecessary checks	2016-07-12 14:46:03 +03:00
cloudwatch	Get rid of gratuitous use of six.iterkeys()	2016-06-07 03:50:49 +00:00
middleware	Get rid of Parameters._validate_template_parameters()	2016-06-03 15:42:43 -04:00
openstack	Ignore merged env if environment files are specified	2016-11-02 09:16:58 +05:30
__init__.py	Empty files shouldn't contain copyright nor license	2013-12-24 20:29:31 +08:00
versions.py	Remove identical modules versions.py	2015-06-16 17:00:39 +03:00