{"action":"opened","number":21435,"pull_request":{"url":"https://api.github.com/repos/saltstack/salt/pulls/21435","id":30783684,"html_url":"https://github.com/saltstack/salt/pull/21435","diff_url":"https://github.com/saltstack/salt/pull/21435.diff","patch_url":"https://github.com/saltstack/salt/pull/21435.patch","issue_url":"https://api.github.com/repos/saltstack/salt/issues/21435","number":21435,"state":"open","locked":false,"title":"Merge forward from 2014.7 to 2015.2","user":{"login":"basepi","id":702318,"avatar_url":"https://avatars.githubusercontent.com/u/702318?v=3","gravatar_id":"","url":"https://api.github.com/users/basepi","html_url":"https://github.com/basepi","followers_url":"https://api.github.com/users/basepi/followers","following_url":"https://api.github.com/users/basepi/following{/other_user}","gists_url":"https://api.github.com/users/basepi/gists{/gist_id}","starred_url":"https://api.github.com/users/basepi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/basepi/subscriptions","organizations_url":"https://api.github.com/users/basepi/orgs","repos_url":"https://api.github.com/users/basepi/repos","events_url":"https://api.github.com/users/basepi/events{/privacy}","received_events_url":"https://api.github.com/users/basepi/received_events","type":"User","site_admin":false},"body":"Merge forward from 2014.7 to 2015.2\r\n\r\n```\r\nConflicts:\r\n\tsalt/modules/debian_ip.py\r\n\tsalt/modules/file.py\r\n\tsalt/states/ssh_auth.py\r\n\tsalt/utils/cloud.py\r\n```\r\n\r\nKeep an eye out particularly for `file.replace` test failures. That was the hairiest conflict.\r\n\r\n@lorengordon if you could look at this I would much appreciate it. Your changes to `file.replace` on 2014.7 and 2015.2 conflicted fairly heavily. If you could verify that the merge conflict was handled properly I would very much appreciate it.","created_at":"2015-03-09T17:52:14Z","updated_at":"2015-03-09T17:52:14Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/saltstack/salt/pulls/21435/commits","review_comments_url":"https://api.github.com/repos/saltstack/salt/pulls/21435/comments","review_comment_url":"https://api.github.com/repos/saltstack/salt/pulls/comments{/number}","comments_url":"https://api.github.com/repos/saltstack/salt/issues/21435/comments","statuses_url":"https://api.github.com/repos/saltstack/salt/statuses/8c1fa5358e07959aea4bc4876d77d15bc50c4595","head":{"label":"basepi:merge-forward-2015.2","ref":"merge-forward-2015.2","sha":"8c1fa5358e07959aea4bc4876d77d15bc50c4595","user":{"login":"basepi","id":702318,"avatar_url":"https://avatars.githubusercontent.com/u/702318?v=3","gravatar_id":"","url":"https://api.github.com/users/basepi","html_url":"https://github.com/basepi","followers_url":"https://api.github.com/users/basepi/followers","following_url":"https://api.github.com/users/basepi/following{/other_user}","gists_url":"https://api.github.com/users/basepi/gists{/gist_id}","starred_url":"https://api.github.com/users/basepi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/basepi/subscriptions","organizations_url":"https://api.github.com/users/basepi/orgs","repos_url":"https://api.github.com/users/basepi/repos","events_url":"https://api.github.com/users/basepi/events{/privacy}","received_events_url":"https://api.github.com/users/basepi/received_events","type":"User","site_admin":false},"repo":{"id":7823385,"name":"salt","full_name":"basepi/salt","owner":{"login":"basepi","id":702318,"avatar_url":"https://avatars.githubusercontent.com/u/702318?v=3","gravatar_id":"","url":"https://api.github.com/users/basepi","html_url":"https://github.com/basepi","followers_url":"https://api.github.com/users/basepi/followers","following_url":"https://api.github.com/users/basepi/following{/other_user}","gists_url":"https://api.github.com/users/basepi/gists{/gist_id}","starred_url":"https://api.github.com/users/basepi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/basepi/subscriptions","organizations_url":"https://api.github.com/users/basepi/orgs","repos_url":"https://api.github.com/users/basepi/repos","events_url":"https://api.github.com/users/basepi/events{/privacy}","received_events_url":"https://api.github.com/users/basepi/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/basepi/salt","description":"Central system and configuration manager ","fork":true,"url":"https://api.github.com/repos/basepi/salt","forks_url":"https://api.github.com/repos/basepi/salt/forks","keys_url":"https://api.github.com/repos/basepi/salt/keys{/key_id}","collaborators_url":"https://api.github.com/repos/basepi/salt/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/basepi/salt/teams","hooks_url":"https://api.github.com/repos/basepi/salt/hooks","issue_events_url":"https://api.github.com/repos/basepi/salt/issues/events{/number}","events_url":"https://api.github.com/repos/basepi/salt/events","assignees_url":"https://api.github.com/repos/basepi/salt/assignees{/user}","branches_url":"https://api.github.com/repos/basepi/salt/branches{/branch}","tags_url":"https://api.github.com/repos/basepi/salt/tags","blobs_url":"https://api.github.com/repos/basepi/salt/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/basepi/salt/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/basepi/salt/git/refs{/sha}","trees_url":"https://api.github.com/repos/basepi/salt/git/trees{/sha}","statuses_url":"https://api.github.com/repos/basepi/salt/statuses/{sha}","languages_url":"https://api.github.com/repos/basepi/salt/languages","stargazers_url":"https://api.github.com/repos/basepi/salt/stargazers","contributors_url":"https://api.github.com/repos/basepi/salt/contributors","subscribers_url":"https://api.github.com/repos/basepi/salt/subscribers","subscription_url":"https://api.github.com/repos/basepi/salt/subscription","commits_url":"https://api.github.com/repos/basepi/salt/commits{/sha}","git_commits_url":"https://api.github.com/repos/basepi/salt/git/commits{/sha}","comments_url":"https://api.github.com/repos/basepi/salt/comments{/number}","issue_comment_url":"https://api.github.com/repos/basepi/salt/issues/comments{/number}","contents_url":"https://api.github.com/repos/basepi/salt/contents/{+path}","compare_url":"https://api.github.com/repos/basepi/salt/compare/{base}...{head}","merges_url":"https://api.github.com/repos/basepi/salt/merges","archive_url":"https://api.github.com/repos/basepi/salt/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/basepi/salt/downloads","issues_url":"https://api.github.com/repos/basepi/salt/issues{/number}","pulls_url":"https://api.github.com/repos/basepi/salt/pulls{/number}","milestones_url":"https://api.github.com/repos/basepi/salt/milestones{/number}","notifications_url":"https://api.github.com/repos/basepi/salt/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/basepi/salt/labels{/name}","releases_url":"https://api.github.com/repos/basepi/salt/releases{/id}","created_at":"2013-01-25T16:06:11Z","updated_at":"2015-01-06T20:26:47Z","pushed_at":"2015-03-09T17:50:28Z","git_url":"git://github.com/basepi/salt.git","ssh_url":"git@github.com:basepi/salt.git","clone_url":"https://github.com/basepi/salt.git","svn_url":"https://github.com/basepi/salt","homepage":"saltstack.org","size":87424,"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:2015.2","ref":"2015.2","sha":"5fee4a2d10d9cced922bd9e3fe46dbe01af0248b","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":"Infrastructure automation and management system","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}","created_at":"2011-02-20T20:16:56Z","updated_at":"2015-03-09T17:16:10Z","pushed_at":"2015-03-09T17:50:57Z","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":"saltstack.com","size":190333,"stargazers_count":4800,"watchers_count":4800,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1995,"mirror_url":null,"open_issues_count":2369,"forks":1995,"open_issues":2369,"watchers":4800,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/saltstack/salt/pulls/21435"},"html":{"href":"https://github.com/saltstack/salt/pull/21435"},"issue":{"href":"https://api.github.com/repos/saltstack/salt/issues/21435"},"comments":{"href":"https://api.github.com/repos/saltstack/salt/issues/21435/comments"},"review_comments":{"href":"https://api.github.com/repos/saltstack/salt/pulls/21435/comments"},"review_comment":{"href":"https://api.github.com/repos/saltstack/salt/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/saltstack/salt/pulls/21435/commits"},"statuses":{"href":"https://api.github.com/repos/saltstack/salt/statuses/8c1fa5358e07959aea4bc4876d77d15bc50c4595"}},"merged":false,"mergeable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"commits":57,"additions":369,"deletions":224,"changed_files":20}}