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
..
views	Remove tenant_safe flag from rpc and db api	2016-08-16 12:38:33 +05:30
__init__.py	Add stack files retrieval API	2016-07-11 18:02:59 +01:00
actions.py	Fix [H405] pep rule in heat/api	2015-09-24 16:22:25 +03:00
build_info.py	Fix [H405] pep rule in heat/api	2015-09-24 16:22:25 +03:00
events.py	Implement event list nested-depth	2016-06-14 13:39:38 +12:00
resources.py	Fix for resource search with invalid filter keys	2016-03-08 09:30:19 +05:30
services.py	Fix [H405] pep rule in heat/api	2015-09-24 16:22:25 +03:00
software_configs.py	Remove tenant_safe flag from rpc and db api	2016-08-16 12:38:33 +05:30
software_deployments.py	ReST API: Use constants in get_allowed_params whitelists	2016-01-22 12:34:36 -05:00
stacks.py	Ignore merged env if environment files are specified	2016-11-02 09:16:58 +05:30
util.py	Authorize super admin actions on all projects	2016-06-14 22:16:25 +05:30