{"action":"created","comment":{"url":"https://api.github.com/repos/galaxyproject/galaxy/pulls/comments/74112824","id":74112824,"diff_hunk":"@@ -164,29 +164,31 @@ paste.app_factory = galaxy.web.buildapp:app_factory\n # <toolbox> tag.\n #tool_path = tools\n \n+# -- Tool dependencies\n+\n # Path to the directory in which tool dependencies are placed.  This is used by\n-# the tool shed to install dependencies and can also be used by administrators\n+# the Tool Shed to install dependencies and can also be used by administrators\n # to manually install or link to dependencies.  For details, see:\n #   https://wiki.galaxyproject.org/Admin/Config/ToolDependencies\n # Set to the string none to explicitly disable tool dependency handling.\n # If this option is set to none or an invalid path, installing tools with dependencies\n-# from the Tool Shed will fail. \n+# from the Tool Shed will fail.\n #tool_dependency_dir = database/dependencies\n \n-# The dependency resolves config file specifies an ordering and options for how\n+# The dependency resolvers config file specifies an ordering and options for how\n # Galaxy resolves tool dependencies (requirement tags in Tool XML). The default\n-# ordering is to the use the tool shed for tools installed that way, use local\n-# Galaxy packages, and then use conda if available.\n+# ordering is to the use the Tool Shed for tools installed that way, use local\n+# Galaxy packages, and then use Conda if available.\n # See https://github.com/galaxyproject/galaxy/blob/dev/doc/source/admin/dependency_resolvers.rst\n # for more information on these options.\n #dependency_resolvers_config_file = config/dependency_resolvers_conf.xml\n \n-# Following conda dependeny resolution options are experimental as of early\n-# 2016. These will change the defaults for each conda resolver, but multiple\n-# resolvers can be configured independently and these options overridden in\n+# Following Conda dependency resolution options will change the defaults for each Conda resolver,","path":"config/galaxy.ini.sample","position":31,"original_position":31,"commit_id":"9d467ddd5204deafb3a0dadae7813691e24c7c3c","original_commit_id":"9d467ddd5204deafb3a0dadae7813691e24c7c3c","user":{"login":"nsoranzo","id":4924623,"avatar_url":"https://avatars.githubusercontent.com/u/4924623?v=3","gravatar_id":"","url":"https://api.github.com/users/nsoranzo","html_url":"https://github.com/nsoranzo","followers_url":"https://api.github.com/users/nsoranzo/followers","following_url":"https://api.github.com/users/nsoranzo/following{/other_user}","gists_url":"https://api.github.com/users/nsoranzo/gists{/gist_id}","starred_url":"https://api.github.com/users/nsoranzo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nsoranzo/subscriptions","organizations_url":"https://api.github.com/users/nsoranzo/orgs","repos_url":"https://api.github.com/users/nsoranzo/repos","events_url":"https://api.github.com/users/nsoranzo/events{/privacy}","received_events_url":"https://api.github.com/users/nsoranzo/received_events","type":"User","site_admin":false},"body":"s/Following/The following/","created_at":"2016-08-09T18:07:42Z","updated_at":"2016-08-09T18:07:42Z","html_url":"https://github.com/galaxyproject/galaxy/pull/2759#discussion_r74112824","pull_request_url":"https://api.github.com/repos/galaxyproject/galaxy/pulls/2759","_links":{"self":{"href":"https://api.github.com/repos/galaxyproject/galaxy/pulls/comments/74112824"},"html":{"href":"https://github.com/galaxyproject/galaxy/pull/2759#discussion_r74112824"},"pull_request":{"href":"https://api.github.com/repos/galaxyproject/galaxy/pulls/2759"}}},"pull_request":{"url":"https://api.github.com/repos/galaxyproject/galaxy/pulls/2759","id":80662423,"html_url":"https://github.com/galaxyproject/galaxy/pull/2759","diff_url":"https://github.com/galaxyproject/galaxy/pull/2759.diff","patch_url":"https://github.com/galaxyproject/galaxy/pull/2759.patch","issue_url":"https://api.github.com/repos/galaxyproject/galaxy/issues/2759","number":2759,"state":"open","locked":false,"title":"[16.07] enable conda_auto_init in sample, adjust wording","user":{"login":"martenson","id":1814954,"avatar_url":"https://avatars.githubusercontent.com/u/1814954?v=3","gravatar_id":"","url":"https://api.github.com/users/martenson","html_url":"https://github.com/martenson","followers_url":"https://api.github.com/users/martenson/followers","following_url":"https://api.github.com/users/martenson/following{/other_user}","gists_url":"https://api.github.com/users/martenson/gists{/gist_id}","starred_url":"https://api.github.com/users/martenson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/martenson/subscriptions","organizations_url":"https://api.github.com/users/martenson/orgs","repos_url":"https://api.github.com/users/martenson/repos","events_url":"https://api.github.com/users/martenson/events{/privacy}","received_events_url":"https://api.github.com/users/martenson/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-08-09T17:35:52Z","updated_at":"2016-08-09T18:07:42Z","closed_at":null,"merged_at":null,"merge_commit_sha":"3ae1d010910f28a304fdcc2e762eb05acbbc7c6f","assignee":null,"assignees":[],"milestone":{"url":"https://api.github.com/repos/galaxyproject/galaxy/milestones/4","html_url":"https://github.com/galaxyproject/galaxy/milestones/16.07","labels_url":"https://api.github.com/repos/galaxyproject/galaxy/milestones/4/labels","id":1682545,"number":4,"title":"16.07","description":"Tentative freeze date for Galaxy 16.07","creator":{"login":"martenson","id":1814954,"avatar_url":"https://avatars.githubusercontent.com/u/1814954?v=3","gravatar_id":"","url":"https://api.github.com/users/martenson","html_url":"https://github.com/martenson","followers_url":"https://api.github.com/users/martenson/followers","following_url":"https://api.github.com/users/martenson/following{/other_user}","gists_url":"https://api.github.com/users/martenson/gists{/gist_id}","starred_url":"https://api.github.com/users/martenson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/martenson/subscriptions","organizations_url":"https://api.github.com/users/martenson/orgs","repos_url":"https://api.github.com/users/martenson/repos","events_url":"https://api.github.com/users/martenson/events{/privacy}","received_events_url":"https://api.github.com/users/martenson/received_events","type":"User","site_admin":false},"open_issues":3,"closed_issues":258,"state":"open","created_at":"2016-04-04T17:04:06Z","updated_at":"2016-08-09T17:35:52Z","due_on":"2016-07-11T04:00:00Z","closed_at":null},"commits_url":"https://api.github.com/repos/galaxyproject/galaxy/pulls/2759/commits","review_comments_url":"https://api.github.com/repos/galaxyproject/galaxy/pulls/2759/comments","review_comment_url":"https://api.github.com/repos/galaxyproject/galaxy/pulls/comments{/number}","comments_url":"https://api.github.com/repos/galaxyproject/galaxy/issues/2759/comments","statuses_url":"https://api.github.com/repos/galaxyproject/galaxy/statuses/9d467ddd5204deafb3a0dadae7813691e24c7c3c","head":{"label":"martenson:conda_config","ref":"conda_config","sha":"9d467ddd5204deafb3a0dadae7813691e24c7c3c","user":{"login":"martenson","id":1814954,"avatar_url":"https://avatars.githubusercontent.com/u/1814954?v=3","gravatar_id":"","url":"https://api.github.com/users/martenson","html_url":"https://github.com/martenson","followers_url":"https://api.github.com/users/martenson/followers","following_url":"https://api.github.com/users/martenson/following{/other_user}","gists_url":"https://api.github.com/users/martenson/gists{/gist_id}","starred_url":"https://api.github.com/users/martenson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/martenson/subscriptions","organizations_url":"https://api.github.com/users/martenson/orgs","repos_url":"https://api.github.com/users/martenson/repos","events_url":"https://api.github.com/users/martenson/events{/privacy}","received_events_url":"https://api.github.com/users/martenson/received_events","type":"User","site_admin":false},"repo":{"id":31214227,"name":"galaxy","full_name":"martenson/galaxy","owner":{"login":"martenson","id":1814954,"avatar_url":"https://avatars.githubusercontent.com/u/1814954?v=3","gravatar_id":"","url":"https://api.github.com/users/martenson","html_url":"https://github.com/martenson","followers_url":"https://api.github.com/users/martenson/followers","following_url":"https://api.github.com/users/martenson/following{/other_user}","gists_url":"https://api.github.com/users/martenson/gists{/gist_id}","starred_url":"https://api.github.com/users/martenson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/martenson/subscriptions","organizations_url":"https://api.github.com/users/martenson/orgs","repos_url":"https://api.github.com/users/martenson/repos","events_url":"https://api.github.com/users/martenson/events{/privacy}","received_events_url":"https://api.github.com/users/martenson/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/martenson/galaxy","description":"Data intensive biology for everyone.","fork":true,"url":"https://api.github.com/repos/martenson/galaxy","forks_url":"https://api.github.com/repos/martenson/galaxy/forks","keys_url":"https://api.github.com/repos/martenson/galaxy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/martenson/galaxy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/martenson/galaxy/teams","hooks_url":"https://api.github.com/repos/martenson/galaxy/hooks","issue_events_url":"https://api.github.com/repos/martenson/galaxy/issues/events{/number}","events_url":"https://api.github.com/repos/martenson/galaxy/events","assignees_url":"https://api.github.com/repos/martenson/galaxy/assignees{/user}","branches_url":"https://api.github.com/repos/martenson/galaxy/branches{/branch}","tags_url":"https://api.github.com/repos/martenson/galaxy/tags","blobs_url":"https://api.github.com/repos/martenson/galaxy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/martenson/galaxy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/martenson/galaxy/git/refs{/sha}","trees_url":"https://api.github.com/repos/martenson/galaxy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/martenson/galaxy/statuses/{sha}","languages_url":"https://api.github.com/repos/martenson/galaxy/languages","stargazers_url":"https://api.github.com/repos/martenson/galaxy/stargazers","contributors_url":"https://api.github.com/repos/martenson/galaxy/contributors","subscribers_url":"https://api.github.com/repos/martenson/galaxy/subscribers","subscription_url":"https://api.github.com/repos/martenson/galaxy/subscription","commits_url":"https://api.github.com/repos/martenson/galaxy/commits{/sha}","git_commits_url":"https://api.github.com/repos/martenson/galaxy/git/commits{/sha}","comments_url":"https://api.github.com/repos/martenson/galaxy/comments{/number}","issue_comment_url":"https://api.github.com/repos/martenson/galaxy/issues/comments{/number}","contents_url":"https://api.github.com/repos/martenson/galaxy/contents/{+path}","compare_url":"https://api.github.com/repos/martenson/galaxy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/martenson/galaxy/merges","archive_url":"https://api.github.com/repos/martenson/galaxy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/martenson/galaxy/downloads","issues_url":"https://api.github.com/repos/martenson/galaxy/issues{/number}","pulls_url":"https://api.github.com/repos/martenson/galaxy/pulls{/number}","milestones_url":"https://api.github.com/repos/martenson/galaxy/milestones{/number}","notifications_url":"https://api.github.com/repos/martenson/galaxy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/martenson/galaxy/labels{/name}","releases_url":"https://api.github.com/repos/martenson/galaxy/releases{/id}","deployments_url":"https://api.github.com/repos/martenson/galaxy/deployments","created_at":"2015-02-23T15:32:46Z","updated_at":"2016-01-26T21:56:07Z","pushed_at":"2016-08-09T17:35:00Z","git_url":"git://github.com/martenson/galaxy.git","ssh_url":"git@github.com:martenson/galaxy.git","clone_url":"https://github.com/martenson/galaxy.git","svn_url":"https://github.com/martenson/galaxy","homepage":"https://usegalaxy.org/","size":139518,"stargazers_count":0,"watchers_count":0,"language":"Python","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":"dev"}},"base":{"label":"galaxyproject:release_16.07","ref":"release_16.07","sha":"a297a0467116f007dcd7b952fd64c4caa2048492","user":{"login":"galaxyproject","id":7937847,"avatar_url":"https://avatars.githubusercontent.com/u/7937847?v=3","gravatar_id":"","url":"https://api.github.com/users/galaxyproject","html_url":"https://github.com/galaxyproject","followers_url":"https://api.github.com/users/galaxyproject/followers","following_url":"https://api.github.com/users/galaxyproject/following{/other_user}","gists_url":"https://api.github.com/users/galaxyproject/gists{/gist_id}","starred_url":"https://api.github.com/users/galaxyproject/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/galaxyproject/subscriptions","organizations_url":"https://api.github.com/users/galaxyproject/orgs","repos_url":"https://api.github.com/users/galaxyproject/repos","events_url":"https://api.github.com/users/galaxyproject/events{/privacy}","received_events_url":"https://api.github.com/users/galaxyproject/received_events","type":"Organization","site_admin":false},"repo":{"id":31211061,"name":"galaxy","full_name":"galaxyproject/galaxy","owner":{"login":"galaxyproject","id":7937847,"avatar_url":"https://avatars.githubusercontent.com/u/7937847?v=3","gravatar_id":"","url":"https://api.github.com/users/galaxyproject","html_url":"https://github.com/galaxyproject","followers_url":"https://api.github.com/users/galaxyproject/followers","following_url":"https://api.github.com/users/galaxyproject/following{/other_user}","gists_url":"https://api.github.com/users/galaxyproject/gists{/gist_id}","starred_url":"https://api.github.com/users/galaxyproject/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/galaxyproject/subscriptions","organizations_url":"https://api.github.com/users/galaxyproject/orgs","repos_url":"https://api.github.com/users/galaxyproject/repos","events_url":"https://api.github.com/users/galaxyproject/events{/privacy}","received_events_url":"https://api.github.com/users/galaxyproject/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/galaxyproject/galaxy","description":"Data intensive science for everyone.","fork":false,"url":"https://api.github.com/repos/galaxyproject/galaxy","forks_url":"https://api.github.com/repos/galaxyproject/galaxy/forks","keys_url":"https://api.github.com/repos/galaxyproject/galaxy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/galaxyproject/galaxy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/galaxyproject/galaxy/teams","hooks_url":"https://api.github.com/repos/galaxyproject/galaxy/hooks","issue_events_url":"https://api.github.com/repos/galaxyproject/galaxy/issues/events{/number}","events_url":"https://api.github.com/repos/galaxyproject/galaxy/events","assignees_url":"https://api.github.com/repos/galaxyproject/galaxy/assignees{/user}","branches_url":"https://api.github.com/repos/galaxyproject/galaxy/branches{/branch}","tags_url":"https://api.github.com/repos/galaxyproject/galaxy/tags","blobs_url":"https://api.github.com/repos/galaxyproject/galaxy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/galaxyproject/galaxy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/galaxyproject/galaxy/git/refs{/sha}","trees_url":"https://api.github.com/repos/galaxyproject/galaxy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/galaxyproject/galaxy/statuses/{sha}","languages_url":"https://api.github.com/repos/galaxyproject/galaxy/languages","stargazers_url":"https://api.github.com/repos/galaxyproject/galaxy/stargazers","contributors_url":"https://api.github.com/repos/galaxyproject/galaxy/contributors","subscribers_url":"https://api.github.com/repos/galaxyproject/galaxy/subscribers","subscription_url":"https://api.github.com/repos/galaxyproject/galaxy/subscription","commits_url":"https://api.github.com/repos/galaxyproject/galaxy/commits{/sha}","git_commits_url":"https://api.github.com/repos/galaxyproject/galaxy/git/commits{/sha}","comments_url":"https://api.github.com/repos/galaxyproject/galaxy/comments{/number}","issue_comment_url":"https://api.github.com/repos/galaxyproject/galaxy/issues/comments{/number}","contents_url":"https://api.github.com/repos/galaxyproject/galaxy/contents/{+path}","compare_url":"https://api.github.com/repos/galaxyproject/galaxy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/galaxyproject/galaxy/merges","archive_url":"https://api.github.com/repos/galaxyproject/galaxy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/galaxyproject/galaxy/downloads","issues_url":"https://api.github.com/repos/galaxyproject/galaxy/issues{/number}","pulls_url":"https://api.github.com/repos/galaxyproject/galaxy/pulls{/number}","milestones_url":"https://api.github.com/repos/galaxyproject/galaxy/milestones{/number}","notifications_url":"https://api.github.com/repos/galaxyproject/galaxy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/galaxyproject/galaxy/labels{/name}","releases_url":"https://api.github.com/repos/galaxyproject/galaxy/releases{/id}","deployments_url":"https://api.github.com/repos/galaxyproject/galaxy/deployments","created_at":"2015-02-23T14:18:06Z","updated_at":"2016-07-29T18:14:15Z","pushed_at":"2016-08-09T17:47:41Z","git_url":"git://github.com/galaxyproject/galaxy.git","ssh_url":"git@github.com:galaxyproject/galaxy.git","clone_url":"https://github.com/galaxyproject/galaxy.git","svn_url":"https://github.com/galaxyproject/galaxy","homepage":"https://galaxyproject.org/","size":174089,"stargazers_count":165,"watchers_count":165,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":241,"mirror_url":null,"open_issues_count":507,"forks":241,"open_issues":507,"watchers":165,"default_branch":"dev"}},"_links":{"self":{"href":"https://api.github.com/repos/galaxyproject/galaxy/pulls/2759"},"html":{"href":"https://github.com/galaxyproject/galaxy/pull/2759"},"issue":{"href":"https://api.github.com/repos/galaxyproject/galaxy/issues/2759"},"comments":{"href":"https://api.github.com/repos/galaxyproject/galaxy/issues/2759/comments"},"review_comments":{"href":"https://api.github.com/repos/galaxyproject/galaxy/pulls/2759/comments"},"review_comment":{"href":"https://api.github.com/repos/galaxyproject/galaxy/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/galaxyproject/galaxy/pulls/2759/commits"},"statuses":{"href":"https://api.github.com/repos/galaxyproject/galaxy/statuses/9d467ddd5204deafb3a0dadae7813691e24c7c3c"}}}}
{"actor":{"display_login":"nsoranzo"}}