{"action":"created","comment":{"url":"https://api.github.com/repos/amplab/tachyon/pulls/comments/39091425","id":39091425,"diff_hunk":"@@ -608,8 +615,13 @@ public synchronized long getFileId(TachyonURI path) {\n    * @param fileId the file id of the file or folder.\n    * @param path the path of the file or folder. valid iff fileId is -1.\n    * @param useCachedMetadata if true use the local cached meta data\n+<<<<<<< HEAD","path":"clients/unshaded/src/main/java/tachyon/client/TachyonFS.java","position":219,"original_position":219,"commit_id":"a20c40e7548e47d274c11962cea94723700e5406","original_commit_id":"a20c40e7548e47d274c11962cea94723700e5406","user":{"login":"apc999","id":1413748,"avatar_url":"https://avatars.githubusercontent.com/u/1413748?v=3","gravatar_id":"","url":"https://api.github.com/users/apc999","html_url":"https://github.com/apc999","followers_url":"https://api.github.com/users/apc999/followers","following_url":"https://api.github.com/users/apc999/following{/other_user}","gists_url":"https://api.github.com/users/apc999/gists{/gist_id}","starred_url":"https://api.github.com/users/apc999/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apc999/subscriptions","organizations_url":"https://api.github.com/users/apc999/orgs","repos_url":"https://api.github.com/users/apc999/repos","events_url":"https://api.github.com/users/apc999/events{/privacy}","received_events_url":"https://api.github.com/users/apc999/received_events","type":"User","site_admin":false},"body":"unresolved merge conflicts","created_at":"2015-09-09T20:25:17Z","updated_at":"2015-09-09T20:25:17Z","html_url":"https://github.com/amplab/tachyon/pull/1467#discussion_r39091425","pull_request_url":"https://api.github.com/repos/amplab/tachyon/pulls/1467","_links":{"self":{"href":"https://api.github.com/repos/amplab/tachyon/pulls/comments/39091425"},"html":{"href":"https://github.com/amplab/tachyon/pull/1467#discussion_r39091425"},"pull_request":{"href":"https://api.github.com/repos/amplab/tachyon/pulls/1467"}}},"pull_request":{"url":"https://api.github.com/repos/amplab/tachyon/pulls/1467","id":44174779,"html_url":"https://github.com/amplab/tachyon/pull/1467","diff_url":"https://github.com/amplab/tachyon/pull/1467.diff","patch_url":"https://github.com/amplab/tachyon/pull/1467.patch","issue_url":"https://api.github.com/repos/amplab/tachyon/issues/1467","number":1467,"state":"open","locked":false,"title":"[TACHYON-919] Fix \"mvn site\" warnings and errors","user":{"login":"jsimsa","id":1072079,"avatar_url":"https://avatars.githubusercontent.com/u/1072079?v=3","gravatar_id":"","url":"https://api.github.com/users/jsimsa","html_url":"https://github.com/jsimsa","followers_url":"https://api.github.com/users/jsimsa/followers","following_url":"https://api.github.com/users/jsimsa/following{/other_user}","gists_url":"https://api.github.com/users/jsimsa/gists{/gist_id}","starred_url":"https://api.github.com/users/jsimsa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jsimsa/subscriptions","organizations_url":"https://api.github.com/users/jsimsa/orgs","repos_url":"https://api.github.com/users/jsimsa/repos","events_url":"https://api.github.com/users/jsimsa/events{/privacy}","received_events_url":"https://api.github.com/users/jsimsa/received_events","type":"User","site_admin":false},"body":"This PR:\r\n- fixes a large number of \"mvn site\" warnings and errors (missing / incorrect @param and @throws descriptions)\r\n- applies a consistent style to JavaDoc\r\n- restricts the access to private members only to test classes where applicable","created_at":"2015-09-04T01:08:05Z","updated_at":"2015-09-09T20:25:17Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e4c068ef9df56413a4b8ad98c61478ae48ad018e","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/amplab/tachyon/pulls/1467/commits","review_comments_url":"https://api.github.com/repos/amplab/tachyon/pulls/1467/comments","review_comment_url":"https://api.github.com/repos/amplab/tachyon/pulls/comments{/number}","comments_url":"https://api.github.com/repos/amplab/tachyon/issues/1467/comments","statuses_url":"https://api.github.com/repos/amplab/tachyon/statuses/a20c40e7548e47d274c11962cea94723700e5406","head":{"label":"jsimsa:tachyon-919","ref":"tachyon-919","sha":"a20c40e7548e47d274c11962cea94723700e5406","user":{"login":"jsimsa","id":1072079,"avatar_url":"https://avatars.githubusercontent.com/u/1072079?v=3","gravatar_id":"","url":"https://api.github.com/users/jsimsa","html_url":"https://github.com/jsimsa","followers_url":"https://api.github.com/users/jsimsa/followers","following_url":"https://api.github.com/users/jsimsa/following{/other_user}","gists_url":"https://api.github.com/users/jsimsa/gists{/gist_id}","starred_url":"https://api.github.com/users/jsimsa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jsimsa/subscriptions","organizations_url":"https://api.github.com/users/jsimsa/orgs","repos_url":"https://api.github.com/users/jsimsa/repos","events_url":"https://api.github.com/users/jsimsa/events{/privacy}","received_events_url":"https://api.github.com/users/jsimsa/received_events","type":"User","site_admin":false},"repo":{"id":41324456,"name":"tachyon","full_name":"jsimsa/tachyon","owner":{"login":"jsimsa","id":1072079,"avatar_url":"https://avatars.githubusercontent.com/u/1072079?v=3","gravatar_id":"","url":"https://api.github.com/users/jsimsa","html_url":"https://github.com/jsimsa","followers_url":"https://api.github.com/users/jsimsa/followers","following_url":"https://api.github.com/users/jsimsa/following{/other_user}","gists_url":"https://api.github.com/users/jsimsa/gists{/gist_id}","starred_url":"https://api.github.com/users/jsimsa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jsimsa/subscriptions","organizations_url":"https://api.github.com/users/jsimsa/orgs","repos_url":"https://api.github.com/users/jsimsa/repos","events_url":"https://api.github.com/users/jsimsa/events{/privacy}","received_events_url":"https://api.github.com/users/jsimsa/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jsimsa/tachyon","description":" A Reliable Memory Centric Distributed Storage System","fork":true,"url":"https://api.github.com/repos/jsimsa/tachyon","forks_url":"https://api.github.com/repos/jsimsa/tachyon/forks","keys_url":"https://api.github.com/repos/jsimsa/tachyon/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jsimsa/tachyon/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jsimsa/tachyon/teams","hooks_url":"https://api.github.com/repos/jsimsa/tachyon/hooks","issue_events_url":"https://api.github.com/repos/jsimsa/tachyon/issues/events{/number}","events_url":"https://api.github.com/repos/jsimsa/tachyon/events","assignees_url":"https://api.github.com/repos/jsimsa/tachyon/assignees{/user}","branches_url":"https://api.github.com/repos/jsimsa/tachyon/branches{/branch}","tags_url":"https://api.github.com/repos/jsimsa/tachyon/tags","blobs_url":"https://api.github.com/repos/jsimsa/tachyon/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jsimsa/tachyon/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jsimsa/tachyon/git/refs{/sha}","trees_url":"https://api.github.com/repos/jsimsa/tachyon/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jsimsa/tachyon/statuses/{sha}","languages_url":"https://api.github.com/repos/jsimsa/tachyon/languages","stargazers_url":"https://api.github.com/repos/jsimsa/tachyon/stargazers","contributors_url":"https://api.github.com/repos/jsimsa/tachyon/contributors","subscribers_url":"https://api.github.com/repos/jsimsa/tachyon/subscribers","subscription_url":"https://api.github.com/repos/jsimsa/tachyon/subscription","commits_url":"https://api.github.com/repos/jsimsa/tachyon/commits{/sha}","git_commits_url":"https://api.github.com/repos/jsimsa/tachyon/git/commits{/sha}","comments_url":"https://api.github.com/repos/jsimsa/tachyon/comments{/number}","issue_comment_url":"https://api.github.com/repos/jsimsa/tachyon/issues/comments{/number}","contents_url":"https://api.github.com/repos/jsimsa/tachyon/contents/{+path}","compare_url":"https://api.github.com/repos/jsimsa/tachyon/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jsimsa/tachyon/merges","archive_url":"https://api.github.com/repos/jsimsa/tachyon/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jsimsa/tachyon/downloads","issues_url":"https://api.github.com/repos/jsimsa/tachyon/issues{/number}","pulls_url":"https://api.github.com/repos/jsimsa/tachyon/pulls{/number}","milestones_url":"https://api.github.com/repos/jsimsa/tachyon/milestones{/number}","notifications_url":"https://api.github.com/repos/jsimsa/tachyon/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jsimsa/tachyon/labels{/name}","releases_url":"https://api.github.com/repos/jsimsa/tachyon/releases{/id}","created_at":"2015-08-24T20:06:14Z","updated_at":"2015-08-24T20:06:16Z","pushed_at":"2015-09-09T19:07:21Z","git_url":"git://github.com/jsimsa/tachyon.git","ssh_url":"git@github.com:jsimsa/tachyon.git","clone_url":"https://github.com/jsimsa/tachyon.git","svn_url":"https://github.com/jsimsa/tachyon","homepage":"http://tachyon-project.org","size":20651,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"amplab:master","ref":"master","sha":"c5645e1190f8f7fb8a8028717afc855adbe1f430","user":{"login":"amplab","id":1438454,"avatar_url":"https://avatars.githubusercontent.com/u/1438454?v=3","gravatar_id":"","url":"https://api.github.com/users/amplab","html_url":"https://github.com/amplab","followers_url":"https://api.github.com/users/amplab/followers","following_url":"https://api.github.com/users/amplab/following{/other_user}","gists_url":"https://api.github.com/users/amplab/gists{/gist_id}","starred_url":"https://api.github.com/users/amplab/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/amplab/subscriptions","organizations_url":"https://api.github.com/users/amplab/orgs","repos_url":"https://api.github.com/users/amplab/repos","events_url":"https://api.github.com/users/amplab/events{/privacy}","received_events_url":"https://api.github.com/users/amplab/received_events","type":"Organization","site_admin":false},"repo":{"id":7276954,"name":"tachyon","full_name":"amplab/tachyon","owner":{"login":"amplab","id":1438454,"avatar_url":"https://avatars.githubusercontent.com/u/1438454?v=3","gravatar_id":"","url":"https://api.github.com/users/amplab","html_url":"https://github.com/amplab","followers_url":"https://api.github.com/users/amplab/followers","following_url":"https://api.github.com/users/amplab/following{/other_user}","gists_url":"https://api.github.com/users/amplab/gists{/gist_id}","starred_url":"https://api.github.com/users/amplab/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/amplab/subscriptions","organizations_url":"https://api.github.com/users/amplab/orgs","repos_url":"https://api.github.com/users/amplab/repos","events_url":"https://api.github.com/users/amplab/events{/privacy}","received_events_url":"https://api.github.com/users/amplab/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/amplab/tachyon","description":"Memory Centric Reliable Distributed Storage","fork":false,"url":"https://api.github.com/repos/amplab/tachyon","forks_url":"https://api.github.com/repos/amplab/tachyon/forks","keys_url":"https://api.github.com/repos/amplab/tachyon/keys{/key_id}","collaborators_url":"https://api.github.com/repos/amplab/tachyon/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/amplab/tachyon/teams","hooks_url":"https://api.github.com/repos/amplab/tachyon/hooks","issue_events_url":"https://api.github.com/repos/amplab/tachyon/issues/events{/number}","events_url":"https://api.github.com/repos/amplab/tachyon/events","assignees_url":"https://api.github.com/repos/amplab/tachyon/assignees{/user}","branches_url":"https://api.github.com/repos/amplab/tachyon/branches{/branch}","tags_url":"https://api.github.com/repos/amplab/tachyon/tags","blobs_url":"https://api.github.com/repos/amplab/tachyon/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/amplab/tachyon/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/amplab/tachyon/git/refs{/sha}","trees_url":"https://api.github.com/repos/amplab/tachyon/git/trees{/sha}","statuses_url":"https://api.github.com/repos/amplab/tachyon/statuses/{sha}","languages_url":"https://api.github.com/repos/amplab/tachyon/languages","stargazers_url":"https://api.github.com/repos/amplab/tachyon/stargazers","contributors_url":"https://api.github.com/repos/amplab/tachyon/contributors","subscribers_url":"https://api.github.com/repos/amplab/tachyon/subscribers","subscription_url":"https://api.github.com/repos/amplab/tachyon/subscription","commits_url":"https://api.github.com/repos/amplab/tachyon/commits{/sha}","git_commits_url":"https://api.github.com/repos/amplab/tachyon/git/commits{/sha}","comments_url":"https://api.github.com/repos/amplab/tachyon/comments{/number}","issue_comment_url":"https://api.github.com/repos/amplab/tachyon/issues/comments{/number}","contents_url":"https://api.github.com/repos/amplab/tachyon/contents/{+path}","compare_url":"https://api.github.com/repos/amplab/tachyon/compare/{base}...{head}","merges_url":"https://api.github.com/repos/amplab/tachyon/merges","archive_url":"https://api.github.com/repos/amplab/tachyon/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/amplab/tachyon/downloads","issues_url":"https://api.github.com/repos/amplab/tachyon/issues{/number}","pulls_url":"https://api.github.com/repos/amplab/tachyon/pulls{/number}","milestones_url":"https://api.github.com/repos/amplab/tachyon/milestones{/number}","notifications_url":"https://api.github.com/repos/amplab/tachyon/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/amplab/tachyon/labels{/name}","releases_url":"https://api.github.com/repos/amplab/tachyon/releases{/id}","created_at":"2012-12-21T17:43:46Z","updated_at":"2015-09-09T02:41:59Z","pushed_at":"2015-09-09T20:20:59Z","git_url":"git://github.com/amplab/tachyon.git","ssh_url":"git@github.com:amplab/tachyon.git","clone_url":"https://github.com/amplab/tachyon.git","svn_url":"https://github.com/amplab/tachyon","homepage":"http://tachyon-project.org","size":46033,"stargazers_count":1563,"watchers_count":1563,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":608,"mirror_url":null,"open_issues_count":29,"forks":608,"open_issues":29,"watchers":1563,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/amplab/tachyon/pulls/1467"},"html":{"href":"https://github.com/amplab/tachyon/pull/1467"},"issue":{"href":"https://api.github.com/repos/amplab/tachyon/issues/1467"},"comments":{"href":"https://api.github.com/repos/amplab/tachyon/issues/1467/comments"},"review_comments":{"href":"https://api.github.com/repos/amplab/tachyon/pulls/1467/comments"},"review_comment":{"href":"https://api.github.com/repos/amplab/tachyon/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/amplab/tachyon/pulls/1467/commits"},"statuses":{"href":"https://api.github.com/repos/amplab/tachyon/statuses/a20c40e7548e47d274c11962cea94723700e5406"}}}}