arvados.git
10 years ago3140: revert multiple content tabs work
radhika [Tue, 8 Jul 2014 00:44:36 +0000 (20:44 -0400)]
3140: revert multiple content tabs work

10 years agoadd 'import sys' to arvados-bcbio-nextgen. no issue #
Peter Amstutz [Mon, 7 Jul 2014 21:00:34 +0000 (17:00 -0400)]
add 'import sys' to arvados-bcbio-nextgen.  no issue #

10 years agoDon't use "arv" command wrapper, call arv-get/arv-put directly. Avoids
Peter Amstutz [Mon, 7 Jul 2014 20:54:17 +0000 (16:54 -0400)]
Don't use "arv" command wrapper, call arv-get/arv-put directly.  Avoids
dependency on arvados-cli gem being properly configured on compute node.
no issue #

10 years agoUpdate arvados-cli dependency to correct deployed version. no issue #
Peter Amstutz [Mon, 7 Jul 2014 20:34:14 +0000 (16:34 -0400)]
Update arvados-cli dependency to correct deployed version. no issue #

10 years agoMerge branch '3123-pipeline-report-job-submit-errors' closes #3123
Peter Amstutz [Mon, 7 Jul 2014 20:24:47 +0000 (16:24 -0400)]
Merge branch '3123-pipeline-report-job-submit-errors' closes #3123

10 years agoGoogle API client jsonifies the body, so we don't have to.
Peter Amstutz [Mon, 7 Jul 2014 20:24:04 +0000 (16:24 -0400)]
Google API client jsonifies the body, so we don't have to.

10 years agoUpdate package version dependencies on arvados-cli to use commit:7bd2ee2
Peter Amstutz [Mon, 7 Jul 2014 19:48:12 +0000 (15:48 -0400)]
Update package version dependencies on arvados-cli to use commit:7bd2ee2

10 years agoarv-run-pipeline-instance sends error message to logs table when job submission
Peter Amstutz [Mon, 7 Jul 2014 19:45:24 +0000 (15:45 -0400)]
arv-run-pipeline-instance sends error message to logs table when job submission
fails.  Pipeline instance view in workbench now shows messages for the pipeline
instance (in addition to the jobs) and shows messages when the pipeline is
failed (not only when it is running.)

10 years agocloses #3140
radhika [Mon, 7 Jul 2014 19:01:29 +0000 (15:01 -0400)]
closes #3140
Merge branch '3140-project-content-tabs'

10 years agocrunch-dispatch: make sure to update the info['slurm_state'] for the
Ward Vandewege [Mon, 7 Jul 2014 19:04:52 +0000 (15:04 -0400)]
crunch-dispatch: make sure to update the info['slurm_state'] for the
correct node, not just the first one that happens to have a matching
hostname in our database.

no issue #

10 years agoMerge branch 'master' into 3140-project-content-tabs
radhika [Mon, 7 Jul 2014 19:00:25 +0000 (15:00 -0400)]
Merge branch 'master' into 3140-project-content-tabs

10 years agoMerge branch 'master' into 3140-project-content-tabs
radhika [Mon, 7 Jul 2014 18:58:01 +0000 (14:58 -0400)]
Merge branch 'master' into 3140-project-content-tabs

10 years agoDon't render selection check boxes when using show_file partials from chooser
Peter Amstutz [Mon, 7 Jul 2014 18:22:48 +0000 (14:22 -0400)]
Don't render selection check boxes when using show_file partials from chooser
modal.  closes #3103.

10 years agoConsider script_parameters in determining whether to merge script boxes in
Peter Amstutz [Mon, 7 Jul 2014 18:09:20 +0000 (14:09 -0400)]
Consider script_parameters in determining whether to merge script boxes in
pipeline graph drawing.  Also tweaks behavior generating label for
script_parameter boxes to be more compact.  closes #3100

10 years agoDefault arvados-bcbio-nextgen pipeline to use freebayes instead of gatk. no issue #
Peter Amstutz [Mon, 7 Jul 2014 17:03:01 +0000 (13:03 -0400)]
Default arvados-bcbio-nextgen pipeline to use freebayes instead of gatk.  no issue #

10 years agoarvados-bcbio-nextgen writes output now. Put write_directory_tree under the
Peter Amstutz [Mon, 7 Jul 2014 15:46:56 +0000 (11:46 -0400)]
arvados-bcbio-nextgen writes output now.  Put write_directory_tree under the
try/except block in run-command.  Tweaked return code output.  no issue #

