arvados.git
9 years ago4044: Add comments to "continue" statements. 4044-crunchstat-wait
Tom Clegg [Wed, 8 Oct 2014 14:53:32 +0000 (10:53 -0400)]
4044: Add comments to "continue" statements.

9 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.

9 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

9 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.

9 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.

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

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

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

9 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.

9 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

9 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.

9 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

9 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.

9 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

9 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.

9 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.

9 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.

9 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 #.

9 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

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

9 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

9 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

9 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

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

9 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

9 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

9 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.

9 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

9 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

9 years agocloses #3583
radhika [Mon, 6 Oct 2014 17:50:11 +0000 (13:50 -0400)]
closes #3583
Merge branch '3583-provenance-graph-issue'

9 years agoMerge branch 'master' into 3583-provenance-graph-issue
radhika [Mon, 6 Oct 2014 17:49:33 +0000 (13:49 -0400)]
Merge branch 'master' into 3583-provenance-graph-issue

9 years agoMerge branch 'master' into 4046-job-queue-position
radhika [Mon, 6 Oct 2014 17:47:22 +0000 (13:47 -0400)]
Merge branch 'master' into 4046-job-queue-position

9 years ago4046: update queue_position method to increment index and add unit test.
radhika [Mon, 6 Oct 2014 17:45:58 +0000 (13:45 -0400)]
4046: update queue_position method to increment index and add unit test.

9 years ago3775: Recognize ssh short form without @ symbol. Expand comments.
Tom Clegg [Mon, 6 Oct 2014 17:40:18 +0000 (13:40 -0400)]
3775: Recognize ssh short form without @ symbol. Expand comments.

9 years agoMerge branch '3859-crunch-job-use-lock' closes #3859
Peter Amstutz [Mon, 6 Oct 2014 17:13:15 +0000 (13:13 -0400)]
Merge branch '3859-crunch-job-use-lock' closes #3859

9 years ago3782: Avoid using a huge read buffer when client requests a huge range. Add test.
Tom Clegg [Mon, 6 Oct 2014 17:10:39 +0000 (13:10 -0400)]
3782: Avoid using a huge read buffer when client requests a huge range. Add test.

9 years ago3782: Stub IO.pipe() with StringIO instead of stubbing content with KEEP_LOCAL_STORE.
Tom Clegg [Mon, 6 Oct 2014 16:40:12 +0000 (12:40 -0400)]
3782: Stub IO.pipe() with StringIO instead of stubbing content with KEEP_LOCAL_STORE.

9 years ago3782: Restore config settings changed during tests. (copied from API server)
Tom Clegg [Mon, 6 Oct 2014 16:00:50 +0000 (12:00 -0400)]
3782: Restore config settings changed during tests. (copied from API server)

9 years agoMerge branch '3687-grant-permission-on-repo-TC' closes #3687
Tom Clegg [Mon, 6 Oct 2014 15:51:49 +0000 (11:51 -0400)]
Merge branch '3687-grant-permission-on-repo-TC' closes #3687

9 years ago3687: Merge branch 'master' into 3687-grant-permission-on-repo-TC
Tom Clegg [Mon, 6 Oct 2014 15:15:05 +0000 (11:15 -0400)]
3687: Merge branch 'master' into 3687-grant-permission-on-repo-TC

9 years agocloses #4025
radhika [Mon, 6 Oct 2014 14:39:41 +0000 (10:39 -0400)]
closes #4025
Merge branch '4025-move-project-button-label'

9 years ago4025: Change the button label 'Move...' to 'Move <object_class>...' and update test...
radhika [Mon, 6 Oct 2014 14:23:49 +0000 (10:23 -0400)]
4025: Change the button label 'Move...' to 'Move <object_class>...' and update test assertion accordingly.

9 years agoMerge branch 'master' into 4025-move-project-button-label
radhika [Mon, 6 Oct 2014 14:18:12 +0000 (10:18 -0400)]
Merge branch 'master' into 4025-move-project-button-label

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

9 years ago3687: Add comment about redundant lookup.
Tom Clegg [Fri, 3 Oct 2014 23:59:00 +0000 (19:59 -0400)]
3687: Add comment about redundant lookup.

9 years ago3687: OK here just means this loop is OK, not everything is OK!
Tom Clegg [Fri, 3 Oct 2014 23:44:56 +0000 (19:44 -0400)]
3687: OK here just means this loop is OK, not everything is OK!

9 years ago3687: in User#can?, consider permission links with head_uuid pointing directly at...
Tom Clegg [Fri, 3 Oct 2014 21:41:54 +0000 (17:41 -0400)]
3687: in User#can?, consider permission links with head_uuid pointing directly at the target.

9 years agocloses #4036
radhika [Fri, 3 Oct 2014 21:22:09 +0000 (17:22 -0400)]
closes #4036
Merge branch '4036-combine-collections-in-project-issue'

