{"action":"created","issue":{"url":"https://api.github.com/repos/saltstack/salt/issues/35822","repository_url":"https://api.github.com/repos/saltstack/salt","labels_url":"https://api.github.com/repos/saltstack/salt/issues/35822/labels{/name}","comments_url":"https://api.github.com/repos/saltstack/salt/issues/35822/comments","events_url":"https://api.github.com/repos/saltstack/salt/issues/35822/events","html_url":"https://github.com/saltstack/salt/pull/35822","id":173545089,"number":35822,"title":"Fixes for top file merging","user":{"login":"terminalmage","id":328598,"avatar_url":"https://avatars.githubusercontent.com/u/328598?v=3","gravatar_id":"","url":"https://api.github.com/users/terminalmage","html_url":"https://github.com/terminalmage","followers_url":"https://api.github.com/users/terminalmage/followers","following_url":"https://api.github.com/users/terminalmage/following{/other_user}","gists_url":"https://api.github.com/users/terminalmage/gists{/gist_id}","starred_url":"https://api.github.com/users/terminalmage/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/terminalmage/subscriptions","organizations_url":"https://api.github.com/users/terminalmage/orgs","repos_url":"https://api.github.com/users/terminalmage/repos","events_url":"https://api.github.com/users/terminalmage/events{/privacy}","received_events_url":"https://api.github.com/users/terminalmage/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2016-08-26T21:14:49Z","updated_at":"2016-08-27T20:20:20Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/saltstack/salt/pulls/35822","html_url":"https://github.com/saltstack/salt/pull/35822","diff_url":"https://github.com/saltstack/salt/pull/35822.diff","patch_url":"https://github.com/saltstack/salt/pull/35822.patch"},"body":"This fixes the following incorrect logic in top file merging:\r\n\r\n- Use of sets in ``_get_envs()``, which interferes with the ``env_order`` config option\r\n\r\n- Incorrect logic in ``merge_tops()`` which ignores identical targets for the same environment in multiple top files (and also uses a set, which again interferes with SLS ordering).\r\n\r\nA new merging strategy (``merge_all``) has been added, which incorporates all SLS targets from all environments in all top files.\r\n\r\nIt also renames the default merge strategy from ``merge`` to ``default`` (while deprecating ``merge``), both to reflect the fact that the default merge strategy does not do a true merge, and to distinguish it from ``merge_all``.\r\n\r\nThe unit tests for top file merging have been completely rewritten, and include new tests for ``merge_all`` as well as previously uncovered config params such as ``state_top_saltenv``.\r\n\r\nResolves #35045."},"comment":{"url":"https://api.github.com/repos/saltstack/salt/issues/comments/242938623","html_url":"https://github.com/saltstack/salt/pull/35822#issuecomment-242938623","issue_url":"https://api.github.com/repos/saltstack/salt/issues/35822","id":242938623,"user":{"login":"terminalmage","id":328598,"avatar_url":"https://avatars.githubusercontent.com/u/328598?v=3","gravatar_id":"","url":"https://api.github.com/users/terminalmage","html_url":"https://github.com/terminalmage","followers_url":"https://api.github.com/users/terminalmage/followers","following_url":"https://api.github.com/users/terminalmage/following{/other_user}","gists_url":"https://api.github.com/users/terminalmage/gists{/gist_id}","starred_url":"https://api.github.com/users/terminalmage/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/terminalmage/subscriptions","organizations_url":"https://api.github.com/users/terminalmage/orgs","repos_url":"https://api.github.com/users/terminalmage/repos","events_url":"https://api.github.com/users/terminalmage/events{/privacy}","received_events_url":"https://api.github.com/users/terminalmage/received_events","type":"User","site_admin":false},"created_at":"2016-08-27T20:20:20Z","updated_at":"2016-08-27T20:20:20Z","body":"This has been rebased and the docs updated with information on the ``merge_all`` strategy. Pending review/tests, it is ready for merging."}}
{"actor":{"display_login":"terminalmage"}}