10 years agoBugfix os.environ() -> os.environ[] no issue #
Peter Amstutz [Mon, 7 Jul 2014 15:26:24 +0000 (11:26 -0400)]
Bugfix os.environ() -> os.environ[] no issue #

10 years agoMerge branch 'bcbio-nextgen' refs #2991
Peter Amstutz [Mon, 7 Jul 2014 13:46:11 +0000 (09:46 -0400)]
Merge branch 'bcbio-nextgen' refs #2991

10 years agoAdd -n cores to run bcbio in parallel on a multicore node.
Peter Amstutz [Mon, 7 Jul 2014 13:45:16 +0000 (09:45 -0400)]
Add -n cores to run bcbio in parallel on a multicore node.

10 years agoAdd $(node.cores) substitution to run-program, and add CRUNCH_NODE_SLOTS to
Peter Amstutz [Mon, 7 Jul 2014 13:32:33 +0000 (09:32 -0400)]
Add $(node.cores) substitution to run-program, and add CRUNCH_NODE_SLOTS to
environment passed to docker jobs. no issue #

10 years agorun-command retry after exception when writing output to keep. no issue #
Peter Amstutz [Mon, 7 Jul 2014 12:59:24 +0000 (08:59 -0400)]
run-command retry after exception when writing output to keep.  no issue #

10 years agoDoc: fix link to pipeline instances page in workbench.
Ward Vandewege [Mon, 7 Jul 2014 00:06:16 +0000 (20:06 -0400)]
Doc: fix link to pipeline instances page in workbench.

no issue #

10 years agoMerge branch '3185-job-invalid-without-errors' refs #3185
Peter Amstutz [Fri, 4 Jul 2014 21:08:39 +0000 (17:08 -0400)]
Merge branch '3185-job-invalid-without-errors' refs #3185

10 years ago3185: Fix job validation failure with no errors given.
Tom Clegg [Fri, 4 Jul 2014 17:01:28 +0000 (13:01 -0400)]
3185: Fix job validation failure with no errors given.

* Do not fail docker validation if runtime_constraints==nil.

* Reposition "check docker image" and "check script version" as
  validations, rather than before_validation and before_create/update
  filters respectively.

* Use valid values for the non-docker attributes in docker test cases.

* Add tests to ensure job validation failures provide error messages.

Move test/functional/arvados/v1/git_setup.rb to
test/helpers/git_test_helper.rb and fix bugs:

* Use "setup do" form instead of "def setup" to avoid clobbering other
  setup tasks

* Restore git_repositories_dir to its original value during teardown,
  to avoid polluting other tests

10 years agoUpdate api server Gemfile dependency on arvados-cli package so crunch-dispatch
Peter Amstutz [Fri, 4 Jul 2014 03:21:21 +0000 (23:21 -0400)]
Update api server Gemfile dependency on arvados-cli package so crunch-dispatch
uses commit:b7de0ac no issue #

10 years agoMerge branch '2991-job-docker-images' refs #2991
Peter Amstutz [Fri, 4 Jul 2014 02:54:21 +0000 (22:54 -0400)]
Merge branch '2991-job-docker-images' refs #2991

10 years agoMerge branch '2342-run-command-wrapper' refs #2342
Peter Amstutz [Fri, 4 Jul 2014 02:51:59 +0000 (22:51 -0400)]
Merge branch '2342-run-command-wrapper' refs #2342

10 years agoMerge branch '3141-keep-logging-improvements'
Ward Vandewege [Fri, 4 Jul 2014 02:30:44 +0000 (22:30 -0400)]
Merge branch '3141-keep-logging-improvements'

This closes #3141