9 years ago3687: add functional test for sharing within a group
Tim Pierce [Fri, 3 Oct 2014 18:48:34 +0000 (14:48 -0400)]
3687: add functional test for sharing within a group

Test that two unprivileged users in the same group can share collections.

9 years ago3634: If a link has the class "force-cache-reload", then on browser-back the page...
Phil Hodgson [Fri, 3 Oct 2014 16:42:27 +0000 (12:42 -0400)]
3634: If a link has the class "force-cache-reload", then on browser-back the page will be reloaded
(a modal will be shown to the user while the reload is occurring)

9 years ago3634: set the response to ask the browser nicely to never cache
Phil Hodgson [Fri, 3 Oct 2014 16:41:08 +0000 (12:41 -0400)]
3634: set the response to ask the browser nicely to never cache
(even though it will use its "bfcache" anyway for many cases)

9 years ago3775: Merge branch 'master' into 3775-fetch-git-repo
Tom Clegg [Fri, 3 Oct 2014 14:47:13 +0000 (10:47 -0400)]
3775: Merge branch 'master' into 3775-fetch-git-repo

9 years ago3775: Remove redundant log message.
Tom Clegg [Fri, 3 Oct 2014 14:42:23 +0000 (10:42 -0400)]
3775: Remove redundant log message.

9 years ago3775: Clean up reporting of exit codes: say "0 with signal 2", not "512".
Tom Clegg [Fri, 3 Oct 2014 14:41:32 +0000 (10:41 -0400)]
3775: Clean up reporting of exit codes: say "0 with signal 2", not "512".

9 years ago3775: Add TODO comments in suspicious-looking collate_output corners.
Tom Clegg [Fri, 3 Oct 2014 14:17:07 +0000 (10:17 -0400)]
3775: Add TODO comments in suspicious-looking collate_output corners.

9 years ago3775: Run local/dev jobs on code from arbitrary remote git repositories.
Tom Clegg [Fri, 3 Oct 2014 14:16:16 +0000 (10:16 -0400)]
3775: Run local/dev jobs on code from arbitrary remote git repositories.

* repository is a local path X -> use local repository X or X/.git.

