{"action":"closed","number":608,"pull_request":{"url":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/608","id":37417789,"html_url":"https://github.com/puppetlabs/puppet-server/pull/608","diff_url":"https://github.com/puppetlabs/puppet-server/pull/608.diff","patch_url":"https://github.com/puppetlabs/puppet-server/pull/608.patch","issue_url":"https://api.github.com/repos/puppetlabs/puppet-server/issues/608","number":608,"state":"closed","locked":false,"title":"(maint) Merge up stable into master","user":{"login":"jeffmccune","id":8972,"avatar_url":"https://avatars.githubusercontent.com/u/8972?v=3","gravatar_id":"","url":"https://api.github.com/users/jeffmccune","html_url":"https://github.com/jeffmccune","followers_url":"https://api.github.com/users/jeffmccune/followers","following_url":"https://api.github.com/users/jeffmccune/following{/other_user}","gists_url":"https://api.github.com/users/jeffmccune/gists{/gist_id}","starred_url":"https://api.github.com/users/jeffmccune/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jeffmccune/subscriptions","organizations_url":"https://api.github.com/users/jeffmccune/orgs","repos_url":"https://api.github.com/users/jeffmccune/repos","events_url":"https://api.github.com/users/jeffmccune/events{/privacy}","received_events_url":"https://api.github.com/users/jeffmccune/received_events","type":"User","site_admin":false},"body":"Ugh...  More conflicts than I'd like.  I really wish I started SERVER-297 on\nthe stable branch rather than the master so we didn't have to cherry-pick back\nthen merge it right back up.","created_at":"2015-06-11T00:07:12Z","updated_at":"2015-06-11T00:20:30Z","closed_at":"2015-06-11T00:20:30Z","merged_at":null,"merge_commit_sha":"ed8e7c1272d702848ec6752ccdaffd32a217fa11","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/608/commits","review_comments_url":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/608/comments","review_comment_url":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/comments{/number}","comments_url":"https://api.github.com/repos/puppetlabs/puppet-server/issues/608/comments","statuses_url":"https://api.github.com/repos/puppetlabs/puppet-server/statuses/374bdfe88c6c34dd1327421b51540ca4703da123","head":{"label":"jeffmccune:maint/master/merge_up_stable","ref":"maint/master/merge_up_stable","sha":"374bdfe88c6c34dd1327421b51540ca4703da123","user":{"login":"jeffmccune","id":8972,"avatar_url":"https://avatars.githubusercontent.com/u/8972?v=3","gravatar_id":"","url":"https://api.github.com/users/jeffmccune","html_url":"https://github.com/jeffmccune","followers_url":"https://api.github.com/users/jeffmccune/followers","following_url":"https://api.github.com/users/jeffmccune/following{/other_user}","gists_url":"https://api.github.com/users/jeffmccune/gists{/gist_id}","starred_url":"https://api.github.com/users/jeffmccune/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jeffmccune/subscriptions","organizations_url":"https://api.github.com/users/jeffmccune/orgs","repos_url":"https://api.github.com/users/jeffmccune/repos","events_url":"https://api.github.com/users/jeffmccune/events{/privacy}","received_events_url":"https://api.github.com/users/jeffmccune/received_events","type":"User","site_admin":false},"repo":{"id":26023101,"name":"puppet-server","full_name":"jeffmccune/puppet-server","owner":{"login":"jeffmccune","id":8972,"avatar_url":"https://avatars.githubusercontent.com/u/8972?v=3","gravatar_id":"","url":"https://api.github.com/users/jeffmccune","html_url":"https://github.com/jeffmccune","followers_url":"https://api.github.com/users/jeffmccune/followers","following_url":"https://api.github.com/users/jeffmccune/following{/other_user}","gists_url":"https://api.github.com/users/jeffmccune/gists{/gist_id}","starred_url":"https://api.github.com/users/jeffmccune/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jeffmccune/subscriptions","organizations_url":"https://api.github.com/users/jeffmccune/orgs","repos_url":"https://api.github.com/users/jeffmccune/repos","events_url":"https://api.github.com/users/jeffmccune/events{/privacy}","received_events_url":"https://api.github.com/users/jeffmccune/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jeffmccune/puppet-server","description":"Server automation framework and application","fork":true,"url":"https://api.github.com/repos/jeffmccune/puppet-server","forks_url":"https://api.github.com/repos/jeffmccune/puppet-server/forks","keys_url":"https://api.github.com/repos/jeffmccune/puppet-server/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jeffmccune/puppet-server/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jeffmccune/puppet-server/teams","hooks_url":"https://api.github.com/repos/jeffmccune/puppet-server/hooks","issue_events_url":"https://api.github.com/repos/jeffmccune/puppet-server/issues/events{/number}","events_url":"https://api.github.com/repos/jeffmccune/puppet-server/events","assignees_url":"https://api.github.com/repos/jeffmccune/puppet-server/assignees{/user}","branches_url":"https://api.github.com/repos/jeffmccune/puppet-server/branches{/branch}","tags_url":"https://api.github.com/repos/jeffmccune/puppet-server/tags","blobs_url":"https://api.github.com/repos/jeffmccune/puppet-server/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jeffmccune/puppet-server/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jeffmccune/puppet-server/git/refs{/sha}","trees_url":"https://api.github.com/repos/jeffmccune/puppet-server/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jeffmccune/puppet-server/statuses/{sha}","languages_url":"https://api.github.com/repos/jeffmccune/puppet-server/languages","stargazers_url":"https://api.github.com/repos/jeffmccune/puppet-server/stargazers","contributors_url":"https://api.github.com/repos/jeffmccune/puppet-server/contributors","subscribers_url":"https://api.github.com/repos/jeffmccune/puppet-server/subscribers","subscription_url":"https://api.github.com/repos/jeffmccune/puppet-server/subscription","commits_url":"https://api.github.com/repos/jeffmccune/puppet-server/commits{/sha}","git_commits_url":"https://api.github.com/repos/jeffmccune/puppet-server/git/commits{/sha}","comments_url":"https://api.github.com/repos/jeffmccune/puppet-server/comments{/number}","issue_comment_url":"https://api.github.com/repos/jeffmccune/puppet-server/issues/comments{/number}","contents_url":"https://api.github.com/repos/jeffmccune/puppet-server/contents/{+path}","compare_url":"https://api.github.com/repos/jeffmccune/puppet-server/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jeffmccune/puppet-server/merges","archive_url":"https://api.github.com/repos/jeffmccune/puppet-server/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jeffmccune/puppet-server/downloads","issues_url":"https://api.github.com/repos/jeffmccune/puppet-server/issues{/number}","pulls_url":"https://api.github.com/repos/jeffmccune/puppet-server/pulls{/number}","milestones_url":"https://api.github.com/repos/jeffmccune/puppet-server/milestones{/number}","notifications_url":"https://api.github.com/repos/jeffmccune/puppet-server/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jeffmccune/puppet-server/labels{/name}","releases_url":"https://api.github.com/repos/jeffmccune/puppet-server/releases{/id}","created_at":"2014-10-31T16:07:28Z","updated_at":"2015-04-28T20:13:30Z","pushed_at":"2015-06-11T00:17:57Z","git_url":"git://github.com/jeffmccune/puppet-server.git","ssh_url":"git@github.com:jeffmccune/puppet-server.git","clone_url":"https://github.com/jeffmccune/puppet-server.git","svn_url":"https://github.com/jeffmccune/puppet-server","homepage":"https://tickets.puppetlabs.com/browse/SERVER","size":3299,"stargazers_count":0,"watchers_count":0,"language":"Clojure","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":"master"}},"base":{"label":"puppetlabs:master","ref":"master","sha":"9cd24da6e7454d4273cd950f1fda5b3a6f0b4dc9","user":{"login":"puppetlabs","id":234268,"avatar_url":"https://avatars.githubusercontent.com/u/234268?v=3","gravatar_id":"","url":"https://api.github.com/users/puppetlabs","html_url":"https://github.com/puppetlabs","followers_url":"https://api.github.com/users/puppetlabs/followers","following_url":"https://api.github.com/users/puppetlabs/following{/other_user}","gists_url":"https://api.github.com/users/puppetlabs/gists{/gist_id}","starred_url":"https://api.github.com/users/puppetlabs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/puppetlabs/subscriptions","organizations_url":"https://api.github.com/users/puppetlabs/orgs","repos_url":"https://api.github.com/users/puppetlabs/repos","events_url":"https://api.github.com/users/puppetlabs/events{/privacy}","received_events_url":"https://api.github.com/users/puppetlabs/received_events","type":"Organization","site_admin":false},"repo":{"id":19546488,"name":"puppet-server","full_name":"puppetlabs/puppet-server","owner":{"login":"puppetlabs","id":234268,"avatar_url":"https://avatars.githubusercontent.com/u/234268?v=3","gravatar_id":"","url":"https://api.github.com/users/puppetlabs","html_url":"https://github.com/puppetlabs","followers_url":"https://api.github.com/users/puppetlabs/followers","following_url":"https://api.github.com/users/puppetlabs/following{/other_user}","gists_url":"https://api.github.com/users/puppetlabs/gists{/gist_id}","starred_url":"https://api.github.com/users/puppetlabs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/puppetlabs/subscriptions","organizations_url":"https://api.github.com/users/puppetlabs/orgs","repos_url":"https://api.github.com/users/puppetlabs/repos","events_url":"https://api.github.com/users/puppetlabs/events{/privacy}","received_events_url":"https://api.github.com/users/puppetlabs/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/puppetlabs/puppet-server","description":"Server automation framework and application","fork":false,"url":"https://api.github.com/repos/puppetlabs/puppet-server","forks_url":"https://api.github.com/repos/puppetlabs/puppet-server/forks","keys_url":"https://api.github.com/repos/puppetlabs/puppet-server/keys{/key_id}","collaborators_url":"https://api.github.com/repos/puppetlabs/puppet-server/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/puppetlabs/puppet-server/teams","hooks_url":"https://api.github.com/repos/puppetlabs/puppet-server/hooks","issue_events_url":"https://api.github.com/repos/puppetlabs/puppet-server/issues/events{/number}","events_url":"https://api.github.com/repos/puppetlabs/puppet-server/events","assignees_url":"https://api.github.com/repos/puppetlabs/puppet-server/assignees{/user}","branches_url":"https://api.github.com/repos/puppetlabs/puppet-server/branches{/branch}","tags_url":"https://api.github.com/repos/puppetlabs/puppet-server/tags","blobs_url":"https://api.github.com/repos/puppetlabs/puppet-server/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/puppetlabs/puppet-server/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/puppetlabs/puppet-server/git/refs{/sha}","trees_url":"https://api.github.com/repos/puppetlabs/puppet-server/git/trees{/sha}","statuses_url":"https://api.github.com/repos/puppetlabs/puppet-server/statuses/{sha}","languages_url":"https://api.github.com/repos/puppetlabs/puppet-server/languages","stargazers_url":"https://api.github.com/repos/puppetlabs/puppet-server/stargazers","contributors_url":"https://api.github.com/repos/puppetlabs/puppet-server/contributors","subscribers_url":"https://api.github.com/repos/puppetlabs/puppet-server/subscribers","subscription_url":"https://api.github.com/repos/puppetlabs/puppet-server/subscription","commits_url":"https://api.github.com/repos/puppetlabs/puppet-server/commits{/sha}","git_commits_url":"https://api.github.com/repos/puppetlabs/puppet-server/git/commits{/sha}","comments_url":"https://api.github.com/repos/puppetlabs/puppet-server/comments{/number}","issue_comment_url":"https://api.github.com/repos/puppetlabs/puppet-server/issues/comments{/number}","contents_url":"https://api.github.com/repos/puppetlabs/puppet-server/contents/{+path}","compare_url":"https://api.github.com/repos/puppetlabs/puppet-server/compare/{base}...{head}","merges_url":"https://api.github.com/repos/puppetlabs/puppet-server/merges","archive_url":"https://api.github.com/repos/puppetlabs/puppet-server/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/puppetlabs/puppet-server/downloads","issues_url":"https://api.github.com/repos/puppetlabs/puppet-server/issues{/number}","pulls_url":"https://api.github.com/repos/puppetlabs/puppet-server/pulls{/number}","milestones_url":"https://api.github.com/repos/puppetlabs/puppet-server/milestones{/number}","notifications_url":"https://api.github.com/repos/puppetlabs/puppet-server/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/puppetlabs/puppet-server/labels{/name}","releases_url":"https://api.github.com/repos/puppetlabs/puppet-server/releases{/id}","created_at":"2014-05-07T19:00:24Z","updated_at":"2015-06-09T08:32:44Z","pushed_at":"2015-06-11T00:17:57Z","git_url":"git://github.com/puppetlabs/puppet-server.git","ssh_url":"git@github.com:puppetlabs/puppet-server.git","clone_url":"https://github.com/puppetlabs/puppet-server.git","svn_url":"https://github.com/puppetlabs/puppet-server","homepage":"https://tickets.puppetlabs.com/browse/SERVER","size":7698,"stargazers_count":105,"watchers_count":105,"language":"Clojure","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":56,"mirror_url":null,"open_issues_count":0,"forks":56,"open_issues":0,"watchers":105,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/608"},"html":{"href":"https://github.com/puppetlabs/puppet-server/pull/608"},"issue":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/issues/608"},"comments":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/issues/608/comments"},"review_comments":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/608/comments"},"review_comment":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/608/commits"},"statuses":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/statuses/374bdfe88c6c34dd1327421b51540ca4703da123"}},"merged":false,"mergeable":true,"mergeable_state":"unstable","merged_by":null,"comments":1,"review_comments":0,"commits":27,"additions":353,"deletions":98,"changed_files":7}}