arvados.git
10 years agoMerge branch 'master' into 3609-arv-ws
Peter Amstutz [Thu, 16 Oct 2014 14:43:34 +0000 (10:43 -0400)]
Merge branch 'master' into 3609-arv-ws

10 years ago3609: Prefetch pipeline components to find out which jobs to subscribe to.
Peter Amstutz [Thu, 16 Oct 2014 13:30:48 +0000 (09:30 -0400)]
3609: Prefetch pipeline components to find out which jobs to subscribe to.

10 years agoMerge branch '4197-remove-enforce-permissions-check-from-index-handler'
mishaz [Wed, 15 Oct 2014 21:18:25 +0000 (21:18 +0000)]
Merge branch '4197-remove-enforce-permissions-check-from-index-handler'
Closes #4197

10 years ago3609: PollClient waits on event object instead of time.sleep, fix filters. Also...
Peter Amstutz [Wed, 15 Oct 2014 21:12:59 +0000 (17:12 -0400)]
3609: PollClient waits on event object instead of time.sleep, fix filters.  Also fix --poll-interval and --no-poll

10 years ago3609: Roll back schema change, not appropriate for this branch
Peter Amstutz [Wed, 15 Oct 2014 21:09:52 +0000 (17:09 -0400)]
3609: Roll back schema change, not appropriate for this branch

10 years agoModified IndexHandler to match TrashHandler and PullHandler
mishaz [Tue, 14 Oct 2014 22:11:40 +0000 (22:11 +0000)]
Modified IndexHandler to match TrashHandler and PullHandler
* No longer checks for the enforce-permissions flag.
* Still checks for DataManager auth token.
* The HTTP error returned when we don't find the DataManager auth token is now Unauthorized instead of Forbidden.

Modified tests to check for new behavior.

10 years agoResolve race condition: wait for response before checking mock expectations. refs...
Tom Clegg [Wed, 15 Oct 2014 20:59:07 +0000 (16:59 -0400)]
Resolve race condition: wait for response before checking mock expectations. refs #3782

10 years ago3609: Add test case for PollClient. arvados.event.subscribe() starts a new
Peter Amstutz [Wed, 15 Oct 2014 20:22:26 +0000 (16:22 -0400)]
3609: Add test case for PollClient.  arvados.event.subscribe() starts a new
polling thread by default so as to provide the same behavior as websockets.
Add documentation strings to ws.py command line parameters.

10 years ago3609: Fix schema so 'order' parameter of 'list' is an array instead of a string.
Peter Amstutz [Wed, 15 Oct 2014 20:20:04 +0000 (16:20 -0400)]
3609: Fix schema so 'order' parameter of 'list' is an array instead of a string.

10 years ago4196: arv-keepdocker uses Docker 1.0 pull syntax.
Brett Smith [Wed, 15 Oct 2014 13:22:40 +0000 (09:22 -0400)]
4196: arv-keepdocker uses Docker 1.0 pull syntax.

`docker pull -t` was the old way of pulling an image with a specific
tag.  Docker 1.0 introduced `docker pull repo:tag`, and Docker 1.2
removes support for `-t` completely.  We're well-standardized on 1.1+
at this point, and considering an upgrade to 1.2+, so now's the time
to switch.

Closes #4196.

10 years ago4126: API server uses fixed a-r-p-i (again).
Brett Smith [Tue, 14 Oct 2014 20:30:21 +0000 (16:30 -0400)]
4126: API server uses fixed a-r-p-i (again).

Refs #4126.

10 years ago4126: a-r-p-i dereferences parameter values when creating jobs.
Brett Smith [Tue, 14 Oct 2014 20:15:16 +0000 (16:15 -0400)]
4126: a-r-p-i dereferences parameter values when creating jobs.

Refs #4126.  This is required to run jobs.

10 years ago4126: API server uses fixed a-r-p-i.
Brett Smith [Tue, 14 Oct 2014 18:49:49 +0000 (14:49 -0400)]
4126: API server uses fixed a-r-p-i.