* repository is a git url (git://, https://, git@host:repo.git, etc)
  fetch branches, tags, and objects from the remote and use the result
  to resolve script_version to a commit sha1 and run the job.

* else -> look up the named repository in Arvados and use its
  fetch_url as a remote git url as above.

* --git-dir is given on the command line -> use that instead of
  $Job->{repository} in the above logic. (This isn't new. It ensures
  we don't go off fetching arbitrary remotes when crunch-dispatch.rb
  has already pulled the code into its own internal git repo.)

Incidental changes:

* Lose support for looking up subversion revision numbers using
  git-svn tags.

* Lose support for CRUNCH_DEFAULT_GIT_DIR environment variable. Pass
  --git-dir instead.

* Improve log messages during checkout/install phase.

9 years ago4036: add comment for flash alert div
radhika [Fri, 3 Oct 2014 14:13:10 +0000 (10:13 -0400)]
4036: add comment for flash alert div

9 years agoMerge branch 'master' into 4036-combine-collections-in-project-issue
radhika [Fri, 3 Oct 2014 14:05:59 +0000 (10:05 -0400)]
Merge branch 'master' into 4036-combine-collections-in-project-issue

9 years ago3775: Remove stagnant $job_has_uuid flag. Every job has a uuid. The
Tom Clegg [Fri, 3 Oct 2014 13:42:33 +0000 (09:42 -0400)]
3775: Remove stagnant $job_has_uuid flag. Every job has a uuid. The
only time to skip updating the job record on the server side is when
croak() happens before $Job is created/fetched.

9 years ago3775: Fix syntax error 2 commits ago.
Tom Clegg [Fri, 3 Oct 2014 13:33:46 +0000 (09:33 -0400)]
3775: Fix syntax error 2 commits ago.

9 years agoMerge branch 'master' into 3634-tab-state
Phil Hodgson [Fri, 3 Oct 2014 12:35:06 +0000 (08:35 -0400)]
Merge branch 'master' into 3634-tab-state

9 years ago4025: add fa-fw to the newly added i tag class like all other such usages.
radhika [Fri, 3 Oct 2014 11:34:33 +0000 (07:34 -0400)]
4025: add fa-fw to the newly added i tag class like all other such usages.

9 years ago4205: add tooltips to pipeline instance tab line buttons
radhika [Fri, 3 Oct 2014 11:15:23 +0000 (07:15 -0400)]
4205: add tooltips to pipeline instance tab line buttons

9 years agoMerge branch 'master' into 4025-move-project-button-label
radhika [Fri, 3 Oct 2014 00:08:54 +0000 (20:08 -0400)]
Merge branch 'master' into 4025-move-project-button-label

9 years ago4025: add tooltips to some of the tab line buttons and also adjust the title of the...
radhika [Fri, 3 Oct 2014 00:07:11 +0000 (20:07 -0400)]
4025: add tooltips to some of the tab line buttons and also adjust the title of the "Move" button.

9 years ago3825: write log output directly to a pipe.
Tim Pierce [Thu, 2 Oct 2014 18:40:25 +0000 (14:40 -0400)]
3825: write log output directly to a pipe.

Added functions:
* start_output_log($logfilename)
* write_output_log($txt)
* finish_output_log()
* output_log_is_active()

Rewrote all code that referenced $local_logfile in terms of these
functions.

9 years agoMerge branch '3769-throttle-logs' closes #3769
Peter Amstutz [Thu, 2 Oct 2014 20:33:16 +0000 (16:33 -0400)]
Merge branch '3769-throttle-logs' closes #3769

9 years ago3769: Spelling fix and remove debugging puts.
Peter Amstutz [Thu, 2 Oct 2014 20:32:02 +0000 (16:32 -0400)]
3769: Spelling fix and remove debugging puts.

9 years ago4036: correct div class
radhika [Thu, 2 Oct 2014 19:13:26 +0000 (15:13 -0400)]
4036: correct div class

9 years ago3583: extend encode quotes logic for script parameters as well, just in case.
radhika [Thu, 2 Oct 2014 18:54:59 +0000 (14:54 -0400)]
3583: extend encode quotes logic for script parameters as well, just in case.

9 years agoMerge branch 'master' into 3583-provenance-graph-issue
radhika [Thu, 2 Oct 2014 16:19:54 +0000 (12:19 -0400)]
Merge branch 'master' into 3583-provenance-graph-issue

9 years ago4036: update the test that combines files from within a collection to expect the...
radhika [Thu, 2 Oct 2014 15:43:09 +0000 (11:43 -0400)]
4036: update the test that combines files from within a collection to expect the new collection in current project, if applicable and writable.

9 years ago3775: Merge branch 'master' into 3775-fetch-git-repo
Tom Clegg [Thu, 2 Oct 2014 15:13:19 +0000 (11:13 -0400)]
3775: Merge branch 'master' into 3775-fetch-git-repo

9 years agoMerge branch 'master' into 4036-combine-collections-in-project-issue
radhika [Thu, 2 Oct 2014 15:01:35 +0000 (11:01 -0400)]
Merge branch 'master' into 4036-combine-collections-in-project-issue

9 years ago4036: when files in a collection are combined, create the new collection in the origi...
radhika [Thu, 2 Oct 2014 14:59:50 +0000 (10:59 -0400)]
4036: when files in a collection are combined, create the new collection in the original collection's project, provided it is writable.

9 years agoMerge branch 'master' into 3769-throttle-logs
Peter Amstutz [Thu, 2 Oct 2014 14:52:47 +0000 (10:52 -0400)]
Merge branch 'master' into 3769-throttle-logs

Conflicts:
services/api/script/crunch-dispatch.rb

9 years agoMerge branch '3052-crunch-log-stdout' closes #3052
Peter Amstutz [Thu, 2 Oct 2014 14:51:36 +0000 (10:51 -0400)]
Merge branch '3052-crunch-log-stdout' closes #3052

9 years agoMerge branch 'master' into 3052-crunch-log-stdout
Peter Amstutz [Thu, 2 Oct 2014 14:46:37 +0000 (10:46 -0400)]
Merge branch 'master' into 3052-crunch-log-stdout

9 years ago3052: Change ruby style ruby style {:stderr => ''} to json style {stderr: ''}
Peter Amstutz [Thu, 2 Oct 2014 14:46:23 +0000 (10:46 -0400)]
3052: Change ruby style ruby style {:stderr => ''} to json style {stderr: ''}

9 years agoMerge branch '3782-large-job-logs'
Tim Pierce [Thu, 2 Oct 2014 14:44:30 +0000 (10:44 -0400)]
Merge branch '3782-large-job-logs'

Closes #3782.

9 years ago3782: fix FuseSharedTest
Tim Pierce [Thu, 2 Oct 2014 14:44:13 +0000 (10:44 -0400)]
3782: fix FuseSharedTest

9 years ago4036: update combine collection tests to expect the newly created collection in the...
radhika [Thu, 2 Oct 2014 14:29:04 +0000 (10:29 -0400)]
4036: update combine collection tests to expect the newly created collection in the right project.

9 years agoAdd test fixture to fix "test_cancel_someone_else's_visible_job" refs #3859
Peter Amstutz [Thu, 2 Oct 2014 13:22:28 +0000 (09:22 -0400)]
Add test fixture to fix "test_cancel_someone_else's_visible_job" refs #3859

9 years ago4036: improve rails flash message display to check if the message is an error.
radhika [Thu, 2 Oct 2014 12:32:05 +0000 (08:32 -0400)]
4036: improve rails flash message display to check if the message is an error.

9 years agoMerge branch 'master' into 3583-provenance-graph-issue
radhika [Thu, 2 Oct 2014 10:49:45 +0000 (06:49 -0400)]
Merge branch 'master' into 3583-provenance-graph-issue

9 years ago3583: replace " characters with \" in node value to ensure graph does not get mixed...
radhika [Thu, 2 Oct 2014 10:49:15 +0000 (06:49 -0400)]
3583: replace " characters with \" in node value to ensure graph does not get mixed up on node labels.

9 years agoMerge branch 'master' of git.curoverse.com:arvados into 4036-combine-collections...
radhika [Thu, 2 Oct 2014 10:37:25 +0000 (06:37 -0400)]
Merge branch 'master' of git.curoverse.com:arvados into 4036-combine-collections-in-project-issue

9 years ago4046: when combining collections in a project, set current project as owner (if writa...
radhika [Thu, 2 Oct 2014 10:35:50 +0000 (06:35 -0400)]
4046: when combining collections in a project, set current project as owner (if writable) and show the new collection.

9 years agoMerge branch '3859-api-job-lock-method' refs #3859
Peter Amstutz [Thu, 2 Oct 2014 02:01:19 +0000 (22:01 -0400)]
Merge branch '3859-api-job-lock-method' refs #3859

9 years ago3769: Tweak throttle/truncate messages and application.default.yml defaults.
Peter Amstutz [Thu, 2 Oct 2014 01:59:59 +0000 (21:59 -0400)]
3769: Tweak throttle/truncate messages and application.default.yml defaults.

9 years ago3769: Add rate_limit with log throttling logic. Multiple configuration
Peter Amstutz [Wed, 1 Oct 2014 21:12:52 +0000 (17:12 -0400)]
3769: Add rate_limit with log throttling logic.  Multiple configuration
parameters to throttle excessive logging by bytes, lines, logs table events,
and total logged output.

9 years ago3782: code review feedback
Tim Pierce [Wed, 1 Oct 2014 20:52:17 +0000 (16:52 -0400)]
3782: code review feedback

* Fixed whitespace, JavaScript style in _show_log.html.erb
* Removed unused bytecount variable from file_enumerator
* Changed the new job and collection fixtures to have the job uuid match
  the uuid listed in the log.

9 years ago3782: added state to job fixture
Tim Pierce [Wed, 1 Oct 2014 20:04:05 +0000 (16:04 -0400)]
3782: added state to job fixture

9 years agoMerge branch 'master' into 3782-large-job-logs
Tim Pierce [Wed, 1 Oct 2014 19:43:15 +0000 (15:43 -0400)]
Merge branch 'master' into 3782-large-job-logs

Conflicts:
services/api/test/fixtures/collections.yml
services/api/test/fixtures/jobs.yml

9 years agoMerge branch '3782-stub-file-content' refs #3782
Tom Clegg [Wed, 1 Oct 2014 19:36:46 +0000 (15:36 -0400)]
Merge branch '3782-stub-file-content' refs #3782

9 years ago3782: Merge branch 'master' into 3782-stub-file-content
Tom Clegg [Wed, 1 Oct 2014 19:35:33 +0000 (15:35 -0400)]
3782: Merge branch 'master' into 3782-stub-file-content

9 years agoMerge branch '3052-crunch-log-stdout' into 3769-throttle-logs
Peter Amstutz [Wed, 1 Oct 2014 19:23:23 +0000 (15:23 -0400)]
Merge branch '3052-crunch-log-stdout' into 3769-throttle-logs

9 years ago3782: Use stubbed file content for "inactive user can retrieve user agreement" test.
Tom Clegg [Wed, 1 Oct 2014 19:12:07 +0000 (15:12 -0400)]
3782: Use stubbed file content for "inactive user can retrieve user agreement" test.

9 years agoMerge branch '4000-rerun-pipeline-changed-template'
Tim Pierce [Wed, 1 Oct 2014 18:59:30 +0000 (14:59 -0400)]
Merge branch '4000-rerun-pipeline-changed-template'

Closes #4000.

9 years ago4000: update both functional tests.
Tim Pierce [Wed, 1 Oct 2014 18:58:58 +0000 (14:58 -0400)]
4000: update both functional tests.

9 years agoMerge branch 'master' into 3769-throttle-logs
Peter Amstutz [Wed, 1 Oct 2014 18:33:23 +0000 (14:33 -0400)]
Merge branch 'master' into 3769-throttle-logs