arvados.git
10 years agoWorking on re-using token per pipeline and expiring token when the pipeline is done.
Peter Amstutz [Fri, 21 Mar 2014 17:53:28 +0000 (13:53 -0400)]
Working on re-using token per pipeline and expiring token when the pipeline is done.

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Fri, 21 Mar 2014 17:02:28 +0000 (13:02 -0400)]
Merge branch 'master' of git.clinicalfuture.com:arvados

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Fri, 21 Mar 2014 16:57:04 +0000 (12:57 -0400)]
Merge branch 'master' of git.clinicalfuture.com:arvados

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

10 years agoMerge branch '2316-no-clear-tmp-flag'
Tom Clegg [Fri, 21 Mar 2014 16:56:08 +0000 (12:56 -0400)]
Merge branch '2316-no-clear-tmp-flag'

closes #2316
refs #2372

10 years agoMerge branch 'master' into 2316-no-clear-tmp-flag
Tom Clegg [Fri, 21 Mar 2014 16:55:29 +0000 (12:55 -0400)]
Merge branch 'master' into 2316-no-clear-tmp-flag

10 years agoworkbench: Bundle integration env bugfix.
Brett Smith [Fri, 21 Mar 2014 15:47:06 +0000 (11:47 -0400)]
workbench: Bundle integration env bugfix.

The previous version did not unpack arguments correctly.

10 years agoWhen running with WEBrick, auto-generate a new self-signed SSL
Ward Vandewege [Fri, 21 Mar 2014 15:36:25 +0000 (11:36 -0400)]
When running with WEBrick, auto-generate a new self-signed SSL
certificate for each run, rather than hardcoding a path to a certificate
and key file.

10 years agoworkbench: Expound Bundle+integration interaction.
Brett Smith [Fri, 21 Mar 2014 15:34:05 +0000 (11:34 -0400)]
workbench: Expound Bundle+integration interaction.

Unsurprisingly, I don't write my best code and comments when I'm
frantically trying to fix the build.

10 years agoworkbench: Make SERVER_PID_PATH a constant.
Brett Smith [Fri, 21 Mar 2014 15:16:14 +0000 (11:16 -0400)]
workbench: Make SERVER_PID_PATH a constant.

10 years agoworkbench: Tweak integration test environment.
Brett Smith [Fri, 21 Mar 2014 15:12:53 +0000 (11:12 -0400)]
workbench: Tweak integration test environment.

RUBYLIB and RUBYOPT seem to be necessary on the build server.

10 years agoworkbench: Improve API server integration launch.
Brett Smith [Fri, 21 Mar 2014 14:26:16 +0000 (10:26 -0400)]
workbench: Improve API server integration launch.

The previous version sometimes tried (and failed) to find the server
pid before rails wrote it.  This provides some limited retry, and
avoids spawning a subshell too.

10 years agoworkbench: Improve integration test environment.
Brett Smith [Fri, 21 Mar 2014 14:25:26 +0000 (10:25 -0400)]
workbench: Improve integration test environment.

Removing too much from the environment causes builds to fail in
Jenkins.  Instead of using a whitelist of environment variables, use a
blacklist of variables that Bundle modifies.

10 years agoFixes bug loading API tokens page.
Peter Amstutz [Fri, 21 Mar 2014 14:25:19 +0000 (10:25 -0400)]
Fixes bug loading API tokens page.
Added test using our new workbench testing framework to make sure it doesn't happen again.

10 years agoMerge branch '2288-integration-tests'
Brett Smith [Fri, 21 Mar 2014 13:05:29 +0000 (09:05 -0400)]
Merge branch '2288-integration-tests'

10 years agoworkbench: Fix typo in application.default.yml.
Brett Smith [Thu, 20 Mar 2014 21:26:48 +0000 (17:26 -0400)]
workbench: Fix typo in application.default.yml.

10 years agoworkbench: Make integration test settings default.
Brett Smith [Thu, 20 Mar 2014 21:24:24 +0000 (17:24 -0400)]
workbench: Make integration test settings default.

We know that these settings should work out of the box, given the
settings in the API server's `rails` script.  Making them the default
makes it easier to get the tests running.

