{"action":"created","comment":{"url":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/comments/28109225","id":28109225,"diff_hunk":"@@ -36,6 +37,7 @@ ezbake: {\n       debian: { dependencies: [\"puppet-agent\"],\n                # see redhat comments on why this is terrible\n                postinst: [\n+                 \"install --owner={{user}} --group={{user}} -d /opt/puppetlabs/server/data/puppetserver/jruby-gems\",","path":"resources/ext/ezbake.conf","position":12,"original_position":12,"commit_id":"23561f4dfff0b5e5b983702a77dc36b03c40d297","original_commit_id":"23561f4dfff0b5e5b983702a77dc36b03c40d297","user":{"login":"camlow325","id":5652737,"avatar_url":"https://avatars.githubusercontent.com/u/5652737?v=3","gravatar_id":"","url":"https://api.github.com/users/camlow325","html_url":"https://github.com/camlow325","followers_url":"https://api.github.com/users/camlow325/followers","following_url":"https://api.github.com/users/camlow325/following{/other_user}","gists_url":"https://api.github.com/users/camlow325/gists{/gist_id}","starred_url":"https://api.github.com/users/camlow325/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/camlow325/subscriptions","organizations_url":"https://api.github.com/users/camlow325/orgs","repos_url":"https://api.github.com/users/camlow325/repos","events_url":"https://api.github.com/users/camlow325/events{/privacy}","received_events_url":"https://api.github.com/users/camlow325/received_events","type":"User","site_admin":false},"body":"Same question here as for the redhat equivalent.","created_at":"2015-04-09T22:31:04Z","updated_at":"2015-04-09T22:31:04Z","html_url":"https://github.com/puppetlabs/puppet-server/pull/489#discussion_r28109225","pull_request_url":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/489","_links":{"self":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/comments/28109225"},"html":{"href":"https://github.com/puppetlabs/puppet-server/pull/489#discussion_r28109225"},"pull_request":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/489"}}},"pull_request":{"url":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/489","id":32928298,"html_url":"https://github.com/puppetlabs/puppet-server/pull/489","diff_url":"https://github.com/puppetlabs/puppet-server/pull/489.diff","patch_url":"https://github.com/puppetlabs/puppet-server/pull/489.patch","issue_url":"https://api.github.com/repos/puppetlabs/puppet-server/issues/489","number":489,"state":"open","locked":false,"title":"(SERVER-530) Merge tag 'puppet-server-1.0.8' into 2.1.x","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":"Without this change set the 2.1.x branch has diverged from the 1.0.x branch.\nThis is a problem because there have been important changes between\npuppetserver 1.0.2 and 1.0.8 which need to be included in puppetserver 2.1.\nThis patch addresses the problem by merging the 1.0.8 tag into the 2.1.x\nbranch.  The stable branch is not being merged because there are changes in\nstable destined for 1.1 which are too risky to include in 2.1.\n\nNB: This merge commit contains considerable code changes in order to resolve\nmerge conflicts.\n\nThe resolved conflicts center on the following high level changes between the\ntwo branches:\n\n * SERVER-449 Timeout Settings in 1.0.8 vs (SERVER-409) Plumb top-level\n   directories into JRuby in 2.1.x\n * SERVER-517 HTTP Client Error handling in 1.0.8 vs SERVER-206\n   Terminate http clients in 2.1.x\n\n* tag 'puppet-server-1.0.8': (48 commits)\n  (MAINT) Bump version to 1.0.8 for release\n  (SERVER-517) Refactor spec test; better message\n  (SERVER-517) Raise Ruby errors from HTTP client\n  (SERVER-518) Changed \"puppet-server\" to \"puppetserver\" in ezbake profile\n  (SERVER-518) Changed version check `default-group-id` to `puppetlabs`\n  (SERVER-518) Remote hyphen from puppetserver defproject for dujour\n  (SERVER-319) Document HTTP access log\n  (SERVER-449) Rename socket timeout\n  (SERVER-449) Docs update\n  (SERVER-513) Bump tk-jetty9 dependency to 1.3.0\n  (MAINT) Update to new rspec form\n  (MAINT) Correct docstring\n  (MAINT) Remove unneeded require\n  (SERVER-449) Set connect timeout default to 2 mins\n  (MAINT) Fix indentation\n  (SERVER-449) Add timeout settings to http-client\n  (MAINT) Remove unneeded import\n  (MAINT) Bump lein-ezbake plugin dependency to 0.2.6\n  (SERVER-379) Tweaks based on PR review.\n  (SERVER-379) Initial draft of a tuning guide\n  ...\n\nConflicts:\n\tGemfile\n\tREADME_BRANCHING.md\n\tdocumentation/configuration.markdown\n\tproject.clj\n\tresources/ext/ezbake.conf\n\tsrc/clj/puppetlabs/puppetserver/ringutils.clj\n\tsrc/clj/puppetlabs/services/config/puppet_server_config_core.clj\n\tsrc/clj/puppetlabs/services/jruby/jruby_puppet_core.clj\n\tsrc/clj/puppetlabs/services/jruby/jruby_puppet_service.clj\n\tsrc/clj/puppetlabs/services/version/version_check_core.clj\n\tsrc/ruby/puppet-server-lib/puppet/server/http_client.rb\n\ttest/unit/puppetlabs/puppetserver/ruby/http_client_test.clj\n\ttest/unit/puppetlabs/services/config/puppet_server_config_core_test.clj\n\ttest/unit/puppetlabs/services/config/puppet_server_config_service_test.clj\n\ttest/unit/puppetlabs/services/jruby/jruby_interpreter_test.clj\n\ttest/unit/puppetlabs/services/jruby/jruby_puppet_service_test.clj\n\ttest/unit/puppetlabs/services/jruby/jruby_testutils.clj\n\ttest/unit/puppetlabs/services/request_handler/request_handler_core_test.clj\n\ttest/unit/puppetlabs/services/version/version_check_core_test.clj","created_at":"2015-04-09T06:27:36Z","updated_at":"2015-04-09T22:31:04Z","closed_at":null,"merged_at":null,"merge_commit_sha":"1a495ddf544f7d17ff484d07185f9e56d0eff899","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/489/commits","review_comments_url":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/489/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/489/comments","statuses_url":"https://api.github.com/repos/puppetlabs/puppet-server/statuses/23561f4dfff0b5e5b983702a77dc36b03c40d297","head":{"label":"jeffmccune:task/2.1.x/SERVER-530_merge_1.0.8_tag","ref":"task/2.1.x/SERVER-530_merge_1.0.8_tag","sha":"23561f4dfff0b5e5b983702a77dc36b03c40d297","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-03-15T18:12:05Z","pushed_at":"2015-04-09T17:54:35Z","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":2518,"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:2.1.x","ref":"2.1.x","sha":"5ad6dd7bffe31ab4fc4efad7aa071830def81f6a","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-04-09T18:07:30Z","pushed_at":"2015-04-09T22:06:59Z","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":6430,"stargazers_count":90,"watchers_count":90,"language":"Clojure","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":48,"mirror_url":null,"open_issues_count":8,"forks":48,"open_issues":8,"watchers":90,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/489"},"html":{"href":"https://github.com/puppetlabs/puppet-server/pull/489"},"issue":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/issues/489"},"comments":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/issues/489/comments"},"review_comments":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/pulls/489/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/489/commits"},"statuses":{"href":"https://api.github.com/repos/puppetlabs/puppet-server/statuses/23561f4dfff0b5e5b983702a77dc36b03c40d297"}}}}