{"action":"closed","number":36680,"pull_request":{"url":"https://api.github.com/repos/saltstack/salt/pulls/36680","id":87334102,"html_url":"https://github.com/saltstack/salt/pull/36680","diff_url":"https://github.com/saltstack/salt/pull/36680.diff","patch_url":"https://github.com/saltstack/salt/pull/36680.patch","issue_url":"https://api.github.com/repos/saltstack/salt/issues/36680","number":36680,"state":"closed","locked":false,"title":"[2016.3] Merge forward from 2015.8 to 2016.3","user":{"login":"rallytime","id":6547906,"avatar_url":"https://avatars.githubusercontent.com/u/6547906?v=3","gravatar_id":"","url":"https://api.github.com/users/rallytime","html_url":"https://github.com/rallytime","followers_url":"https://api.github.com/users/rallytime/followers","following_url":"https://api.github.com/users/rallytime/following{/other_user}","gists_url":"https://api.github.com/users/rallytime/gists{/gist_id}","starred_url":"https://api.github.com/users/rallytime/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rallytime/subscriptions","organizations_url":"https://api.github.com/users/rallytime/orgs","repos_url":"https://api.github.com/users/rallytime/repos","events_url":"https://api.github.com/users/rallytime/events{/privacy}","received_events_url":"https://api.github.com/users/rallytime/received_events","type":"User","site_admin":false},"body":"Conflicts:\r\n  - tests/integration/cli/grains.py\r\n  - tests/integration/files/file/base/issue-2068-template-str-no-dot.sls\r\n  - tests/integration/files/file/base/issue-2068-template-str.sls\r\n  - tests/integration/modules/pip.py","created_at":"2016-09-29T15:16:11Z","updated_at":"2016-09-29T16:49:16Z","closed_at":"2016-09-29T16:49:16Z","merged_at":"2016-09-29T16:49:16Z","merge_commit_sha":"f95dd696e56510eb8949c3ecc1a42b2a657f2b1d","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/saltstack/salt/pulls/36680/commits","review_comments_url":"https://api.github.com/repos/saltstack/salt/pulls/36680/comments","review_comment_url":"https://api.github.com/repos/saltstack/salt/pulls/comments{/number}","comments_url":"https://api.github.com/repos/saltstack/salt/issues/36680/comments","statuses_url":"https://api.github.com/repos/saltstack/salt/statuses/3e4ac617d33ec0e7d75bcad865fb6a67433ecbdc","head":{"label":"rallytime:merge-2016.3","ref":"merge-2016.3","sha":"3e4ac617d33ec0e7d75bcad865fb6a67433ecbdc","user":{"login":"rallytime","id":6547906,"avatar_url":"https://avatars.githubusercontent.com/u/6547906?v=3","gravatar_id":"","url":"https://api.github.com/users/rallytime","html_url":"https://github.com/rallytime","followers_url":"https://api.github.com/users/rallytime/followers","following_url":"https://api.github.com/users/rallytime/following{/other_user}","gists_url":"https://api.github.com/users/rallytime/gists{/gist_id}","starred_url":"https://api.github.com/users/rallytime/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rallytime/subscriptions","organizations_url":"https://api.github.com/users/rallytime/orgs","repos_url":"https://api.github.com/users/rallytime/repos","events_url":"https://api.github.com/users/rallytime/events{/privacy}","received_events_url":"https://api.github.com/users/rallytime/received_events","type":"User","site_admin":false},"repo":{"id":16396182,"name":"salt","full_name":"rallytime/salt","owner":{"login":"rallytime","id":6547906,"avatar_url":"https://avatars.githubusercontent.com/u/6547906?v=3","gravatar_id":"","url":"https://api.github.com/users/rallytime","html_url":"https://github.com/rallytime","followers_url":"https://api.github.com/users/rallytime/followers","following_url":"https://api.github.com/users/rallytime/following{/other_user}","gists_url":"https://api.github.com/users/rallytime/gists{/gist_id}","starred_url":"https://api.github.com/users/rallytime/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rallytime/subscriptions","organizations_url":"https://api.github.com/users/rallytime/orgs","repos_url":"https://api.github.com/users/rallytime/repos","events_url":"https://api.github.com/users/rallytime/events{/privacy}","received_events_url":"https://api.github.com/users/rallytime/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/rallytime/salt","description":"Central system and configuration manager ","fork":true,"url":"https://api.github.com/repos/rallytime/salt","forks_url":"https://api.github.com/repos/rallytime/salt/forks","keys_url":"https://api.github.com/repos/rallytime/salt/keys{/key_id}","collaborators_url":"https://api.github.com/repos/rallytime/salt/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/rallytime/salt/teams","hooks_url":"https://api.github.com/repos/rallytime/salt/hooks","issue_events_url":"https://api.github.com/repos/rallytime/salt/issues/events{/number}","events_url":"https://api.github.com/repos/rallytime/salt/events","assignees_url":"https://api.github.com/repos/rallytime/salt/assignees{/user}","branches_url":"https://api.github.com/repos/rallytime/salt/branches{/branch}","tags_url":"https://api.github.com/repos/rallytime/salt/tags","blobs_url":"https://api.github.com/repos/rallytime/salt/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/rallytime/salt/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/rallytime/salt/git/refs{/sha}","trees_url":"https://api.github.com/repos/rallytime/salt/git/trees{/sha}","statuses_url":"https://api.github.com/repos/rallytime/salt/statuses/{sha}","languages_url":"https://api.github.com/repos/rallytime/salt/languages","stargazers_url":"https://api.github.com/repos/rallytime/salt/stargazers","contributors_url":"https://api.github.com/repos/rallytime/salt/contributors","subscribers_url":"https://api.github.com/repos/rallytime/salt/subscribers","subscription_url":"https://api.github.com/repos/rallytime/salt/subscription","commits_url":"https://api.github.com/repos/rallytime/salt/commits{/sha}","git_commits_url":"https://api.github.com/repos/rallytime/salt/git/commits{/sha}","comments_url":"https://api.github.com/repos/rallytime/salt/comments{/number}","issue_comment_url":"https://api.github.com/repos/rallytime/salt/issues/comments{/number}","contents_url":"https://api.github.com/repos/rallytime/salt/contents/{+path}","compare_url":"https://api.github.com/repos/rallytime/salt/compare/{base}...{head}","merges_url":"https://api.github.com/repos/rallytime/salt/merges","archive_url":"https://api.github.com/repos/rallytime/salt/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/rallytime/salt/downloads","issues_url":"https://api.github.com/repos/rallytime/salt/issues{/number}","pulls_url":"https://api.github.com/repos/rallytime/salt/pulls{/number}","milestones_url":"https://api.github.com/repos/rallytime/salt/milestones{/number}","notifications_url":"https://api.github.com/repos/rallytime/salt/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/rallytime/salt/labels{/name}","releases_url":"https://api.github.com/repos/rallytime/salt/releases{/id}","deployments_url":"https://api.github.com/repos/rallytime/salt/deployments","created_at":"2014-01-31T00:54:22Z","updated_at":"2015-05-05T15:21:56Z","pushed_at":"2016-09-29T16:09:23Z","git_url":"git://github.com/rallytime/salt.git","ssh_url":"git@github.com:rallytime/salt.git","clone_url":"https://github.com/rallytime/salt.git","svn_url":"https://github.com/rallytime/salt","homepage":"saltstack.org","size":145105,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"saltstack:2016.3","ref":"2016.3","sha":"eab1680f3f54e22acefb3132b6e7116a53544f62","user":{"login":"saltstack","id":1147473,"avatar_url":"https://avatars.githubusercontent.com/u/1147473?v=3","gravatar_id":"","url":"https://api.github.com/users/saltstack","html_url":"https://github.com/saltstack","followers_url":"https://api.github.com/users/saltstack/followers","following_url":"https://api.github.com/users/saltstack/following{/other_user}","gists_url":"https://api.github.com/users/saltstack/gists{/gist_id}","starred_url":"https://api.github.com/users/saltstack/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/saltstack/subscriptions","organizations_url":"https://api.github.com/users/saltstack/orgs","repos_url":"https://api.github.com/users/saltstack/repos","events_url":"https://api.github.com/users/saltstack/events{/privacy}","received_events_url":"https://api.github.com/users/saltstack/received_events","type":"Organization","site_admin":false},"repo":{"id":1390248,"name":"salt","full_name":"saltstack/salt","owner":{"login":"saltstack","id":1147473,"avatar_url":"https://avatars.githubusercontent.com/u/1147473?v=3","gravatar_id":"","url":"https://api.github.com/users/saltstack","html_url":"https://github.com/saltstack","followers_url":"https://api.github.com/users/saltstack/followers","following_url":"https://api.github.com/users/saltstack/following{/other_user}","gists_url":"https://api.github.com/users/saltstack/gists{/gist_id}","starred_url":"https://api.github.com/users/saltstack/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/saltstack/subscriptions","organizations_url":"https://api.github.com/users/saltstack/orgs","repos_url":"https://api.github.com/users/saltstack/repos","events_url":"https://api.github.com/users/saltstack/events{/privacy}","received_events_url":"https://api.github.com/users/saltstack/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/saltstack/salt","description":"Software to automate the management and configuration of any infrastructure or application at scale. Get access to the Salt Open software package repository here: ","fork":false,"url":"https://api.github.com/repos/saltstack/salt","forks_url":"https://api.github.com/repos/saltstack/salt/forks","keys_url":"https://api.github.com/repos/saltstack/salt/keys{/key_id}","collaborators_url":"https://api.github.com/repos/saltstack/salt/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/saltstack/salt/teams","hooks_url":"https://api.github.com/repos/saltstack/salt/hooks","issue_events_url":"https://api.github.com/repos/saltstack/salt/issues/events{/number}","events_url":"https://api.github.com/repos/saltstack/salt/events","assignees_url":"https://api.github.com/repos/saltstack/salt/assignees{/user}","branches_url":"https://api.github.com/repos/saltstack/salt/branches{/branch}","tags_url":"https://api.github.com/repos/saltstack/salt/tags","blobs_url":"https://api.github.com/repos/saltstack/salt/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/saltstack/salt/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/saltstack/salt/git/refs{/sha}","trees_url":"https://api.github.com/repos/saltstack/salt/git/trees{/sha}","statuses_url":"https://api.github.com/repos/saltstack/salt/statuses/{sha}","languages_url":"https://api.github.com/repos/saltstack/salt/languages","stargazers_url":"https://api.github.com/repos/saltstack/salt/stargazers","contributors_url":"https://api.github.com/repos/saltstack/salt/contributors","subscribers_url":"https://api.github.com/repos/saltstack/salt/subscribers","subscription_url":"https://api.github.com/repos/saltstack/salt/subscription","commits_url":"https://api.github.com/repos/saltstack/salt/commits{/sha}","git_commits_url":"https://api.github.com/repos/saltstack/salt/git/commits{/sha}","comments_url":"https://api.github.com/repos/saltstack/salt/comments{/number}","issue_comment_url":"https://api.github.com/repos/saltstack/salt/issues/comments{/number}","contents_url":"https://api.github.com/repos/saltstack/salt/contents/{+path}","compare_url":"https://api.github.com/repos/saltstack/salt/compare/{base}...{head}","merges_url":"https://api.github.com/repos/saltstack/salt/merges","archive_url":"https://api.github.com/repos/saltstack/salt/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/saltstack/salt/downloads","issues_url":"https://api.github.com/repos/saltstack/salt/issues{/number}","pulls_url":"https://api.github.com/repos/saltstack/salt/pulls{/number}","milestones_url":"https://api.github.com/repos/saltstack/salt/milestones{/number}","notifications_url":"https://api.github.com/repos/saltstack/salt/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/saltstack/salt/labels{/name}","releases_url":"https://api.github.com/repos/saltstack/salt/releases{/id}","deployments_url":"https://api.github.com/repos/saltstack/salt/deployments","created_at":"2011-02-20T20:16:56Z","updated_at":"2016-09-29T14:18:51Z","pushed_at":"2016-09-29T16:49:16Z","git_url":"git://github.com/saltstack/salt.git","ssh_url":"git@github.com:saltstack/salt.git","clone_url":"https://github.com/saltstack/salt.git","svn_url":"https://github.com/saltstack/salt","homepage":"https://repo.saltstack.com/","size":225951,"stargazers_count":6918,"watchers_count":6918,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":3153,"mirror_url":null,"open_issues_count":3863,"forks":3153,"open_issues":3863,"watchers":6918,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/saltstack/salt/pulls/36680"},"html":{"href":"https://github.com/saltstack/salt/pull/36680"},"issue":{"href":"https://api.github.com/repos/saltstack/salt/issues/36680"},"comments":{"href":"https://api.github.com/repos/saltstack/salt/issues/36680/comments"},"review_comments":{"href":"https://api.github.com/repos/saltstack/salt/pulls/36680/comments"},"review_comment":{"href":"https://api.github.com/repos/saltstack/salt/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/saltstack/salt/pulls/36680/commits"},"statuses":{"href":"https://api.github.com/repos/saltstack/salt/statuses/3e4ac617d33ec0e7d75bcad865fb6a67433ecbdc"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"rallytime","id":6547906,"avatar_url":"https://avatars.githubusercontent.com/u/6547906?v=3","gravatar_id":"","url":"https://api.github.com/users/rallytime","html_url":"https://github.com/rallytime","followers_url":"https://api.github.com/users/rallytime/followers","following_url":"https://api.github.com/users/rallytime/following{/other_user}","gists_url":"https://api.github.com/users/rallytime/gists{/gist_id}","starred_url":"https://api.github.com/users/rallytime/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rallytime/subscriptions","organizations_url":"https://api.github.com/users/rallytime/orgs","repos_url":"https://api.github.com/users/rallytime/repos","events_url":"https://api.github.com/users/rallytime/events{/privacy}","received_events_url":"https://api.github.com/users/rallytime/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":11,"additions":46,"deletions":68,"changed_files":6}}
{"actor":{"display_login":"rallytime"}}