{"action":"closed","number":23990,"pull_request":{"url":"https://api.github.com/repos/saltstack/salt/pulls/23990","id":35858959,"html_url":"https://github.com/saltstack/salt/pull/23990","diff_url":"https://github.com/saltstack/salt/pull/23990.diff","patch_url":"https://github.com/saltstack/salt/pull/23990.patch","issue_url":"https://api.github.com/repos/saltstack/salt/issues/23990","number":23990,"state":"closed","locked":false,"title":"Merge forward from 2015.5 to develop","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 2015.5 to develop\r\n\r\n```\r\nConflicts:\r\n    salt/cloud/clouds/digital_ocean_v2.py\r\n    salt/modules/tls.py\r\n```","created_at":"2015-05-20T18:00:29Z","updated_at":"2015-05-20T19:58:23Z","closed_at":"2015-05-20T19:58:23Z","merged_at":"2015-05-20T19:58:23Z","merge_commit_sha":"7851724363ed2da661ded15356ef3318377b95c7","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/saltstack/salt/pulls/23990/commits","review_comments_url":"https://api.github.com/repos/saltstack/salt/pulls/23990/comments","review_comment_url":"https://api.github.com/repos/saltstack/salt/pulls/comments{/number}","comments_url":"https://api.github.com/repos/saltstack/salt/issues/23990/comments","statuses_url":"https://api.github.com/repos/saltstack/salt/statuses/9dbafcc051b2d83629a73ee2e41e125152566a7a","head":{"label":"basepi:merge-forward-develop","ref":"merge-forward-develop","sha":"9dbafcc051b2d83629a73ee2e41e125152566a7a","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-04-16T23:51:44Z","pushed_at":"2015-05-20T18:00:08Z","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":110233,"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:develop","ref":"develop","sha":"23211d2abae6c339785ca5e6d3f249fabe0e8b03","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-05-20T19:42:42Z","pushed_at":"2015-05-20T19:58:24Z","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":236055,"stargazers_count":5162,"watchers_count":5162,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2163,"mirror_url":null,"open_issues_count":2598,"forks":2163,"open_issues":2598,"watchers":5162,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/saltstack/salt/pulls/23990"},"html":{"href":"https://github.com/saltstack/salt/pull/23990"},"issue":{"href":"https://api.github.com/repos/saltstack/salt/issues/23990"},"comments":{"href":"https://api.github.com/repos/saltstack/salt/issues/23990/comments"},"review_comments":{"href":"https://api.github.com/repos/saltstack/salt/pulls/23990/comments"},"review_comment":{"href":"https://api.github.com/repos/saltstack/salt/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/saltstack/salt/pulls/23990/commits"},"statuses":{"href":"https://api.github.com/repos/saltstack/salt/statuses/9dbafcc051b2d83629a73ee2e41e125152566a7a"}},"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":41,"additions":1799,"deletions":205,"changed_files":13}}