10 years agoUse flock() to prevent sharing crunch-tmp with another job in local dev mode.
Tom Clegg [Thu, 20 Mar 2014 21:23:43 +0000 (17:23 -0400)]
Use flock() to prevent sharing crunch-tmp with another job in local dev mode.

10 years agoMerge branch '2193-fix-permissions-cache' (no functional changes, only unit tests)
Peter Amstutz [Thu, 20 Mar 2014 20:03:03 +0000 (16:03 -0400)]
Merge branch '2193-fix-permissions-cache' (no functional changes, only unit tests)

10 years agoMerge branch '2278-crunch-dispatcher-monitor-processes'
Peter Amstutz [Thu, 20 Mar 2014 19:38:24 +0000 (15:38 -0400)]
Merge branch '2278-crunch-dispatcher-monitor-processes'

10 years agoSilly git staging.
Peter Amstutz [Thu, 20 Mar 2014 19:32:10 +0000 (15:32 -0400)]
Silly git staging.

10 years ago- Made a note about intentionally not setting "success"
Peter Amstutz [Thu, 20 Mar 2014 19:23:56 +0000 (15:23 -0400)]
- Made a note about intentionally not setting "success"
- Changed if c[:job][:success] == false to elsif
- Changed == nil to .nil?
- Removed whitespace

10 years agoworkbench: Document integration test dependencies.
Brett Smith [Wed, 19 Mar 2014 18:50:21 +0000 (14:50 -0400)]
workbench: Document integration test dependencies.

This adds appropriate notes to the installation guide, and suggestions
to application.yml.example.

10 years agoworkbench: Add basic login integration tests.
Brett Smith [Wed, 19 Mar 2014 16:24:37 +0000 (12:24 -0400)]
workbench: Add basic login integration tests.

10 years agoworkbench: Add VM integration tests.
Brett Smith [Wed, 19 Mar 2014 16:10:51 +0000 (12:10 -0400)]
workbench: Add VM integration tests.

This is the "start test" that Ward suggested I implement to start off.
It's easy but not trivial: it requires JavaScript support and filling
out a form.

10 years agoworkbench: Use Poltergeist for integration tests.
Brett Smith [Wed, 19 Mar 2014 16:09:51 +0000 (12:09 -0400)]
workbench: Use Poltergeist for integration tests.

This is faster and will enable us to run integration tests on the
build server.