10 years agokeep: MockVolume should return os.ErrNotExist instead of errors.New("not
Ward Vandewege [Fri, 4 Jul 2014 02:29:18 +0000 (22:29 -0400)]
keep: MockVolume should return os.ErrNotExist instead of errors.New("not
found") when a block can not be found, just like a real volume.

10 years agoRevert "Do not print an error when hitting 'not found' with a the MockVolume"
Ward Vandewege [Fri, 4 Jul 2014 02:28:45 +0000 (22:28 -0400)]
Revert "Do not print an error when hitting 'not found' with a the MockVolume"

This reverts commit 97c9b2b49f94735c6d4d5b62b772089ef7e0e3bf.

Better solution in the next commit.

10 years agoUpdate api server Gemfile dependency on arvados-cli package so crunch-dispatch uses...
Peter Amstutz [Fri, 4 Jul 2014 02:20:33 +0000 (22:20 -0400)]
Update api server Gemfile dependency on arvados-cli package so crunch-dispatch uses commit:66efe78 no issue #

10 years agoMerge branch 'master' into 3141-keep-logging-improvements
Ward Vandewege [Fri, 4 Jul 2014 02:19:54 +0000 (22:19 -0400)]
Merge branch 'master' into 3141-keep-logging-improvements

10 years agoDon't send null job creation parameters in arv-run-pipeline-instance. no issue #
Peter Amstutz [Fri, 4 Jul 2014 01:40:22 +0000 (21:40 -0400)]
Don't send null job creation parameters in arv-run-pipeline-instance.  no issue #

10 years agoDon't raise exception if filters parameter parses to
Peter Amstutz [Fri, 4 Jul 2014 01:37:20 +0000 (21:37 -0400)]
Don't raise exception if filters parameter parses to
json "null".  no issue #

10 years agoDon't set "too long" flag on websocket test timer if the websocket is already
Peter Amstutz [Fri, 4 Jul 2014 01:04:09 +0000 (21:04 -0400)]
Don't set "too long" flag on websocket test timer if the websocket is already
closed.  Hopefully this will make the tests more robust.  no issue #

10 years agoMerge branch 'master' into 3140-project-content-tabs
radhika [Fri, 4 Jul 2014 00:47:41 +0000 (20:47 -0400)]
Merge branch 'master' into 3140-project-content-tabs

10 years ago3140: add partials for all the content tabs
radhika [Fri, 4 Jul 2014 00:18:36 +0000 (20:18 -0400)]
3140: add partials for all the content tabs

10 years agooops
radhika [Fri, 4 Jul 2014 00:03:37 +0000 (20:03 -0400)]
oops

10 years agoUpdate api server Gemfile dependency on arvados-cli package so crunch-dispatch
Peter Amstutz [Thu, 3 Jul 2014 21:10:28 +0000 (17:10 -0400)]
Update api server Gemfile dependency on arvados-cli package so crunch-dispatch
uses commit:ee99af1
no issue #

10 years agoAdded note about how to build bcbio-nextgen docker image. Make
Peter Amstutz [Thu, 3 Jul 2014 21:08:07 +0000 (17:08 -0400)]
Added note about how to build bcbio-nextgen docker image.  Make
bcbio-nextgen-image depend on bcbio-nextgen/Dockerfile.

10 years agoMerge branch 'master' into 3140-project-content-tabs
radhika [Thu, 3 Jul 2014 20:55:43 +0000 (16:55 -0400)]
Merge branch 'master' into 3140-project-content-tabs

10 years agorefs #3055
radhika [Thu, 3 Jul 2014 20:47:28 +0000 (16:47 -0400)]
refs #3055
Merge branch '3055-advanced-tab-explanations'

10 years agoMerge branch 'master' into 3055-advanced-tab-explanations
radhika [Thu, 3 Jul 2014 20:46:30 +0000 (16:46 -0400)]
Merge branch 'master' into 3055-advanced-tab-explanations

10 years agoMerge branch 'master' into 3055-advanced-tab-explanations
radhika [Thu, 3 Jul 2014 20:45:08 +0000 (16:45 -0400)]
Merge branch 'master' into 3055-advanced-tab-explanations

10 years agojob create method parameters need to be converted to json before being passed
Peter Amstutz [Thu, 3 Jul 2014 20:38:59 +0000 (16:38 -0400)]
job create method parameters need to be converted to json before being passed
to google API client.  no issue #

10 years ago3140: add Other_objects to pane list
radhika [Thu, 3 Jul 2014 20:43:38 +0000 (16:43 -0400)]
3140: add Other_objects to pane list

10 years agoDo not blow up trying to run a job if runtime_constraints is set to nil
Ward Vandewege [Thu, 3 Jul 2014 19:03:17 +0000 (15:03 -0400)]
Do not blow up trying to run a job if runtime_constraints is set to nil

no issue #

10 years agoAdd some more detail to the docker installation page.
Ward Vandewege [Thu, 3 Jul 2014 18:32:36 +0000 (14:32 -0400)]
Add some more detail to the docker installation page.

refs #3131

10 years agoMerge branch '3174-arv-ls-size-fencepost' closes #3174
Tom Clegg [Thu, 3 Jul 2014 16:28:22 +0000 (12:28 -0400)]
Merge branch '3174-arv-ls-size-fencepost' closes #3174

10 years agoMerge branch '2873-permission-links-ownership'
Tim Pierce [Thu, 3 Jul 2014 15:45:47 +0000 (11:45 -0400)]
Merge branch '2873-permission-links-ownership'

Closes #2873. Huzzah!

10 years agoMerge branch '2985-shared-projects-descriptions'
Tim Pierce [Thu, 3 Jul 2014 15:38:32 +0000 (11:38 -0400)]
Merge branch '2985-shared-projects-descriptions'

Refs #2985, closes #3083, closes #3158.

10 years agoUpdate arvados-cli dependency of API server so crunch-dispatch.rb uses
Peter Amstutz [Thu, 3 Jul 2014 15:31:01 +0000 (11:31 -0400)]
Update arvados-cli dependency of API server so crunch-dispatch.rb uses
arv-run-pipeline-instance from commit:c806ef1
no issue #

10 years ago3174: Round up, not down, when reporting file sizes in KB.
Tom Clegg [Thu, 3 Jul 2014 15:11:48 +0000 (11:11 -0400)]
3174: Round up, not down, when reporting file sizes in KB.

10 years ago3174: Heed "common" section of config yaml the same way apiserver does.
Tom Clegg [Thu, 3 Jul 2014 15:10:35 +0000 (11:10 -0400)]
3174: Heed "common" section of config yaml the same way apiserver does.

10 years agoMerge remote-tracking branch 'origin/master' into job-docker-images
Peter Amstutz [Thu, 3 Jul 2014 15:05:14 +0000 (11:05 -0400)]
Merge remote-tracking branch 'origin/master' into job-docker-images

10 years agodocker: mkimage-debootstrap.sh: wrap which calls that are expected to
Ward Vandewege [Thu, 3 Jul 2014 15:03:09 +0000 (11:03 -0400)]
docker: mkimage-debootstrap.sh: wrap which calls that are expected to
fail in a set +e/set -e block

no issue #

10 years ago"filters" is now propagated through from pipeline component to the job
Peter Amstutz [Thu, 3 Jul 2014 14:53:53 +0000 (10:53 -0400)]
"filters" is now propagated through from pipeline component to the job
submission.  Also added example filter to documentation.  no issue #

10 years agoDocker job's $HOME is now inside docker container, we don't need a special
Peter Amstutz [Thu, 3 Jul 2014 14:51:03 +0000 (10:51 -0400)]
Docker job's $HOME is now inside docker container, we don't need a special
separate $HOME for arv-mount.

10 years ago3140: add additional content tabs to pane list
radhika [Thu, 3 Jul 2014 14:16:34 +0000 (10:16 -0400)]
3140: add additional content tabs to pane list

10 years ago3140: Move tab line buttons, remove show filtering widget
radhika [Thu, 3 Jul 2014 12:53:48 +0000 (08:53 -0400)]
3140: Move tab line buttons, remove show filtering widget

10 years ago2873: more code review changes
Tim Pierce [Thu, 3 Jul 2014 01:24:32 +0000 (21:24 -0400)]
2873: more code review changes

* get_permissions sets @offset and @limit explicitly to ensure that
  render_list does the right thing.

* Tests updated to use permission links on Groups (permissions are not
  yet working for other objects)

* Added tests for "uuid exists but is unreadable" and "uuid is readable
  but not manageable"

Refs #2873.

10 years agofix bwa_index
Peter Amstutz [Thu, 3 Jul 2014 00:34:20 +0000 (20:34 -0400)]
fix bwa_index

10 years agoBacked that out, make a symlink to tool-data instead
Peter Amstutz [Wed, 2 Jul 2014 20:48:38 +0000 (16:48 -0400)]
Backed that out, make a symlink to tool-data instead

10 years agotool-data in work
Peter Amstutz [Wed, 2 Jul 2014 20:41:57 +0000 (16:41 -0400)]
tool-data in work

10 years agofix sub R1 R2
Peter Amstutz [Wed, 2 Jul 2014 20:37:20 +0000 (16:37 -0400)]
fix sub R1 R2

10 years agorefer template directly
Peter Amstutz [Wed, 2 Jul 2014 20:35:35 +0000 (16:35 -0400)]
refer template directly

10 years agowrite template
Peter Amstutz [Wed, 2 Jul 2014 20:32:20 +0000 (16:32 -0400)]
write template

10 years agoopen for writing
Peter Amstutz [Wed, 2 Jul 2014 20:24:44 +0000 (16:24 -0400)]
open for writing

10 years agofix config copy
Peter Amstutz [Wed, 2 Jul 2014 20:23:45 +0000 (16:23 -0400)]
fix config copy

10 years agofixed syntax error
Peter Amstutz [Wed, 2 Jul 2014 20:22:38 +0000 (16:22 -0400)]
fixed syntax error

10 years agoFixed +x
Peter Amstutz [Wed, 2 Jul 2014 20:21:52 +0000 (16:21 -0400)]
Fixed +x

10 years agoFirst try at bcbio-nextgen script
Peter Amstutz [Wed, 2 Jul 2014 19:39:52 +0000 (15:39 -0400)]
First try at bcbio-nextgen script

10 years ago2985: display project descriptions inline
Tim Pierce [Wed, 2 Jul 2014 19:15:20 +0000 (15:15 -0400)]
2985: display project descriptions inline

Project descriptions in the "My Projects" and "Projects shared with
me" panels are displayed inline next to the project name, not in a
tooltip.

Refs #2985, refs #3083.

10 years agoImprove output messages a bit
Peter Amstutz [Wed, 2 Jul 2014 18:27:25 +0000 (14:27 -0400)]
Improve output messages a bit

10 years agoDo not mount $TASK_WORK inside the container; scratch space is entirely
Peter Amstutz [Wed, 2 Jul 2014 18:12:50 +0000 (14:12 -0400)]
Do not mount $TASK_WORK inside the container; scratch space is entirely
contained so it can be cleaned up by docker when the container is deleted.  Add
--rm=true to automatically clean up docker containers when they exit.

10 years agoMerge branch '3151-permission-ttl'
Tim Pierce [Wed, 2 Jul 2014 18:07:06 +0000 (14:07 -0400)]
Merge branch '3151-permission-ttl'

Closes #3151.

10 years ago3151: use 2-week default permission TTL
Tim Pierce [Wed, 2 Jul 2014 18:02:56 +0000 (14:02 -0400)]
3151: use 2-week default permission TTL

Fixes #3151.

10 years agoTypo fix ${HOME} -> $ENV{HOME}
Peter Amstutz [Wed, 2 Jul 2014 16:19:00 +0000 (12:19 -0400)]
Typo fix ${HOME} -> $ENV{HOME}

10 years ago3055: add explanation to the example commands in the advanced tab.
radhika [Wed, 2 Jul 2014 16:01:39 +0000 (12:01 -0400)]
3055: add explanation to the example commands in the advanced tab.

10 years agoShould probably wait to install ruby before setting GEM_HOME and friends.
Peter Amstutz [Wed, 2 Jul 2014 15:12:50 +0000 (11:12 -0400)]
Should probably wait to install ruby before setting GEM_HOME and friends.

10 years agoUse separate $HOME for commands run outside the docker
Peter Amstutz [Wed, 2 Jul 2014 14:54:48 +0000 (10:54 -0400)]
Use separate $HOME for commands run outside the docker
container (e.g. arv-mount) and commands inside the docker container because of
the user id mapping problem.  Converted docker command line to use long form
for readability.

10 years agoUse 'install' to create /keep, /tmp/crunch-src, /tmp/crunch-job mountpoints in
Peter Amstutz [Wed, 2 Jul 2014 14:52:41 +0000 (10:52 -0400)]
Use 'install' to create /keep, /tmp/crunch-src, /tmp/crunch-job mountpoints in
the docker image.  Changed some commands to use long command line parameters
for readability.

10 years agoMerge branch '3118-docker-fixes'
Ward Vandewege [Wed, 2 Jul 2014 14:37:36 +0000 (10:37 -0400)]
Merge branch '3118-docker-fixes'

refs #3118

10 years agoRemove superfluous cd commands
Ward Vandewege [Wed, 2 Jul 2014 14:36:18 +0000 (10:36 -0400)]
Remove superfluous cd commands

refs #3131

10 years agoFix up link in the docker alert box.
Ward Vandewege [Wed, 2 Jul 2014 14:35:20 +0000 (10:35 -0400)]
Fix up link in the docker alert box.

refs #3131

10 years agoThe linkchecker rake task should return with the exit code of linkchecker.
Ward Vandewege [Wed, 2 Jul 2014 14:28:34 +0000 (10:28 -0400)]
The linkchecker rake task should return with the exit code of linkchecker.

no issue #

10 years agoMerge branch '3118-docker-fixes'
Ward Vandewege [Wed, 2 Jul 2014 13:52:38 +0000 (09:52 -0400)]
Merge branch '3118-docker-fixes'

refs #3118

10 years agoAdd state of the docker installation alert to the top of the docker
Ward Vandewege [Wed, 2 Jul 2014 13:51:49 +0000 (09:51 -0400)]
Add state of the docker installation alert to the top of the docker
installation page, too.

10 years agoMerge branch 'master' into 3141-keep-logging-improvements
Ward Vandewege [Wed, 2 Jul 2014 13:51:00 +0000 (09:51 -0400)]
Merge branch 'master' into 3141-keep-logging-improvements

10 years ago2873: changes for code review
Tim Pierce [Wed, 2 Jul 2014 12:59:58 +0000 (08:59 -0400)]
2873: changes for code review

Incorporating code review comments:

* @Link#get_permissions@ uses @Link.where@ instead of @find_objects_for_index@; @find_object_for_uuid@ just populates @@object@ with the head_uuid object and leaves @@objects@ alone.
* @ArvadosModel.lookup_by_uuid@ renamed @ArvadosModel.find_by_uuid@ and punts to the superclass if called as a subclass method.
* Test @get_permissions_returns_list@ checks that the :active user can get permissions. Also uses the group fixtures for testing permissions instead of collections (because can_manage permissions only work so far on users and groups.

(refs #2873)

10 years agoDo not print an error when hitting 'not found' with a the MockVolume
Ward Vandewege [Wed, 2 Jul 2014 02:12:34 +0000 (22:12 -0400)]
Do not print an error when hitting 'not found' with a the MockVolume
backend.

10 years agoMove error logging for block-not-found from GetBlock to GetBlockHandler.
Ward Vandewege [Wed, 2 Jul 2014 01:27:34 +0000 (21:27 -0400)]
Move error logging for block-not-found from GetBlock to GetBlockHandler.

It doesn't belong in GetBlock because GetBlock is also called from
PutBlock, which checks to see if a block exists before it writes it
again.

In other words, in the most common scenario (a PUT of a new block), Keep
should not print a bogus error message.

10 years agoUnixVolume has no business being loud about files that can not be found.
Ward Vandewege [Wed, 2 Jul 2014 01:12:47 +0000 (21:12 -0400)]
UnixVolume has no business being loud about files that can not be found.
Just pass on the error to the caller and be quiet.

Back story: for every PUT, Keep checks if the block already exists.
Prior to this patch, UnixVolume would complain loudly if the block did
not already exist in the volume (i.e. the normal case for a PUT).

10 years agoChange crunch-dispatch to use "git fetch-pack --all" insted of "git fetch" to
Peter Amstutz [Tue, 1 Jul 2014 15:38:27 +0000 (11:38 -0400)]
Change crunch-dispatch to use "git fetch-pack --all" insted of "git fetch" to
fetch entire repository instead of just the history for HEAD.  This seems to be
the only way to ensure that arbitrary script version hashes not in the history
of the source's HEAD are fetched without using refs (tags or branches).
no issue #

10 years agoAdd documentation to doc.arvados.org for the local Docker install.
Ward Vandewege [Tue, 1 Jul 2014 20:38:11 +0000 (16:38 -0400)]
Add documentation to doc.arvados.org for the local Docker install.

10 years agoMerge branch 'master' into job-docker-images
Peter Amstutz [Wed, 2 Jul 2014 01:21:31 +0000 (21:21 -0400)]
Merge branch 'master' into job-docker-images

10 years agoAdd explicit version constraint < 1.0.0 on 'jwt' gem for arvados-cli, because
Peter Amstutz [Wed, 2 Jul 2014 01:21:12 +0000 (21:21 -0400)]
Add explicit version constraint < 1.0.0 on 'jwt' gem for arvados-cli, because
google-api-client gem dependecy breaks with jwt 1.0.0.  no issue #

10 years agoDockerfiles for java-bwa-samtools, bcbio-nextgen
Peter Amstutz [Tue, 1 Jul 2014 21:05:18 +0000 (17:05 -0400)]
Dockerfiles for java-bwa-samtools, bcbio-nextgen

10 years agoMerge branch '3118-docker-fixes'
Ward Vandewege [Tue, 1 Jul 2014 20:39:18 +0000 (16:39 -0400)]
Merge branch '3118-docker-fixes'

refs #3118

10 years agoMerge branch 'master' into 3118-docker-fixes
Ward Vandewege [Tue, 1 Jul 2014 20:38:47 +0000 (16:38 -0400)]
Merge branch 'master' into 3118-docker-fixes