{"action":"created","issue":{"url":"https://api.github.com/repos/Shopify/resque/issues/12","repository_url":"https://api.github.com/repos/Shopify/resque","labels_url":"https://api.github.com/repos/Shopify/resque/issues/12/labels{/name}","comments_url":"https://api.github.com/repos/Shopify/resque/issues/12/comments","events_url":"https://api.github.com/repos/Shopify/resque/issues/12/events","html_url":"https://github.com/Shopify/resque/pull/12","id":132261443,"number":12,"title":"Merge upstream/1-x-stable","user":{"login":"fw42","id":2072686,"avatar_url":"https://avatars.githubusercontent.com/u/2072686?v=3","gravatar_id":"","url":"https://api.github.com/users/fw42","html_url":"https://github.com/fw42","followers_url":"https://api.github.com/users/fw42/followers","following_url":"https://api.github.com/users/fw42/following{/other_user}","gists_url":"https://api.github.com/users/fw42/gists{/gist_id}","starred_url":"https://api.github.com/users/fw42/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fw42/subscriptions","organizations_url":"https://api.github.com/users/fw42/orgs","repos_url":"https://api.github.com/users/fw42/repos","events_url":"https://api.github.com/users/fw42/events{/privacy}","received_events_url":"https://api.github.com/users/fw42/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":7,"created_at":"2016-02-08T21:30:29Z","updated_at":"2016-02-08T22:54:30Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/Shopify/resque/pulls/12","html_url":"https://github.com/Shopify/resque/pull/12","diff_url":"https://github.com/Shopify/resque/pull/12.diff","patch_url":"https://github.com/Shopify/resque/pull/12.patch"},"body":"This merges the upstream 1-x-stable branch into our master branch, to bring us [closer to upstream](https://github.com/Shopify/resque/compare/Shopify:0a0cc3ba3bc5ae87576507030f78bbc3c5f7d2c5...9e1d1c6674c29034d7ed8d0a0bcfc39aeed3adf7).\r\n\r\nThe remaining diff after merging would essentially be\r\n* https://github.com/Shopify/resque/pull/1 (will PR this upstream).\r\n* https://github.com/Shopify/resque/commit/96f4ddb80f5842d6f43323f0076a2f9cdcb22b33 (see comments, not sure yet what to do here, maybe PR upstream).\r\n\r\nThis PR basically reverted:\r\n* https://github.com/Shopify/resque/pull/11/ (this fix was shitty, we should try something else).\r\n* https://github.com/Shopify/resque/commit/4187877273371c1c620456dce4e67533f8d95be6. Looks like that's not necessary anymore since we can now use `GRACEFUL_RESTART` to force `shutdown` in favour of `shutdown!`.\r\n\r\nHope I didn't forget anything. Will try out this branch on Shopify core CI.\r\n\r\nThoughts? @dylanahsmith @Sirupsen @burke @byroot \r\nFYI @steveklabnik "},"comment":{"url":"https://api.github.com/repos/Shopify/resque/issues/comments/181609111","html_url":"https://github.com/Shopify/resque/pull/12#issuecomment-181609111","issue_url":"https://api.github.com/repos/Shopify/resque/issues/12","id":181609111,"user":{"login":"fw42","id":2072686,"avatar_url":"https://avatars.githubusercontent.com/u/2072686?v=3","gravatar_id":"","url":"https://api.github.com/users/fw42","html_url":"https://github.com/fw42","followers_url":"https://api.github.com/users/fw42/followers","following_url":"https://api.github.com/users/fw42/following{/other_user}","gists_url":"https://api.github.com/users/fw42/gists{/gist_id}","starred_url":"https://api.github.com/users/fw42/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fw42/subscriptions","organizations_url":"https://api.github.com/users/fw42/orgs","repos_url":"https://api.github.com/users/fw42/repos","events_url":"https://api.github.com/users/fw42/events{/privacy}","received_events_url":"https://api.github.com/users/fw42/received_events","type":"User","site_admin":false},"created_at":"2016-02-08T22:54:30Z","updated_at":"2016-02-08T22:54:30Z","body":"(Shopify core CI is green with this ref)"}}