PhantomJS (http://phantomjs.org/) has to be installed in the $PATH for
this to work.

10 years agoworkbench: Add integration test helper module.
Brett Smith [Wed, 19 Mar 2014 15:44:49 +0000 (11:44 -0400)]
workbench: Add integration test helper module.

This provide a base test class that provides the Capybara DSL and a
couple of convenience methods.  It also specifies a test runner class
that sets up the API server consistently, with the proper environment.

10 years agoworkbench: Add Capybara gem for integration tests.
Brett Smith [Wed, 19 Mar 2014 15:42:30 +0000 (11:42 -0400)]
workbench: Add Capybara gem for integration tests.

10 years agojs: Add identifiers to X-Editable templates.
Brett Smith [Mon, 17 Mar 2014 18:48:02 +0000 (14:48 -0400)]
js: Add identifiers to X-Editable templates.

This gives the form elements name and id attributes, as appropriate.
This will make it easier for us to refer to them in integration tests.

10 years ago* Allow the system user to update job columns, even if the job is "locked"
Peter Amstutz [Mon, 17 Mar 2014 17:49:06 +0000 (13:49 -0400)]
* Allow the system user to update job columns, even if the job is "locked"
* Once the job process completes, automatically mark "job.running = false" and set "job.finished_at" if not set
* Exclude jobs from the queue where the "success" field is already set
* Consider a pipeline to be failed if any of the component jobs are marked as failed

10 years agoUse --no-clear-tmp flag to decide whether to remove of old temporary
Tom Clegg [Mon, 17 Mar 2014 16:56:57 +0000 (12:56 -0400)]
Use --no-clear-tmp flag to decide whether to remove of old temporary
directories, rather than deciding based on whether script_version is a
commit or a local directory.

10 years agoIntegration test for permission links.
Peter Amstutz [Fri, 14 Mar 2014 21:05:18 +0000 (17:05 -0400)]
Integration test for permission links.

10 years agoMerge remote-tracking branch 'origin/master' into 2075-workbench-paging
Peter Amstutz [Fri, 14 Mar 2014 17:57:40 +0000 (13:57 -0400)]
Merge remote-tracking branch 'origin/master' into 2075-workbench-paging

Conflicts:
services/api/app/controllers/arvados/v1/schema_controller.rb

10 years agoMerge branch '2257-inequality-conditions'
Tom Clegg [Fri, 14 Mar 2014 17:42:20 +0000 (13:42 -0400)]
Merge branch '2257-inequality-conditions'

closes #2257

10 years agoAdd "filters" param to discovery document, add deprecation note to
Tom Clegg [Fri, 14 Mar 2014 17:38:23 +0000 (13:38 -0400)]
Add "filters" param to discovery document, add deprecation note to
"where" param description.

10 years agoapi: Improve compute_node_domain handling.
Brett Smith [Fri, 14 Mar 2014 17:34:29 +0000 (13:34 -0400)]
api: Improve compute_node_domain handling.

The default value was causing test failures on my machine because the
ERB evaluated to an empty string.  And we want to avoid this causing
any DNS lookups during tests.  Now we make the default false (in line
with our other compute_node_* settings), and suggest a change in
application.yml.example to demonstrate how it should be set.

I also fixed up the example about compute_node_nameservers while I was
at it.

This closes #2351.

10 years agoMake integer attributes searchable, add test cases.
Tom Clegg [Fri, 14 Mar 2014 14:31:03 +0000 (10:31 -0400)]
Make integer attributes searchable, add test cases.

10 years agoMerge branch 'master' into 2257-inequality-conditions
Tom Clegg [Fri, 14 Mar 2014 14:17:46 +0000 (10:17 -0400)]
Merge branch 'master' into 2257-inequality-conditions

10 years agoAdded "Displaying X of Y out of Z"
Peter Amstutz [Fri, 14 Mar 2014 13:59:27 +0000 (09:59 -0400)]
Added "Displaying X of Y out of Z"
Improved links to adjacent pages

10 years ago* Added support for offset and limit query parameters (?limit=x&offset=y) to workbenc...
Peter Amstutz [Thu, 13 Mar 2014 21:07:46 +0000 (17:07 -0400)]
* Added support for offset and limit query parameters (?limit=x&offset=y) to workbench index pages.
* Created _paging partial for rendering forward/backward/jump to page N
* Added paging to generic index page, index pages for collections, pipeline instances, pipeline templates, groups.

10 years agoFilters out "show", "index" and "destroy" methods from discovery document generation...
Peter Amstutz [Thu, 13 Mar 2014 18:45:40 +0000 (14:45 -0400)]
Filters out "show", "index" and "destroy" methods from discovery document generation because they are
redundant with "get", "list" and "delete".

10 years agoAdded offset to 'list' method on resources.
Peter Amstutz [Thu, 13 Mar 2014 18:44:22 +0000 (14:44 -0400)]
Added offset to 'list' method on resources.
Added "offset" and "limit" fields to the response.
Removed "next_page_token" and "next_link" fields that were not being used.

10 years agoFix order of steps in install doc, add git_repositories_dir
Tom Clegg [Thu, 13 Mar 2014 15:49:46 +0000 (11:49 -0400)]
Fix order of steps in install doc, add git_repositories_dir
instructions, remove troublesome default config.

10 years agodoc: Make Workbench install guide up-to-date.
Brett Smith [Thu, 13 Mar 2014 16:28:25 +0000 (12:28 -0400)]
doc: Make Workbench install guide up-to-date.

* Configure the application with `application.yml` instead of
  `config/environments/*.rb`.

* Consistently capitalize Workbench.

10 years agoFormatting tweaking to look good on github.
Peter Amstutz [Thu, 13 Mar 2014 13:50:21 +0000 (09:50 -0400)]
Formatting tweaking to look good on github.

10 years agoAdded more links to information in README.
Peter Amstutz [Thu, 13 Mar 2014 13:48:29 +0000 (09:48 -0400)]
Added more links to information in README.

10 years agoAdded a README with pointers to the documentation, COPYING with license information...
Peter Amstutz [Thu, 13 Mar 2014 13:31:02 +0000 (09:31 -0400)]
Added a README with pointers to the documentation, COPYING with license information, the relevant licenses, as well as a license section to the user guide.

10 years agoFix crash in render_error(not_an_exception), and use raise() rather
Tom Clegg [Thu, 13 Mar 2014 04:17:06 +0000 (00:17 -0400)]
Fix crash in render_error(not_an_exception), and use raise() rather
than calling render_error() directly from ApplicationController#save
and #update

10 years agoAdd sqlite3 to Gemfile so database.yml.sample works unmodified
Tom Clegg [Thu, 13 Mar 2014 04:04:34 +0000 (00:04 -0400)]
Add sqlite3 to Gemfile so database.yml.sample works unmodified

10 years agoFix configured uuid_prefix and force_ssl getting overwritten by application.rb
Tom Clegg [Wed, 12 Mar 2014 22:11:15 +0000 (18:11 -0400)]
Fix configured uuid_prefix and force_ssl getting overwritten by application.rb

10 years agoRemove some stumbling blocks in default/example configs
Tom Clegg [Wed, 12 Mar 2014 22:10:32 +0000 (18:10 -0400)]
Remove some stumbling blocks in default/example configs

10 years agoFixed typo in secret_token.rb
Peter Amstutz [Thu, 13 Mar 2014 02:21:49 +0000 (22:21 -0400)]
Fixed typo in secret_token.rb

10 years agoUpdated workbench documentation.
Peter Amstutz [Thu, 13 Mar 2014 02:19:20 +0000 (22:19 -0400)]
Updated workbench documentation.

10 years agoWorking on improving install documentation.
Peter Amstutz [Thu, 13 Mar 2014 01:53:57 +0000 (21:53 -0400)]
Working on improving install documentation.

10 years agoAdded section on setting up SSO server
Peter Amstutz [Thu, 13 Mar 2014 01:08:33 +0000 (21:08 -0400)]
Added section on setting up SSO server

10 years agoAdds scopes: ["all"] when creating a new api client authorization, because database...
Peter Amstutz [Wed, 12 Mar 2014 19:29:18 +0000 (15:29 -0400)]
Adds scopes: ["all"] when creating a new api client authorization, because database schema does not permit have a null scopes column.

10 years agoReplaces postgres-specific 'now()' with standard SQL CURRENT_TIMESTAMP
Peter Amstutz [Wed, 12 Mar 2014 19:26:29 +0000 (15:26 -0400)]
Replaces postgres-specific 'now()' with standard SQL CURRENT_TIMESTAMP
Render checks that opts which are passed in are valid before trying to use it.

10 years agoURL change for the auth server.
Ward Vandewege [Wed, 12 Mar 2014 16:15:04 +0000 (12:15 -0400)]
URL change for the auth server.

10 years agoFix links to docs in workbench
Ward Vandewege [Tue, 11 Mar 2014 22:22:12 +0000 (18:22 -0400)]
Fix links to docs in workbench

10 years agoUpdate Gemfile to use latest arv-run-pipeline
Tom Clegg [Tue, 11 Mar 2014 20:50:05 +0000 (16:50 -0400)]
Update Gemfile to use latest arv-run-pipeline

10 years agoBump versions, change optional=false to required=true, set dataclass
Tom Clegg [Tue, 11 Mar 2014 20:29:18 +0000 (16:29 -0400)]
Bump versions, change optional=false to required=true, set dataclass
for bwa-aln input.

10 years agoFix giving up on a pipeline prematurely when a component is waiting
Tom Clegg [Tue, 11 Mar 2014 20:27:55 +0000 (16:27 -0400)]
Fix giving up on a pipeline prematurely when a component is waiting
for an output produced by a component later in the components.each()
loop.

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Tue, 11 Mar 2014 20:27:22 +0000 (16:27 -0400)]
Merge branch 'master' of git.clinicalfuture.com:arvados

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