Refs #4126.

10 years agoMerge branch '3692-event-bus-fix-and' closes #3692
Peter Amstutz [Tue, 14 Oct 2014 15:41:02 +0000 (11:41 -0400)]
Merge branch '3692-event-bus-fix-and' closes #3692

10 years agoMerge branch '3656-arv-create' closes #3656
Peter Amstutz [Tue, 14 Oct 2014 15:33:31 +0000 (11:33 -0400)]
Merge branch '3656-arv-create' closes #3656

10 years ago3656: Delete unused documentation page
Peter Amstutz [Tue, 14 Oct 2014 15:32:38 +0000 (11:32 -0400)]
3656: Delete unused documentation page

10 years ago3656: Alphabetize list of subcommands. Rename tmp -> tmp_file. Small wording change...
Peter Amstutz [Tue, 14 Oct 2014 14:54:51 +0000 (10:54 -0400)]
3656: Alphabetize list of subcommands.  Rename tmp -> tmp_file.  Small wording change on doc pages.

10 years ago3692: Bug fix for inadequate grouping when constructing selection.
Peter Amstutz [Tue, 14 Oct 2014 14:40:36 +0000 (10:40 -0400)]
3692: Bug fix for inadequate grouping when constructing selection.

10 years agoMerge branch '4139-blocking-node-manager-tests-wip'
Brett Smith [Tue, 14 Oct 2014 14:19:41 +0000 (10:19 -0400)]
Merge branch '4139-blocking-node-manager-tests-wip'

Refs #2881, #4139.  Closes #4184.

10 years ago4139: Node Manager README links to compute node lifecycle page.
Brett Smith [Tue, 14 Oct 2014 14:18:49 +0000 (10:18 -0400)]
4139: Node Manager README links to compute node lifecycle page.

10 years ago4139: Speed up Node Manager tests.
Brett Smith [Mon, 13 Oct 2014 19:19:15 +0000 (15:19 -0400)]
4139: Speed up Node Manager tests.

Previously, the tests would poll interesting mocks, waiting for them
to be called.  This introduces significant overhead to the tests, and
they would frequently time out on Jenkins.  This modifies the tests to
get more information by blocking on the tested actors, which means
more predictability and less fighting for CPU (typical runtimes for
all the tests improved from 5 seconds to 0.5 seconds on my
workstation).

The downside to this approach is that it ties the tests more tightly
to the underlying actors' implementation.  In particular, they
sometimes send a message and block for a response to ensure that any
internal messages generated by the *last* message have been handled.
This is less than ideal, but I don't have a better idea right now.

10 years agoFix filters, subscribing to components of pipelines.
Peter Amstutz [Fri, 10 Oct 2014 20:47:07 +0000 (16:47 -0400)]
Fix filters, subscribing to components of pipelines.

10 years ago3692: Explicitly incorporate sequence number test into where clause
Peter Amstutz [Fri, 10 Oct 2014 20:14:15 +0000 (16:14 -0400)]
3692: Explicitly incorporate sequence number test into where clause

10 years agoWebsocket server side fix, perform database notify in after_save callback on
Peter Amstutz [Fri, 10 Oct 2014 19:43:52 +0000 (15:43 -0400)]
Websocket server side fix, perform database notify in after_save callback on
the log object instead of in log_change on ArvadosBase because crunch-dispatch
was creating Log objects directly and bypassing the notification in log_change.

10 years ago3609: Add some options to control polling fallback, improve error logging a bit.
Peter Amstutz [Fri, 10 Oct 2014 19:45:44 +0000 (15:45 -0400)]
3609: Add some options to control polling fallback, improve error logging a bit.

10 years agoWebsocket server side fix, perform database notify in after_save callback on
Peter Amstutz [Fri, 10 Oct 2014 19:43:52 +0000 (15:43 -0400)]
Websocket server side fix, perform database notify in after_save callback on
the log object instead of in log_change on ArvadosBase because crunch-dispatch
was creating Log objects directly and bypassing the notification in log_change.

