{"action":"opened","number":318,"pull_request":{"url":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/318","id":33277696,"html_url":"https://github.com/gemini-hlsw/ocs/pull/318","diff_url":"https://github.com/gemini-hlsw/ocs/pull/318.diff","patch_url":"https://github.com/gemini-hlsw/ocs/pull/318.patch","issue_url":"https://api.github.com/repos/gemini-hlsw/ocs/issues/318","number":318,"state":"open","locked":false,"title":"OCSADV-200-O: template numbering correction","user":{"login":"swalker2m","id":4906023,"avatar_url":"https://avatars.githubusercontent.com/u/4906023?v=3","gravatar_id":"","url":"https://api.github.com/users/swalker2m","html_url":"https://github.com/swalker2m","followers_url":"https://api.github.com/users/swalker2m/followers","following_url":"https://api.github.com/users/swalker2m/following{/other_user}","gists_url":"https://api.github.com/users/swalker2m/gists{/gist_id}","starred_url":"https://api.github.com/users/swalker2m/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/swalker2m/subscriptions","organizations_url":"https://api.github.com/users/swalker2m/orgs","repos_url":"https://api.github.com/users/swalker2m/repos","events_url":"https://api.github.com/users/swalker2m/events{/privacy}","received_events_url":"https://api.github.com/users/swalker2m/received_events","type":"User","site_admin":false},"body":"This merge installment introduces the last expected `MergePlan` correction.  It makes use of the existing `VersionTokenUtil` class to renumber template groups that are split both locally and remotely.  For example, if template group \"1\" is split remotely and committed to the database, we end up with groups \"1\" and \"1.1\".  If the same happens locally we have the same template groups, \"1\" and \"1.1\" but the two new \"1.1\" template groups are different objects with different keys. In this case the local \"1.1\" is renumbered to \"1.2\".\r\n\r\nThis correction builds on `VersionTokenUtil` to manipulate the `MergePlan` in order to guarantee that all template groups are uniquely numbered.  See `TemplateNumberingCorrection`.   It also fixes a bug in which template observations were not being considered in the observation numbering correction.\r\n","created_at":"2015-04-14T16:58:17Z","updated_at":"2015-04-14T16:58:17Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/318/commits","review_comments_url":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/318/comments","review_comment_url":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/comments{/number}","comments_url":"https://api.github.com/repos/gemini-hlsw/ocs/issues/318/comments","statuses_url":"https://api.github.com/repos/gemini-hlsw/ocs/statuses/0fe45298367833149a3ef47640f526825f6cce57","head":{"label":"swalker2m:feature/OCSADV-200-O","ref":"feature/OCSADV-200-O","sha":"0fe45298367833149a3ef47640f526825f6cce57","user":{"login":"swalker2m","id":4906023,"avatar_url":"https://avatars.githubusercontent.com/u/4906023?v=3","gravatar_id":"","url":"https://api.github.com/users/swalker2m","html_url":"https://github.com/swalker2m","followers_url":"https://api.github.com/users/swalker2m/followers","following_url":"https://api.github.com/users/swalker2m/following{/other_user}","gists_url":"https://api.github.com/users/swalker2m/gists{/gist_id}","starred_url":"https://api.github.com/users/swalker2m/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/swalker2m/subscriptions","organizations_url":"https://api.github.com/users/swalker2m/orgs","repos_url":"https://api.github.com/users/swalker2m/repos","events_url":"https://api.github.com/users/swalker2m/events{/privacy}","received_events_url":"https://api.github.com/users/swalker2m/received_events","type":"User","site_admin":false},"repo":{"id":23966397,"name":"ocs","full_name":"swalker2m/ocs","owner":{"login":"swalker2m","id":4906023,"avatar_url":"https://avatars.githubusercontent.com/u/4906023?v=3","gravatar_id":"","url":"https://api.github.com/users/swalker2m","html_url":"https://github.com/swalker2m","followers_url":"https://api.github.com/users/swalker2m/followers","following_url":"https://api.github.com/users/swalker2m/following{/other_user}","gists_url":"https://api.github.com/users/swalker2m/gists{/gist_id}","starred_url":"https://api.github.com/users/swalker2m/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/swalker2m/subscriptions","organizations_url":"https://api.github.com/users/swalker2m/orgs","repos_url":"https://api.github.com/users/swalker2m/repos","events_url":"https://api.github.com/users/swalker2m/events{/privacy}","received_events_url":"https://api.github.com/users/swalker2m/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/swalker2m/ocs","description":"","fork":true,"url":"https://api.github.com/repos/swalker2m/ocs","forks_url":"https://api.github.com/repos/swalker2m/ocs/forks","keys_url":"https://api.github.com/repos/swalker2m/ocs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/swalker2m/ocs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/swalker2m/ocs/teams","hooks_url":"https://api.github.com/repos/swalker2m/ocs/hooks","issue_events_url":"https://api.github.com/repos/swalker2m/ocs/issues/events{/number}","events_url":"https://api.github.com/repos/swalker2m/ocs/events","assignees_url":"https://api.github.com/repos/swalker2m/ocs/assignees{/user}","branches_url":"https://api.github.com/repos/swalker2m/ocs/branches{/branch}","tags_url":"https://api.github.com/repos/swalker2m/ocs/tags","blobs_url":"https://api.github.com/repos/swalker2m/ocs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/swalker2m/ocs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/swalker2m/ocs/git/refs{/sha}","trees_url":"https://api.github.com/repos/swalker2m/ocs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/swalker2m/ocs/statuses/{sha}","languages_url":"https://api.github.com/repos/swalker2m/ocs/languages","stargazers_url":"https://api.github.com/repos/swalker2m/ocs/stargazers","contributors_url":"https://api.github.com/repos/swalker2m/ocs/contributors","subscribers_url":"https://api.github.com/repos/swalker2m/ocs/subscribers","subscription_url":"https://api.github.com/repos/swalker2m/ocs/subscription","commits_url":"https://api.github.com/repos/swalker2m/ocs/commits{/sha}","git_commits_url":"https://api.github.com/repos/swalker2m/ocs/git/commits{/sha}","comments_url":"https://api.github.com/repos/swalker2m/ocs/comments{/number}","issue_comment_url":"https://api.github.com/repos/swalker2m/ocs/issues/comments{/number}","contents_url":"https://api.github.com/repos/swalker2m/ocs/contents/{+path}","compare_url":"https://api.github.com/repos/swalker2m/ocs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/swalker2m/ocs/merges","archive_url":"https://api.github.com/repos/swalker2m/ocs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/swalker2m/ocs/downloads","issues_url":"https://api.github.com/repos/swalker2m/ocs/issues{/number}","pulls_url":"https://api.github.com/repos/swalker2m/ocs/pulls{/number}","milestones_url":"https://api.github.com/repos/swalker2m/ocs/milestones{/number}","notifications_url":"https://api.github.com/repos/swalker2m/ocs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/swalker2m/ocs/labels{/name}","releases_url":"https://api.github.com/repos/swalker2m/ocs/releases{/id}","created_at":"2014-09-12T15:41:27Z","updated_at":"2015-04-14T16:32:38Z","pushed_at":"2015-04-14T16:55:28Z","git_url":"git://github.com/swalker2m/ocs.git","ssh_url":"git@github.com:swalker2m/ocs.git","clone_url":"https://github.com/swalker2m/ocs.git","svn_url":"https://github.com/swalker2m/ocs","homepage":null,"size":262549,"stargazers_count":0,"watchers_count":0,"language":"Java","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":"gemini-hlsw:develop","ref":"develop","sha":"ca784f90d88ae38b20741c7c5f5d7500122b1cdf","user":{"login":"gemini-hlsw","id":8593735,"avatar_url":"https://avatars.githubusercontent.com/u/8593735?v=3","gravatar_id":"","url":"https://api.github.com/users/gemini-hlsw","html_url":"https://github.com/gemini-hlsw","followers_url":"https://api.github.com/users/gemini-hlsw/followers","following_url":"https://api.github.com/users/gemini-hlsw/following{/other_user}","gists_url":"https://api.github.com/users/gemini-hlsw/gists{/gist_id}","starred_url":"https://api.github.com/users/gemini-hlsw/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gemini-hlsw/subscriptions","organizations_url":"https://api.github.com/users/gemini-hlsw/orgs","repos_url":"https://api.github.com/users/gemini-hlsw/repos","events_url":"https://api.github.com/users/gemini-hlsw/events{/privacy}","received_events_url":"https://api.github.com/users/gemini-hlsw/received_events","type":"Organization","site_admin":false},"repo":{"id":23963494,"name":"ocs","full_name":"gemini-hlsw/ocs","owner":{"login":"gemini-hlsw","id":8593735,"avatar_url":"https://avatars.githubusercontent.com/u/8593735?v=3","gravatar_id":"","url":"https://api.github.com/users/gemini-hlsw","html_url":"https://github.com/gemini-hlsw","followers_url":"https://api.github.com/users/gemini-hlsw/followers","following_url":"https://api.github.com/users/gemini-hlsw/following{/other_user}","gists_url":"https://api.github.com/users/gemini-hlsw/gists{/gist_id}","starred_url":"https://api.github.com/users/gemini-hlsw/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gemini-hlsw/subscriptions","organizations_url":"https://api.github.com/users/gemini-hlsw/orgs","repos_url":"https://api.github.com/users/gemini-hlsw/repos","events_url":"https://api.github.com/users/gemini-hlsw/events{/privacy}","received_events_url":"https://api.github.com/users/gemini-hlsw/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/gemini-hlsw/ocs","description":"Observatory Control Software","fork":false,"url":"https://api.github.com/repos/gemini-hlsw/ocs","forks_url":"https://api.github.com/repos/gemini-hlsw/ocs/forks","keys_url":"https://api.github.com/repos/gemini-hlsw/ocs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gemini-hlsw/ocs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gemini-hlsw/ocs/teams","hooks_url":"https://api.github.com/repos/gemini-hlsw/ocs/hooks","issue_events_url":"https://api.github.com/repos/gemini-hlsw/ocs/issues/events{/number}","events_url":"https://api.github.com/repos/gemini-hlsw/ocs/events","assignees_url":"https://api.github.com/repos/gemini-hlsw/ocs/assignees{/user}","branches_url":"https://api.github.com/repos/gemini-hlsw/ocs/branches{/branch}","tags_url":"https://api.github.com/repos/gemini-hlsw/ocs/tags","blobs_url":"https://api.github.com/repos/gemini-hlsw/ocs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gemini-hlsw/ocs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gemini-hlsw/ocs/git/refs{/sha}","trees_url":"https://api.github.com/repos/gemini-hlsw/ocs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gemini-hlsw/ocs/statuses/{sha}","languages_url":"https://api.github.com/repos/gemini-hlsw/ocs/languages","stargazers_url":"https://api.github.com/repos/gemini-hlsw/ocs/stargazers","contributors_url":"https://api.github.com/repos/gemini-hlsw/ocs/contributors","subscribers_url":"https://api.github.com/repos/gemini-hlsw/ocs/subscribers","subscription_url":"https://api.github.com/repos/gemini-hlsw/ocs/subscription","commits_url":"https://api.github.com/repos/gemini-hlsw/ocs/commits{/sha}","git_commits_url":"https://api.github.com/repos/gemini-hlsw/ocs/git/commits{/sha}","comments_url":"https://api.github.com/repos/gemini-hlsw/ocs/comments{/number}","issue_comment_url":"https://api.github.com/repos/gemini-hlsw/ocs/issues/comments{/number}","contents_url":"https://api.github.com/repos/gemini-hlsw/ocs/contents/{+path}","compare_url":"https://api.github.com/repos/gemini-hlsw/ocs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gemini-hlsw/ocs/merges","archive_url":"https://api.github.com/repos/gemini-hlsw/ocs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gemini-hlsw/ocs/downloads","issues_url":"https://api.github.com/repos/gemini-hlsw/ocs/issues{/number}","pulls_url":"https://api.github.com/repos/gemini-hlsw/ocs/pulls{/number}","milestones_url":"https://api.github.com/repos/gemini-hlsw/ocs/milestones{/number}","notifications_url":"https://api.github.com/repos/gemini-hlsw/ocs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gemini-hlsw/ocs/labels{/name}","releases_url":"https://api.github.com/repos/gemini-hlsw/ocs/releases{/id}","created_at":"2014-09-12T14:20:23Z","updated_at":"2015-04-14T16:30:11Z","pushed_at":"2015-04-14T16:30:10Z","git_url":"git://github.com/gemini-hlsw/ocs.git","ssh_url":"git@github.com:gemini-hlsw/ocs.git","clone_url":"https://github.com/gemini-hlsw/ocs.git","svn_url":"https://github.com/gemini-hlsw/ocs","homepage":"","size":269865,"stargazers_count":3,"watchers_count":3,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":9,"mirror_url":null,"open_issues_count":3,"forks":9,"open_issues":3,"watchers":3,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/318"},"html":{"href":"https://github.com/gemini-hlsw/ocs/pull/318"},"issue":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/issues/318"},"comments":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/issues/318/comments"},"review_comments":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/318/comments"},"review_comment":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/318/commits"},"statuses":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/statuses/0fe45298367833149a3ef47640f526825f6cce57"}},"merged":false,"mergeable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"commits":5,"additions":265,"deletions":17,"changed_files":11}}