10 years agoMerge branch '2107-update-documentation'
Peter Amstutz [Tue, 11 Mar 2014 20:26:59 +0000 (16:26 -0400)]
Merge branch '2107-update-documentation'

10 years agodoc: Note warning for get one collection block.
Brett Smith [Tue, 11 Mar 2014 20:12:11 +0000 (16:12 -0400)]
doc: Note warning for get one collection block.

Added per discussion with Tom.  We're also interested in fixing the
warning, but in the meantime, this is worth documenting.

10 years agodoc: Improve "How Keep Works" flow.
Brett Smith [Tue, 11 Mar 2014 20:08:19 +0000 (16:08 -0400)]
doc: Improve "How Keep Works" flow.

This addresses the fact that this page was broken off from the
original Keep tutorial page.

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Tim Pierce [Tue, 11 Mar 2014 19:53:33 +0000 (15:53 -0400)]
Merge branch 'master' of git.clinicalfuture.com:arvados

10 years agodoc: Make CLI pipeline run up-to-date.
Brett Smith [Tue, 11 Mar 2014 19:28:05 +0000 (15:28 -0400)]
doc: Make CLI pipeline run up-to-date.

This refreshes Keep hashes and the output format of `arv pipeline run`.

10 years agodoc: Improve flow of CLI pipeline run.
Brett Smith [Tue, 11 Mar 2014 19:26:52 +0000 (15:26 -0400)]
doc: Improve flow of CLI pipeline run.