10 years ago3609: Logging should work for jobs but running into a bug in eventbus
Peter Amstutz [Fri, 10 Oct 2014 15:25:48 +0000 (11:25 -0400)]
3609: Logging should work for jobs but running into a bug in eventbus

10 years ago3609: --job and --pipeline logging implemented, needs testing
Peter Amstutz [Fri, 10 Oct 2014 14:52:26 +0000 (10:52 -0400)]
3609: --job and --pipeline logging implemented, needs testing

10 years ago3609: Refactoring arv-ws into a reusable command module. Working on adding
Peter Amstutz [Fri, 10 Oct 2014 14:17:40 +0000 (10:17 -0400)]
3609: Refactoring arv-ws into a reusable command module.  Working on adding
ability to monitor pipeline/job log at command line.

10 years agocloses #4126
radhika [Fri, 10 Oct 2014 13:45:09 +0000 (09:45 -0400)]
closes #4126
Merge branch '4126-preserve-parameter-hash'

10 years ago3692: Fixed test, and fixed the actual bug
Peter Amstutz [Fri, 10 Oct 2014 12:52:27 +0000 (08:52 -0400)]
3692: Fixed test, and fixed the actual bug

10 years ago3656: Add missing file
Peter Amstutz [Thu, 9 Oct 2014 18:56:47 +0000 (14:56 -0400)]
3656: Add missing file

10 years ago4139: Add README to Node Manager.
Brett Smith [Thu, 9 Oct 2014 17:46:51 +0000 (13:46 -0400)]
4139: Add README to Node Manager.

Refs #4139.

10 years ago4139: Add *.egg to Node Manager's .gitignore.
Brett Smith [Thu, 9 Oct 2014 17:32:50 +0000 (13:32 -0400)]
4139: Add *.egg to Node Manager's .gitignore.

`python setup.py test` will automatically download dependencies to the
source directory if you don't already have them available in your
environment.  Refs #2881, #4139.

10 years ago4139: Add environment configuration knobs for Node Manager tests.
Brett Smith [Thu, 9 Oct 2014 17:31:47 +0000 (13:31 -0400)]
4139: Add environment configuration knobs for Node Manager tests.

These are settings I've fiddled with regularly over the course of
development, and now it looks like we're going to need to fiddle them
some more to accommodate Jenkins.  I'm exposing them as environment
variables so I can stop messing with the code appropriately.
Refs #4139.

10 years ago3656: Documentation updated to use "arv create".
Peter Amstutz [Thu, 9 Oct 2014 17:21:27 +0000 (13:21 -0400)]
3656: Documentation updated to use "arv create".

10 years ago3656: Support additional create parameters on the command line, only open
Peter Amstutz [Thu, 9 Oct 2014 15:37:39 +0000 (11:37 -0400)]
3656: Support additional create parameters on the command line, only open
editor on the object itself, should be less confusing.

10 years ago3656: Add arv-create command. Refactor run_editor to be shared by arv_edit and arv_c...
Peter Amstutz [Thu, 9 Oct 2014 15:04:43 +0000 (11:04 -0400)]
3656: Add arv-create command.  Refactor run_editor to be shared by arv_edit and arv_create.

10 years agoMerge branch '4042-run-command-MxN' closes #4042
Peter Amstutz [Thu, 9 Oct 2014 13:33:34 +0000 (09:33 -0400)]
Merge branch '4042-run-command-MxN' closes #4042

10 years ago4042: Typo fixes. Highlight run-command and script_parameters in text. Rename
Peter Amstutz [Thu, 9 Oct 2014 13:32:36 +0000 (09:32 -0400)]
4042: Typo fixes.  Highlight run-command and script_parameters in text.  Rename
--job-parameters to --script-parameters and add mention of --dry-run mode.

10 years agoUpdate install docs for keep→keepstore rename.
Brett Smith [Thu, 9 Oct 2014 13:20:38 +0000 (09:20 -0400)]
Update install docs for keep→keepstore rename.

