{"action":"created","issue":{"url":"https://api.github.com/repos/saltstack/salt/issues/18429","repository_url":"https://api.github.com/repos/saltstack/salt","labels_url":"https://api.github.com/repos/saltstack/salt/issues/18429/labels{/name}","comments_url":"https://api.github.com/repos/saltstack/salt/issues/18429/comments","events_url":"https://api.github.com/repos/saltstack/salt/issues/18429/events","html_url":"https://github.com/saltstack/salt/issues/18429","id":49875085,"number":18429,"title":"Pillars passed from command-line override pillar subtrees instead of merging","user":{"login":"somenick","id":901852,"avatar_url":"https://avatars.githubusercontent.com/u/901852?v=3","gravatar_id":"","url":"https://api.github.com/users/somenick","html_url":"https://github.com/somenick","followers_url":"https://api.github.com/users/somenick/followers","following_url":"https://api.github.com/users/somenick/following{/other_user}","gists_url":"https://api.github.com/users/somenick/gists{/gist_id}","starred_url":"https://api.github.com/users/somenick/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/somenick/subscriptions","organizations_url":"https://api.github.com/users/somenick/orgs","repos_url":"https://api.github.com/users/somenick/repos","events_url":"https://api.github.com/users/somenick/events{/privacy}","received_events_url":"https://api.github.com/users/somenick/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/saltstack/salt/labels/Bug","name":"Bug","color":"e11d21"},{"url":"https://api.github.com/repos/saltstack/salt/labels/Core","name":"Core","color":"fef2c0"},{"url":"https://api.github.com/repos/saltstack/salt/labels/Fixed%20Pending%20Verification","name":"Fixed Pending Verification","color":"d4c5f9"},{"url":"https://api.github.com/repos/saltstack/salt/labels/High%20Severity","name":"High Severity","color":"ff9143"},{"url":"https://api.github.com/repos/saltstack/salt/labels/P3","name":"P3","color":"0a3d77"},{"url":"https://api.github.com/repos/saltstack/salt/labels/Pillar","name":"Pillar","color":"006b75"},{"url":"https://api.github.com/repos/saltstack/salt/labels/TEAM%20Core","name":"TEAM Core","color":"A9A9A9"},{"url":"https://api.github.com/repos/saltstack/salt/labels/ZD","name":"ZD","color":"e11d21"}],"state":"closed","locked":false,"assignee":{"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},"milestone":{"url":"https://api.github.com/repos/saltstack/salt/milestones/78","html_url":"https://github.com/saltstack/salt/milestones/B%20-1","labels_url":"https://api.github.com/repos/saltstack/salt/milestones/78/labels","id":1637585,"number":78,"title":"B -1","description":"","creator":{"login":"meggiebot","id":12242451,"avatar_url":"https://avatars.githubusercontent.com/u/12242451?v=3","gravatar_id":"","url":"https://api.github.com/users/meggiebot","html_url":"https://github.com/meggiebot","followers_url":"https://api.github.com/users/meggiebot/followers","following_url":"https://api.github.com/users/meggiebot/following{/other_user}","gists_url":"https://api.github.com/users/meggiebot/gists{/gist_id}","starred_url":"https://api.github.com/users/meggiebot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/meggiebot/subscriptions","organizations_url":"https://api.github.com/users/meggiebot/orgs","repos_url":"https://api.github.com/users/meggiebot/repos","events_url":"https://api.github.com/users/meggiebot/events{/privacy}","received_events_url":"https://api.github.com/users/meggiebot/received_events","type":"User","site_admin":false},"open_issues":0,"closed_issues":18,"state":"open","created_at":"2016-03-10T21:14:26Z","updated_at":"2016-05-05T15:26:28Z","due_on":"2016-04-11T06:00:00Z","closed_at":null},"comments":12,"created_at":"2014-11-24T10:31:42Z","updated_at":"2016-05-19T07:22:15Z","closed_at":"2016-04-06T23:33:03Z","body":"assuming a pillar containing:\r\n\r\n```\r\nsettings:\r\n  foo: 1\r\n  buzz: 2\r\n```\r\n\r\nThe following will result in the pillar 'settings:buzz' being undefined, whereas I'd expect it to be left intact and only the specific key to be overridden, or at least the pillar_source_merging_strategy to apply here as well:\r\n\r\n    salt '*' state.sls some.state pillar='{\"settings\":{\"foo\":\"a\"}}'\r\n\r\n\r\n\r\nI believe the culprit is a line in: salt/state.py:State._gather_pillar():\r\n\r\n    ret.update(self._pillar_override)\r\n\r\nwhich should be using Pillar.merge_sources() instead, in order to apply the pillar merge policy"},"comment":{"url":"https://api.github.com/repos/saltstack/salt/issues/comments/220246849","html_url":"https://github.com/saltstack/salt/issues/18429#issuecomment-220246849","issue_url":"https://api.github.com/repos/saltstack/salt/issues/18429","id":220246849,"user":{"login":"evan-ty","id":19182292,"avatar_url":"https://avatars.githubusercontent.com/u/19182292?v=3","gravatar_id":"","url":"https://api.github.com/users/evan-ty","html_url":"https://github.com/evan-ty","followers_url":"https://api.github.com/users/evan-ty/followers","following_url":"https://api.github.com/users/evan-ty/following{/other_user}","gists_url":"https://api.github.com/users/evan-ty/gists{/gist_id}","starred_url":"https://api.github.com/users/evan-ty/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/evan-ty/subscriptions","organizations_url":"https://api.github.com/users/evan-ty/orgs","repos_url":"https://api.github.com/users/evan-ty/repos","events_url":"https://api.github.com/users/evan-ty/events{/privacy}","received_events_url":"https://api.github.com/users/evan-ty/received_events","type":"User","site_admin":false},"created_at":"2016-05-19T07:22:15Z","updated_at":"2016-05-19T07:22:15Z","body":"I don't know if this is related, but I have troubles setting pillar values on the command line:\r\n\r\nrelated .sls snippet from /srv/salt:\r\nhttps://paste.debian.net/687178/\r\n\r\ninput via command line and it's output:\r\nhttps://paste.debian.net/687179/\r\n\r\nAs you can see, I want \"rev\" to change depending on what I pass it, and it keeps showing \"None\"\r\n"}}