The previous version assumed that we already had a static pipeline
template.  That's no longer true under the current flow, so instruct
the user to make one at the start of the tutorial.

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Tue, 11 Mar 2014 19:21:41 +0000 (15:21 -0400)]
Merge branch 'master' of git.clinicalfuture.com:arvados

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

10 years agoBugfixes to provenance graph:
Peter Amstutz [Tue, 11 Mar 2014 19:21:28 +0000 (15:21 -0400)]
Bugfixes to provenance graph:
* Fixed url generation to use correct protocol (http/https)
* Fixed generic node description
* Fixed direction of provenance graph

10 years agoReport error message and propagate exit code if subprocess.call() fails.
Tom Clegg [Tue, 11 Mar 2014 18:58:44 +0000 (14:58 -0400)]
Report error message and propagate exit code if subprocess.call() fails.

10 years agoUpdate instructions to use build.sh. (refs #2221)
Tim Pierce [Tue, 11 Mar 2014 18:48:49 +0000 (14:48 -0400)]
Update instructions to use build.sh. (refs #2221)

10 years agodoc: Consistent style in outside program tutorial.
Brett Smith [Tue, 11 Mar 2014 18:11:22 +0000 (14:11 -0400)]
doc: Consistent style in outside program tutorial.

10 years agodoc: Consistent style in new pipeline tutorial.
Brett Smith [Tue, 11 Mar 2014 18:04:39 +0000 (14:04 -0400)]
doc: Consistent style in new pipeline tutorial.

10 years agodoc: Small bugfixes for first pipeline template.
Brett Smith [Tue, 11 Mar 2014 17:50:08 +0000 (13:50 -0400)]
doc: Small bugfixes for first pipeline template.

10 years agoRan linkchecker and fixed links.
Peter Amstutz [Tue, 11 Mar 2014 18:34:58 +0000 (14:34 -0400)]
Ran linkchecker and fixed links.

10 years agoAdded liquid template to link to next and previous pages.
Peter Amstutz [Tue, 11 Mar 2014 18:18:12 +0000 (14:18 -0400)]
Added liquid template to link to next and previous pages.

10 years agoFix user_agreements/sign* routing again.
Tom Clegg [Tue, 11 Mar 2014 18:05:59 +0000 (14:05 -0400)]
Fix user_agreements/sign* routing again.

10 years agoFix route method on user_agreements/sign.
Tom Clegg [Tue, 11 Mar 2014 17:56:15 +0000 (13:56 -0400)]
Fix route method on user_agreements/sign.

10 years agodoc: Bold `you` in tutorial-parallel's job spec.
Brett Smith [Tue, 11 Mar 2014 16:33:55 +0000 (12:33 -0400)]
doc: Bold `you` in tutorial-parallel's job spec.

10 years agodoc: Fix hello-world-fixed.py name in job-debug.
Brett Smith [Tue, 11 Mar 2014 15:43:40 +0000 (11:43 -0400)]
doc: Fix hello-world-fixed.py name in job-debug.

10 years agodoc: Consistent style for `you` in job-debug.
Brett Smith [Tue, 11 Mar 2014 15:31:09 +0000 (11:31 -0400)]
doc: Consistent style for `you` in job-debug.

10 years agodoc: Update job1's expected output.
Brett Smith [Tue, 11 Mar 2014 15:24:07 +0000 (11:24 -0400)]
doc: Update job1's expected output.

Pete changed this script so that the output filename has a leading
`./`.  This commit updates the tutorial to match.

10 years agodoc: Highlight `you` in the first script job spec.
Brett Smith [Tue, 11 Mar 2014 16:05:50 +0000 (12:05 -0400)]
doc: Highlight `you` in the first script job spec.

10 years agodoc: Suggest setting User in .ssh/config.
Brett Smith [Tue, 11 Mar 2014 15:10:44 +0000 (11:10 -0400)]
doc: Suggest setting User in .ssh/config.

10 years agoUpdate comment to refer to correct default-config file.
Tom Clegg [Tue, 11 Mar 2014 17:28:49 +0000 (13:28 -0400)]
Update comment to refer to correct default-config file.

10 years agoFix left nav order in Install section.
Tom Clegg [Tue, 11 Mar 2014 17:03:45 +0000 (13:03 -0400)]
Fix left nav order in Install section.

10 years agoAdd api server package dependencies and update config instructions.
Tom Clegg [Tue, 11 Mar 2014 17:02:48 +0000 (13:02 -0400)]
Add api server package dependencies and update config instructions.

10 years agoRemoved h1. titles from pages because it is now part of the page template.
Peter Amstutz [Tue, 11 Mar 2014 16:36:11 +0000 (12:36 -0400)]
Removed h1. titles from pages because it is now part of the page template.

10 years agoMore documentation updates and reorganization.
Peter Amstutz [Tue, 11 Mar 2014 16:22:57 +0000 (12:22 -0400)]
More documentation updates and reorganization.

10 years agoRemove PYTHONPATH hack.
Tom Clegg [Tue, 11 Mar 2014 16:03:51 +0000 (12:03 -0400)]
Remove PYTHONPATH hack.

10 years agoFinished first draft of tutorial running pipeline from workbench.
Peter Amstutz [Tue, 11 Mar 2014 15:38:58 +0000 (11:38 -0400)]
Finished first draft of tutorial running pipeline from workbench.

10 years agoReorganizing documentation work in progress, checkpointing so that Brett can start...
Peter Amstutz [Tue, 11 Mar 2014 14:52:19 +0000 (10:52 -0400)]
Reorganizing documentation work in progress, checkpointing so that Brett can start looking through it.

10 years agoAdd instructions for installing with new versions of pip.
Tom Clegg [Tue, 11 Mar 2014 04:29:40 +0000 (00:29 -0400)]
Add instructions for installing with new versions of pip.

10 years agoFix namespace bug in write_directory_tree(max_manifest_depth=0).
Tom Clegg [Tue, 11 Mar 2014 04:07:40 +0000 (00:07 -0400)]
Fix namespace bug in write_directory_tree(max_manifest_depth=0).

10 years agoAdd python-pip to Python SDK install dependencies
Tom Clegg [Tue, 11 Mar 2014 01:02:35 +0000 (21:02 -0400)]
Add python-pip to Python SDK install dependencies

10 years agoAdd arvados-cli dependency to Gemfile.
Tom Clegg [Mon, 10 Mar 2014 23:54:10 +0000 (19:54 -0400)]
Add arvados-cli dependency to Gemfile.

10 years agoMerge branch '2042-new-collection-from-selected-files'
Peter Amstutz [Mon, 10 Mar 2014 21:08:46 +0000 (17:08 -0400)]
Merge branch '2042-new-collection-from-selected-files'

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Mon, 10 Mar 2014 21:04:48 +0000 (17:04 -0400)]
Merge branch 'master' of git.clinicalfuture.com:arvados

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

10 years agoRemoved out of order link to next tutorial.
Peter Amstutz [Mon, 10 Mar 2014 21:00:49 +0000 (17:00 -0400)]
Removed out of order link to next tutorial.