No issue #.  Reported on #arvados.

10 years agoMerge branch '3381-job-progress-bar-bug' closes #3381
Peter Amstutz [Thu, 9 Oct 2014 13:15:30 +0000 (09:15 -0400)]
Merge branch '3381-job-progress-bar-bug' closes #3381

10 years ago3381: Fix layout comment
Peter Amstutz [Thu, 9 Oct 2014 13:14:56 +0000 (09:14 -0400)]
3381: Fix layout comment

10 years ago4126: undo the hash parameter retention logic for value
radhika [Thu, 9 Oct 2014 12:52:23 +0000 (08:52 -0400)]
4126: undo the hash parameter retention logic for value

10 years agoMerge branch 'master' into 4126-preserve-parameter-hash
radhika [Wed, 8 Oct 2014 21:30:59 +0000 (17:30 -0400)]
Merge branch 'master' into 4126-preserve-parameter-hash

10 years ago4126: when parameter is a hash, use it as value if nothing else matches.
radhika [Wed, 8 Oct 2014 21:28:38 +0000 (17:28 -0400)]
4126: when parameter is a hash, use it as value if nothing else matches.

10 years agoMerge branch '2881-node-manager'
Brett Smith [Wed, 8 Oct 2014 20:52:44 +0000 (16:52 -0400)]
Merge branch '2881-node-manager'

Closes #2881, #4106.

10 years ago2881: Add Node Manager service.
Brett Smith [Fri, 3 Oct 2014 21:53:57 +0000 (17:53 -0400)]
2881: Add Node Manager service.

10 years agoUpdated examples.
Peter Amstutz [Wed, 8 Oct 2014 19:00:42 +0000 (15:00 -0400)]
Updated examples.

10 years agoMerge branch '4042-run-command-MxN' of git.curoverse.com:arvados into 4042-run-comman...
Peter Amstutz [Wed, 8 Oct 2014 18:50:12 +0000 (14:50 -0400)]
Merge branch '4042-run-command-MxN' of git.curoverse.com:arvados into 4042-run-command-MxN

# 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 ago4042: Update documentation samples. Small fix to dry-run to allow supplying custom...
Peter Amstutz [Wed, 8 Oct 2014 18:49:54 +0000 (14:49 -0400)]
4042: Update documentation samples.  Small fix to dry-run to allow supplying custom TASK_KEEPMOUNT.

10 years ago4042: Rename bad reuse of 'p' to 'match' in expand_item. Finish describing
Peter Amstutz [Wed, 8 Oct 2014 15:12:57 +0000 (11:12 -0400)]
4042: Rename bad reuse of 'p' to 'match' in expand_item.  Finish describing
$(task.outdir).  Clarify that list functions take a user parameter name.  Fix
other spelling and grammatical errors in documentation.

10 years agoMerge branch '4044-crunchstat-wait' refs #4044
Tom Clegg [Wed, 8 Oct 2014 14:58:31 +0000 (10:58 -0400)]
Merge branch '4044-crunchstat-wait' refs #4044

10 years ago4044: Merge branch 'master' into 4044-crunchstat-wait
Tom Clegg [Wed, 8 Oct 2014 14:58:23 +0000 (10:58 -0400)]
4044: Merge branch 'master' into 4044-crunchstat-wait

10 years ago4044: Add comments to "continue" statements.
Tom Clegg [Wed, 8 Oct 2014 14:58:11 +0000 (10:58 -0400)]
4044: Add comments to "continue" statements.

10 years ago3381: Reorganize _running_components to be clearer. Fixing workbench.
Peter Amstutz [Wed, 8 Oct 2014 14:45:35 +0000 (10:45 -0400)]
3381: Reorganize _running_components to be clearer.  Fixing workbench.

10 years ago4126: Preserve hash form when populating component parameters.
Tom Clegg [Wed, 8 Oct 2014 14:05:27 +0000 (10:05 -0400)]
4126: Preserve hash form when populating component parameters.

