Comment 6 for bug 1635409

Reviewed: https://review.openstack.org/390064
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=2407c8643689042f1ab9cd582af477bdc3a9860f
Submitter: Jenkins
Branch: master

commit 2407c8643689042f1ab9cd582af477bdc3a9860f
Author: rabi <email address hidden>
Date: Wed Nov 2 08:41:54 2016 +0530

    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