10 years agocloses #3990
radhika [Wed, 8 Oct 2014 13:58:44 +0000 (09:58 -0400)]
closes #3990
Merge branch '3990-owner-when-rerunning-pipeline'

10 years ago3990: minor test update
radhika [Wed, 8 Oct 2014 13:58:10 +0000 (09:58 -0400)]
3990: minor test update

10 years ago4044: Clean up channel and pipe usage.
Tom Clegg [Tue, 7 Oct 2014 20:24:15 +0000 (16:24 -0400)]
4044: Clean up channel and pipe usage.

* Remove code for using one goroutine to copy stdout and stderr from
  channels to pipes. Instead, copy stderr from channel to pipe in a
  simple goroutine, and use give the child our own Stdout to use (we
  don't use it ourselves anyway).

* Rename functions (OutputChannel -> CopyChanToPipe, ReadLineByLine ->
  CopyPipeToChan).

* Add "stop" channel to shut down polling loop when child process
  exits.

* Check for errors when opening cgroup stats files. Report errors
  instead of displaying bogus stats.

* Split main() into run() and a short main() with os.Exit logic, so
  deferred functions run regardless of exit path.

* Close dangling filehandle when cgroup_cidfile succeeds.

* Fix slight divide-by-zero opportunity when elapsed==0.

* Fix condition triggering the "could not read cid file" error
  message.

10 years agoMerge branch 'master' into 3990-owner-when-rerunning-pipeline
radhika [Tue, 7 Oct 2014 18:04:26 +0000 (14:04 -0400)]
Merge branch 'master' into 3990-owner-when-rerunning-pipeline

10 years agocloses #3882
radhika [Tue, 7 Oct 2014 18:02:35 +0000 (14:02 -0400)]
closes #3882
Merge branch '3882-cancel-already-cancelled-job'

10 years ago3882: update "after_validation :update_timestamps_when_state_changes" to "before_save...
radhika [Tue, 7 Oct 2014 17:55:32 +0000 (13:55 -0400)]
3882: update "after_validation :update_timestamps_when_state_changes" to "before_save :update_timestamps_when_state_changes",
and also add comple more test combinations around cancelled state.

10 years agoMerge branch 'master' into 3882-cancel-already-cancelled-job
radhika [Tue, 7 Oct 2014 17:29:01 +0000 (13:29 -0400)]
Merge branch 'master' into 3882-cancel-already-cancelled-job

10 years agoMerge branch 'master' into 3990-owner-when-rerunning-pipeline
radhika [Tue, 7 Oct 2014 17:26:18 +0000 (13:26 -0400)]
Merge branch 'master' into 3990-owner-when-rerunning-pipeline

10 years ago3990: rerunning pipeline from within a project with no write permission
radhika [Tue, 7 Oct 2014 17:17:33 +0000 (13:17 -0400)]
3990: rerunning pipeline from within a project with no write permission

10 years agoMerge branch '3775-fetch-git-repo' closes #3775
Tom Clegg [Tue, 7 Oct 2014 16:04:34 +0000 (12:04 -0400)]
Merge branch '3775-fetch-git-repo' closes #3775

Conflicts:
sdk/cli/bin/crunch-job

10 years agoMerge branch 'master' into 3990-owner-when-rerunning-pipeline
radhika [Tue, 7 Oct 2014 14:42:57 +0000 (10:42 -0400)]
Merge branch 'master' into 3990-owner-when-rerunning-pipeline

10 years ago3990: add integration tests to rerun pipeline.
radhika [Tue, 7 Oct 2014 14:41:30 +0000 (10:41 -0400)]
3990: add integration tests to rerun pipeline.

10 years agoMerge branch '4012-crunch-job-api-retries-wip'
Brett Smith [Tue, 7 Oct 2014 13:44:15 +0000 (09:44 -0400)]
Merge branch '4012-crunch-job-api-retries-wip'

Closes #4012.

10 years ago4012: crunch-job retries all API operations.
Brett Smith [Tue, 7 Oct 2014 13:35:11 +0000 (09:35 -0400)]
4012: crunch-job retries all API operations.

This will make jobs more robust against transient errors when talking
to the API server.

10 years ago3775: Fix SDK usage.
Tom Clegg [Tue, 7 Oct 2014 03:24:53 +0000 (23:24 -0400)]
3775: Fix SDK usage.

10 years ago3775: Update comment
Tom Clegg [Tue, 7 Oct 2014 03:07:35 +0000 (23:07 -0400)]
3775: Update comment

10 years ago3775: Update comment
Tom Clegg [Tue, 7 Oct 2014 02:16:56 +0000 (22:16 -0400)]
3775: Update comment

10 years ago3775: Update perlpod. Use items_available. Be more conservative when
Tom Clegg [Tue, 7 Oct 2014 02:06:50 +0000 (22:06 -0400)]
3775: Update perlpod. Use items_available. Be more conservative when
using already-cached commit sha1s, expand related comment. Move "skip
if not possible now" checks into subroutines.

10 years agoMerge branch 'master' into 3990-owner-when-rerunning-pipeline
radhika [Mon, 6 Oct 2014 23:54:15 +0000 (19:54 -0400)]
Merge branch 'master' into 3990-owner-when-rerunning-pipeline

10 years ago3990: refactor pipeline instances integration test to reuse logic that creates and...
radhika [Mon, 6 Oct 2014 23:50:19 +0000 (19:50 -0400)]
3990: refactor pipeline instances integration test to reuse logic that creates and runs a pipeline.

10 years agoMerge branch '3828-keepproxy-race' closes #3828
Tom Clegg [Mon, 6 Oct 2014 21:55:57 +0000 (17:55 -0400)]
Merge branch '3828-keepproxy-race' closes #3828

10 years ago3634: Update user setup tests for preserved tab state.
Brett Smith [Mon, 6 Oct 2014 21:36:31 +0000 (17:36 -0400)]
3634: Update user setup tests for preserved tab state.

These tests assume that the page reloads after submitting Ajax
dialogs.  They started failing when we started preserving tab state.
Update the tests to expressly refresh the page.  Future improvements
might find a solution with lower overhead.

Refs #3634.

10 years agoMerge branch '3775-fetch-git-repo' closes #3775
Tom Clegg [Mon, 6 Oct 2014 21:25:02 +0000 (17:25 -0400)]
Merge branch '3775-fetch-git-repo' closes #3775

10 years ago3775: Set state=Running when creating a Job in local mode.
Tom Clegg [Mon, 6 Oct 2014 21:21:25 +0000 (17:21 -0400)]
3775: Set state=Running when creating a Job in local mode.

10 years ago3775: Merge branch 'master' into 3775-fetch-git-repo
Tom Clegg [Mon, 6 Oct 2014 21:13:17 +0000 (17:13 -0400)]
3775: Merge branch 'master' into 3775-fetch-git-repo

Conflicts:
sdk/cli/bin/crunch-job

10 years ago4042: When listing directory, return list of absolute paths
Peter Amstutz [Mon, 6 Oct 2014 20:30:29 +0000 (16:30 -0400)]
4042: When listing directory, return list of absolute paths

10 years ago3990: set owner_uuid of a copied pipeline instance to that of the source, provided...
radhika [Mon, 6 Oct 2014 20:27:25 +0000 (16:27 -0400)]
3990: set owner_uuid of a copied pipeline instance to that of the source, provided it is a project and writable by the current user.

10 years ago3828: Wait for listener to start before connecting to it. Fix test
Tom Clegg [Mon, 6 Oct 2014 20:05:54 +0000 (16:05 -0400)]
3828: Wait for listener to start before connecting to it. Fix test
panic in listener.Close() when listener does not exist.

10 years ago3828: Use defer to close pidfile. Avoids leftover pidfile if Listen fails.
Tom Clegg [Mon, 6 Oct 2014 20:04:33 +0000 (16:04 -0400)]
3828: Use defer to close pidfile. Avoids leftover pidfile if Listen fails.

10 years ago3828: Remove duplicate "write pidfile" block.
Tom Clegg [Mon, 6 Oct 2014 19:56:17 +0000 (15:56 -0400)]
3828: Remove duplicate "write pidfile" block.

10 years agoarv-put parses arguments before instantiating an API client.
Brett Smith [Mon, 6 Oct 2014 19:16:23 +0000 (15:16 -0400)]
arv-put parses arguments before instantiating an API client.

This helps ensure that `--help` responds quickly even if the server is
slow or down.  No issue #.

10 years agoMerge branch '3634-tab-state' refs #3634
Phil Hodgson [Mon, 6 Oct 2014 19:11:19 +0000 (15:11 -0400)]
Merge branch '3634-tab-state' refs #3634

10 years ago3381: Merge job_status_label and job_progress into a single job_progress
Peter Amstutz [Mon, 6 Oct 2014 19:03:37 +0000 (15:03 -0400)]
3381: Merge job_status_label and job_progress into a single job_progress
partial.  This partial renders a progress bar if the job is running, otherwise
renders a label with the job state.  The progress bar now shows only 'done'
tasks and renders the progress bar in orange if any tasks have failed.  Move
"done, failure, running, todo" from panel body to panel heading on
running_component partial.  Dashboard now uses job_progress partial with
"scaleby" to indicate pipeline progress more precisely.

10 years agocloses #4046
radhika [Mon, 6 Oct 2014 18:55:10 +0000 (14:55 -0400)]
closes #4046
Merge branch '4046-job-queue-position'

10 years agoMerge branch 'master' into 3634-tab-state
Phil Hodgson [Mon, 6 Oct 2014 18:53:08 +0000 (14:53 -0400)]
Merge branch 'master' into 3634-tab-state

Conflicts (resolved):
apps/workbench/app/views/application/_title_and_buttons.html.erb

10 years agoMerge branch 'master' into 4046-job-queue-position
radhika [Mon, 6 Oct 2014 18:51:20 +0000 (14:51 -0400)]
Merge branch 'master' into 4046-job-queue-position

10 years ago3634: add anchor to URL when switching project tabs
Phil Hodgson [Mon, 6 Oct 2014 18:49:45 +0000 (14:49 -0400)]
3634: add anchor to URL when switching project tabs

10 years ago4046: update assert error message
radhika [Mon, 6 Oct 2014 18:47:43 +0000 (14:47 -0400)]
4046: update assert error message

10 years agoMerge branch '3782-stub-io-pipe' refs #3782
Tom Clegg [Mon, 6 Oct 2014 18:37:06 +0000 (14:37 -0400)]
Merge branch '3782-stub-io-pipe' refs #3782

10 years agoMerge branch 'master' into 4046-job-queue-position
radhika [Mon, 6 Oct 2014 18:30:52 +0000 (14:30 -0400)]
Merge branch 'master' into 4046-job-queue-position

10 years agoMerge branch '3825-crunch-pipe-to-arv-put-final'
Tim Pierce [Mon, 6 Oct 2014 18:22:00 +0000 (14:22 -0400)]
Merge branch '3825-crunch-pipe-to-arv-put-final'

Closes #3825.

10 years ago3825: code review
Tim Pierce [Mon, 6 Oct 2014 17:24:47 +0000 (13:24 -0400)]
3825: code review

* avoid overloading "output" (usually used for the output from a task or job than for diagnostic output from crunch)
** renamed:
*** start_output_log -> log_writer_start
*** write_output_log -> log_writer_send
*** finish_output_log -> log_writer_finish
*** output_log_is_active -> log_writer_is_active
* fixed missing semicolon

10 years ago3782: Merge branch 'master' into 3782-stub-io-pipe
Tom Clegg [Mon, 6 Oct 2014 17:56:30 +0000 (13:56 -0400)]
3782: Merge branch 'master' into 3782-stub-io-pipe