arvados.git
10 years ago2883: Moved addToLogViewer function out of the template and into assets and
Peter Amstutz [Fri, 13 Jun 2014 14:10:40 +0000 (10:10 -0400)]
2883: Moved addToLogViewer function out of the template and into assets and
reformatted it properly.

10 years ago2883: Added filtering for crunchstat, slurm log lines.
peter [Thu, 12 Jun 2014 19:11:53 +0000 (19:11 +0000)]
2883: Added filtering for crunchstat, slurm log lines.

10 years ago2883: Removed commented out code related to live loading (saved it to another branch).
Peter Amstutz [Thu, 12 Jun 2014 13:56:52 +0000 (09:56 -0400)]
2883: Removed commented out code related to live loading (saved it to another branch).

10 years ago2883: Adjusted task type column width. Commented out code for working with
peter [Thu, 12 Jun 2014 02:22:44 +0000 (02:22 +0000)]
2883: Adjusted task type column width.  Commented out code for working with
live-updating logs, it almost works but there are some complications.

10 years ago2883: Adjust timestamp display based on timezone and locale.
peter [Thu, 12 Jun 2014 01:59:12 +0000 (01:59 +0000)]
2883: Adjust timestamp display based on timezone and locale.

10 years ago2883: Live updating log wip
Peter Amstutz [Wed, 11 Jun 2014 21:12:15 +0000 (21:12 +0000)]
2883: Live updating log wip

10 years ago2883: Styling column widths so they don't jump around when filters are turned
Peter Amstutz [Wed, 11 Jun 2014 20:13:22 +0000 (20:13 +0000)]
2883: Styling column widths so they don't jump around when filters are turned
on and off.

10 years ago2883: Moved hardcoded styles out into a stylesheet.
Peter Amstutz [Wed, 11 Jun 2014 20:02:12 +0000 (20:02 +0000)]
2883: Moved hardcoded styles out into a stylesheet.

10 years ago2883: Log viewer works, supports sorting and filtering.
Peter Amstutz [Wed, 11 Jun 2014 19:38:44 +0000 (19:38 +0000)]
2883: Log viewer works, supports sorting and filtering.

10 years ago2883: Initial work on fetching and parsing job log
Peter Amstutz [Wed, 11 Jun 2014 02:09:20 +0000 (22:09 -0400)]
2883: Initial work on fetching and parsing job log

10 years agoBugfix: the discovery doc should not clobber defaults values with the
Ward Vandewege [Tue, 10 Jun 2014 20:31:59 +0000 (16:31 -0400)]
Bugfix: the discovery doc should not clobber defaults values with the
word 'string'. Instead, make sure the default values are always exposed
as a string, which is something the java google apiclient is sensitive
to.

Refs no issue #

10 years agoAdded error-handler for x-editable that extracts Arvados API error field for
Peter Amstutz [Tue, 10 Jun 2014 20:04:56 +0000 (16:04 -0400)]
Added error-handler for x-editable that extracts Arvados API error field for
display, closes #2819

10 years agoMerge branch '2961-load-tab-partials' closes #2961
Peter Amstutz [Tue, 10 Jun 2014 19:46:42 +0000 (15:46 -0400)]
Merge branch '2961-load-tab-partials' closes #2961

10 years agoarv-run-pipeline-instance should not keep trying to create jobs when the
Ward Vandewege [Tue, 10 Jun 2014 18:59:21 +0000 (14:59 -0400)]
arv-run-pipeline-instance should not keep trying to create jobs when the
API server returns an error on job creation.

This closes #3005

10 years agoMerge branch '2826-simple-go-sdk' closes #2826
Peter Amstutz [Tue, 10 Jun 2014 18:56:01 +0000 (14:56 -0400)]
Merge branch '2826-simple-go-sdk' closes #2826

10 years agoFix inconsistent JSON error return behavior on job create.
Ward Vandewege [Tue, 10 Jun 2014 18:32:09 +0000 (14:32 -0400)]
Fix inconsistent JSON error return behavior on job create.

refs #3004

10 years agoMerge branch '2880-crunch-dispatch-node-constraints'
Brett Smith [Tue, 10 Jun 2014 18:12:31 +0000 (14:12 -0400)]
Merge branch '2880-crunch-dispatch-node-constraints'

Closes #2880, #2976, #2993.

10 years ago2880: Don't dispatch Jobs until runtime constraints are met.
Brett Smith [Fri, 6 Jun 2014 17:18:38 +0000 (13:18 -0400)]
2880: Don't dispatch Jobs until runtime constraints are met.

This retains the same FIFO approach to the Job queue that
crunch-dispatch currently uses, but now when it encounters a Job whose
constraints are not met:

* it may wait for a while to see if the Node Manager makes Nodes
  available, if it hasn't done that this hour; and

* it leaves that Job in the queue and tries to process the next one.

See #2880 for further background.  The exact parameters of "waiting
for Nodes" will probably need tuning, but that will be easier to do
after it's been in production for a while.

10 years ago2880: Improve error reporting when crunch-dispatch updates node status.
Brett Smith [Fri, 6 Jun 2014 16:03:54 +0000 (12:03 -0400)]
2880: Improve error reporting when crunch-dispatch updates node status.

10 years ago2880: crunch-dispatch must stop putting symbols in the database.
Brett Smith [Fri, 6 Jun 2014 16:03:08 +0000 (12:03 -0400)]
2880: crunch-dispatch must stop putting symbols in the database.

10 years ago2961: Removed calls to wait_for_ajax, fixes user tests.
Peter Amstutz [Tue, 10 Jun 2014 17:31:46 +0000 (13:31 -0400)]
2961: Removed calls to wait_for_ajax, fixes user tests.

10 years ago2961: user-setup-modal-window div is no longer in footer_html because it is
Peter Amstutz [Tue, 10 Jun 2014 17:28:13 +0000 (13:28 -0400)]
2961: user-setup-modal-window div is no longer in footer_html because it is
loaded using AJAX.

10 years ago2961: Don't call #render_index from #index on folders_controller because #index
Peter Amstutz [Tue, 10 Jun 2014 17:26:20 +0000 (13:26 -0400)]
2961: Don't call #render_index from #index on folders_controller because #index
is also used by #choose and the index does not have any tabs.

10 years ago2961: Do not include meta tag for websockets if there is no websockets in the
Peter Amstutz [Tue, 10 Jun 2014 17:23:24 +0000 (13:23 -0400)]
2961: Do not include meta tag for websockets if there is no websockets in the
discovery document.

10 years ago2961: Fixed name of collection on collection show page to fix test.
Peter Amstutz [Tue, 10 Jun 2014 17:22:48 +0000 (13:22 -0400)]
2961: Fixed name of collection on collection show page to fix test.

10 years ago2961: Track valid/up to date state for each panel, only reload panels when they
Peter Amstutz [Tue, 10 Jun 2014 14:20:29 +0000 (10:20 -0400)]
2961: Track valid/up to date state for each panel, only reload panels when they
are out of date (based on event log) and visible to user.

10 years ago2961: Added use count so ajax loading icon is accurate when there are multiple
Peter Amstutz [Tue, 10 Jun 2014 14:18:22 +0000 (10:18 -0400)]
2961: Added use count so ajax loading icon is accurate when there are multiple
outstanding ajax requests.

10 years ago2961: Removed dangling close div.
Peter Amstutz [Tue, 10 Jun 2014 14:16:04 +0000 (10:16 -0400)]
2961: Removed dangling close div.

10 years ago2961: Added missing user uuid to session.
Peter Amstutz [Tue, 10 Jun 2014 14:15:34 +0000 (10:15 -0400)]
2961: Added missing user uuid to session.

10 years agoMerge branch 'master' into 2961-load-tab-partials
Peter Amstutz [Tue, 10 Jun 2014 13:21:02 +0000 (09:21 -0400)]
Merge branch 'master' into 2961-load-tab-partials

10 years agoFix for running workbench against server that doesn't have 'Job.supplied_script_versi...
Peter Amstutz [Tue, 10 Jun 2014 13:19:39 +0000 (09:19 -0400)]
Fix for running workbench against server that doesn't have 'Job.supplied_script_version' yet.  refs #2939

10 years ago2961: Job index needs to call super sometimes, render_index other times.
Peter Amstutz [Tue, 10 Jun 2014 13:18:02 +0000 (09:18 -0400)]
2961: Job index needs to call super sometimes, render_index other times.

10 years ago2961: Changed index methods on some controllers to use render_index instead of
Peter Amstutz [Tue, 10 Jun 2014 13:08:38 +0000 (09:08 -0400)]
2961: Changed index methods on some controllers to use render_index instead of
super, to skip the default index query logic but still apply the tab partial
logic.

10 years agoSpecify server-side keep-alive ping interval for websockets. no issue #
Peter Amstutz [Mon, 9 Jun 2014 21:05:43 +0000 (17:05 -0400)]
Specify server-side keep-alive ping interval for websockets.  no issue #

10 years ago2961: Escaped erb used embedded in javascript. Updated comments in
Peter Amstutz [Mon, 9 Jun 2014 20:57:50 +0000 (16:57 -0400)]
2961: Escaped erb used embedded in javascript.  Updated comments in
event_log.js.  Removed debug put from ApplicationController.

10 years agoAdd puma to the Gemfile for the API server; we use it for the websockets
Ward Vandewege [Mon, 9 Jun 2014 20:33:01 +0000 (16:33 -0400)]
Add puma to the Gemfile for the API server; we use it for the websockets
server.

no issue #

10 years ago2961: Collections show controller now delegates to super to handle tabs
Peter Amstutz [Mon, 9 Jun 2014 15:41:19 +0000 (11:41 -0400)]
2961: Collections show controller now delegates to super to handle tabs
properly.

10 years agoMerge remote-tracking branch 'origin/master' into 2961-load-tab-partials
Peter Amstutz [Mon, 9 Jun 2014 13:09:20 +0000 (09:09 -0400)]
Merge remote-tracking branch 'origin/master' into 2961-load-tab-partials

10 years ago2961: Save user information as part of the session cookie, eliminates looking
Peter Amstutz [Mon, 9 Jun 2014 13:09:09 +0000 (09:09 -0400)]
2961: Save user information as part of the session cookie, eliminates looking
up current user when rendering every page and panel, this means 2x reduction in
latency when the panel only requires 1 API lookup otherwise.

10 years agoMerge branch '2857-collection-tests'
Tim Pierce [Fri, 6 Jun 2014 21:37:18 +0000 (17:37 -0400)]
Merge branch '2857-collection-tests'

Closes #2857.

10 years ago2857: strip signatures from manifests before testing equality.
Tim Pierce [Fri, 6 Jun 2014 19:48:43 +0000 (15:48 -0400)]
2857: strip signatures from manifests before testing equality.

As Brett observed, the "post" method in these tests mutates its
argument. For a valid test, we must ensure that the source data has not
been transformed into the result data.

For tests which do not care about validating the signatures, we just
strip out the signatures from the result manifest before comparing it to
the source.

Refs #2857.

10 years ago2961: Added checks if we are rendering a tab partial and skips expensive calls
Peter Amstutz [Fri, 6 Jun 2014 17:45:18 +0000 (13:45 -0400)]
2961: Added checks if we are rendering a tab partial and skips expensive calls
to the API server if not needed to render the requested tab pane.

10 years agoMerge branch 'master' into 2857-collection-tests
Tim Pierce [Fri, 6 Jun 2014 15:31:59 +0000 (11:31 -0400)]
Merge branch 'master' into 2857-collection-tests

10 years agoMerge branch '2955-fail-orphan-jobs' closes #2955
Peter Amstutz [Fri, 6 Jun 2014 14:40:59 +0000 (10:40 -0400)]
Merge branch '2955-fail-orphan-jobs' closes #2955

10 years agoReverted change a0aba6d "crunch-dispatch now sends a clean environment to crunch...
Peter Amstutz [Fri, 6 Jun 2014 14:39:39 +0000 (10:39 -0400)]
Reverted change a0aba6d "crunch-dispatch now sends a clean environment to crunch-job"

10 years agoMerge branch 'master' into 2955-fail-orphan-jobs
Peter Amstutz [Fri, 6 Jun 2014 14:31:18 +0000 (10:31 -0400)]
Merge branch 'master' into 2955-fail-orphan-jobs

10 years agoReverted change a0aba6d "crunch-dispatch now sends a clean environment to crunch...
Peter Amstutz [Fri, 6 Jun 2014 14:30:06 +0000 (10:30 -0400)]
Reverted change a0aba6d "crunch-dispatch now sends a clean environment to crunch-job" refs #2882.

10 years agoMerge branch '2880-compute-ping-stats'
Brett Smith [Fri, 6 Jun 2014 13:47:11 +0000 (09:47 -0400)]
Merge branch '2880-compute-ping-stats'

Closes #2967, #2975.

10 years ago2880: API server saves node statistics from pings.
Brett Smith [Thu, 5 Jun 2014 15:38:46 +0000 (11:38 -0400)]
2880: API server saves node statistics from pings.

Crunch will use this information when scheduling Jobs, to satisfy
specified runtime constraints.  Getting this data into the pings is
the responsibility of the node's ping script.

10 years ago2882: Workbench generic create controller adds JSON href attribute.
Brett Smith [Fri, 6 Jun 2014 13:38:25 +0000 (09:38 -0400)]
2882: Workbench generic create controller adds JSON href attribute.

This is a bugfix commit.  This detail got lost when create stopped
calling show to render the object.  Refs #2882.

10 years ago2961: Now loads tab panes (past the first one) in the background.
Peter Amstutz [Fri, 6 Jun 2014 02:02:30 +0000 (22:02 -0400)]
2961: Now loads tab panes (past the first one) in the background.
Automatically triggers reload of tab panes when receiving a changed event from
websocket.

10 years ago2961: Removed spurious elementId from subscribeToEventLog(). Added arv-log-event...
Peter Amstutz [Thu, 5 Jun 2014 20:31:18 +0000 (16:31 -0400)]
2961: Removed spurious elementId from subscribeToEventLog(). Added arv-log-event-listener[data-object-type="xxxxx"] to
match on uuid types.

10 years agoFixes PipelineInstancesControllerTest. application_controller#create now does
Peter Amstutz [Thu, 5 Jun 2014 19:50:26 +0000 (15:50 -0400)]
Fixes PipelineInstancesControllerTest.  application_controller#create now does
the right thing based on requested response format.  refs #2882

10 years ago2857: fix flaky time-sensitive tests
Tim Pierce [Thu, 5 Jun 2014 19:42:06 +0000 (15:42 -0400)]
2857: fix flaky time-sensitive tests

Allow tests to inject a mock Time object into Blob, in order to generate
consistent behavior for tests that rely on permission signatures.

Closes #2857.

10 years agoMerge branch '2882-job-process-stats' refs #2882
Peter Amstutz [Thu, 5 Jun 2014 18:49:35 +0000 (14:49 -0400)]
Merge branch '2882-job-process-stats' refs #2882

10 years ago2955: Renamed script to "cancel_stale_jobs". Fixed spelling canceled_at -> cancelled_at.
Peter Amstutz [Thu, 5 Jun 2014 18:44:51 +0000 (14:44 -0400)]
2955: Renamed script to "cancel_stale_jobs".  Fixed spelling canceled_at -> cancelled_at.

10 years ago2961: Added tab_pane query parameter which returns just the desired tab pane partial.
Peter Amstutz [Thu, 5 Jun 2014 17:20:39 +0000 (13:20 -0400)]
2961: Added tab_pane query parameter which returns just the desired tab pane partial.

10 years ago2955: Moved logic to clean jobs table from crunch-dispatch into a standalone
Peter Amstutz [Thu, 5 Jun 2014 16:43:09 +0000 (12:43 -0400)]
2955: Moved logic to clean jobs table from crunch-dispatch into a standalone
script.

10 years ago2865: add traffic_test.py for testing Keep performance.
Tim Pierce [Wed, 4 Jun 2014 21:24:49 +0000 (17:24 -0400)]
2865: add traffic_test.py for testing Keep performance.

Refs #2865.

10 years ago2882: Removed unnecessary no_reuse options
Peter Amstutz [Wed, 4 Jun 2014 20:24:07 +0000 (16:24 -0400)]
2882: Removed unnecessary no_reuse options

10 years ago2955: Sets jobrecord.canceled_at when canceling/failing an orphan job.
Peter Amstutz [Wed, 4 Jun 2014 20:00:03 +0000 (16:00 -0400)]
2955: Sets jobrecord.canceled_at when canceling/failing an orphan job.
arv-run-pipeline-instance recognizes canceled jobs when counting the number of ended jobs.

10 years agoMerge branch 'master' into 2919-provenance-graph-cutoff
radhika [Wed, 4 Jun 2014 19:53:46 +0000 (15:53 -0400)]
Merge branch 'master' into 2919-provenance-graph-cutoff

10 years agoMerge remote-tracking branch 'origin/master' into 2882-job-process-stats
Peter Amstutz [Wed, 4 Jun 2014 19:23:31 +0000 (15:23 -0400)]
Merge remote-tracking branch 'origin/master' into 2882-job-process-stats

10 years ago2882: Improved re-run job buttons on job status page
Peter Amstutz [Wed, 4 Jun 2014 19:23:11 +0000 (15:23 -0400)]
2882: Improved re-run job buttons on job status page

10 years agoMerge branch 'master' into 2882-job-process-stats refs #2882
Peter Amstutz [Wed, 4 Jun 2014 19:19:10 +0000 (15:19 -0400)]
Merge branch 'master' into 2882-job-process-stats refs #2882

10 years agoMerge branch 'origin-2939-re-run-job-button' into 2882-job-process-stats
Peter Amstutz [Wed, 4 Jun 2014 19:03:37 +0000 (15:03 -0400)]
Merge branch 'origin-2939-re-run-job-button' into 2882-job-process-stats

10 years ago2882: arv-mount restores signal handlers after sp.wait(). Fixed spelling ellapsed...
Peter Amstutz [Wed, 4 Jun 2014 18:52:07 +0000 (14:52 -0400)]
2882: arv-mount restores signal handlers after sp.wait().  Fixed spelling ellapsed -> elapsed.

10 years ago2933: Add Keep signing key configuration to Docker.
Brett Smith [Wed, 4 Jun 2014 14:30:16 +0000 (10:30 -0400)]
2933: Add Keep signing key configuration to Docker.

This is a little hypothetical until we Dockerize the new Keep server,
but it's necessary to get the API server running.

Refs #2933.

10 years ago2933: Update Docker to use new Python package build process.
Brett Smith [Wed, 4 Jun 2014 14:29:05 +0000 (10:29 -0400)]
2933: Update Docker to use new Python package build process.

Refs #2933.

10 years agoMerge branch 'master' into 2895-no-more-redis
radhika [Wed, 4 Jun 2014 15:17:31 +0000 (11:17 -0400)]
Merge branch 'master' into 2895-no-more-redis

10 years ago2955: Fixed query of log table that checks for age of last log by an orphan
Peter Amstutz [Wed, 4 Jun 2014 14:09:51 +0000 (10:09 -0400)]
2955: Fixed query of log table that checks for age of last log by an orphan
job.

10 years ago2955: crunch-dispatch now sends a clean environment to crunch-job. (cherry-picked...
Peter Amstutz [Mon, 2 Jun 2014 20:44:26 +0000 (16:44 -0400)]
2955: crunch-dispatch now sends a clean environment to crunch-job. (cherry-picked from #2882)

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

10 years ago2955: Added check that an orphan job hasn't produces any logs for 5 minutes
Peter Amstutz [Wed, 4 Jun 2014 13:55:24 +0000 (09:55 -0400)]
2955: Added check that an orphan job hasn't produces any logs for 5 minutes
before automatically failing it.  arv-run-pipeline-instance will identify jobs
that are running=false and success=false as failed even if finished_at is null.

10 years ago2955: Fixed refresh_running to set finished_at on failed jobs. Increased
Peter Amstutz [Tue, 3 Jun 2014 21:10:45 +0000 (17:10 -0400)]
2955: Fixed refresh_running to set finished_at on failed jobs.  Increased
polling period to 30 seconds.

10 years ago2865: reduce Keep memory usage.
Tim Pierce [Tue, 3 Jun 2014 20:53:50 +0000 (16:53 -0400)]
2865: reduce Keep memory usage.

Eliminate ioutil.ReadAll to reduce unnecessary 2x memory allocations.

* PutBlockHandler allocates a buffer exactly as long as
  req.ContentLength and fills it with io.ReadFull.

* GetBlock uses ioutil.ReadFile (which it arguably should have been
  doing in the first place).

Refs #2865.

10 years ago2955: Periodically compare Job.running to @running and fail any jobs not in
Peter Amstutz [Tue, 3 Jun 2014 20:50:48 +0000 (16:50 -0400)]
2955: Periodically compare Job.running to @running and fail any jobs not in
@running.

10 years ago2882: Explicit polling frequency
Peter Amstutz [Tue, 3 Jun 2014 20:10:29 +0000 (16:10 -0400)]
2882: Explicit polling frequency

10 years ago2953: crunch-job strips permission hints from output manifests.
Brett Smith [Tue, 3 Jun 2014 20:07:55 +0000 (16:07 -0400)]
2953: crunch-job strips permission hints from output manifests.

The API server also strips permission hints from submitted
collections, and will reject it if the specified UUID doesn't match
that result.  As a consequence, this is necessary for crunch-job to
register output with the API server.

Closes #2953.

10 years agoMerge remote-tracking branch 'origin/master' into origin-2939-re-run-job-button refs...
Peter Amstutz [Tue, 3 Jun 2014 19:22:33 +0000 (15:22 -0400)]
Merge remote-tracking branch 'origin/master' into origin-2939-re-run-job-button refs #2939

Conflicts:
services/api/db/schema.rb

10 years ago2882: Added crunchstat service to collect cgroup stats, and added support to
Peter Amstutz [Tue, 3 Jun 2014 19:09:42 +0000 (15:09 -0400)]
2882: Added crunchstat service to collect cgroup stats, and added support to
crunch-job.

10 years ago2895: remove arvados.jobs.log_stream from arv
radhika [Tue, 3 Jun 2014 18:57:02 +0000 (14:57 -0400)]
2895: remove arvados.jobs.log_stream from arv

10 years agoMerge branch 'master' into 2895-no-more-redis
radhika [Tue, 3 Jun 2014 18:46:45 +0000 (14:46 -0400)]
Merge branch 'master' into 2895-no-more-redis

10 years agoFix workbench URL in inactive user notification e-mail.
Ward Vandewege [Tue, 3 Jun 2014 15:01:00 +0000 (11:01 -0400)]
Fix workbench URL in inactive user notification e-mail.

refs #2681

10 years agoMerge branch '2951-more-robust-fuse-test-teardown'
Ward Vandewege [Tue, 3 Jun 2014 13:50:32 +0000 (09:50 -0400)]
Merge branch '2951-more-robust-fuse-test-teardown'

refs #2951

10 years agoRetry the fusermount call up to 10 times with a small pause between
Ward Vandewege [Tue, 3 Jun 2014 13:40:54 +0000 (09:40 -0400)]
Retry the fusermount call up to 10 times with a small pause between
calls if it is not successful. This should make the teardown of the fuse
mount more reliable in automated testing.

refs #2951

10 years ago2872: Fix attribute_editable? to play nicer with group ownership. refs #2872
Tom Clegg [Tue, 3 Jun 2014 00:35:49 +0000 (20:35 -0400)]
2872: Fix attribute_editable? to play nicer with group ownership. refs #2872

10 years ago2893: API server accepts all serialized parameters as JSON.
Brett Smith [Mon, 2 Jun 2014 21:26:50 +0000 (17:26 -0400)]
2893: API server accepts all serialized parameters as JSON.

This commit takes the bugfix that was applied in 135f306e, and ensures
it's applied to all serialized attributes.

10 years ago2882: crunch-dispatch now sends a clean environment to crunch-job.
Peter Amstutz [Mon, 2 Jun 2014 20:44:26 +0000 (16:44 -0400)]
2882: crunch-dispatch now sends a clean environment to crunch-job.

10 years ago2872: Change default order of folder contents. refs #2872
Tom Clegg [Mon, 2 Jun 2014 19:14:15 +0000 (15:14 -0400)]
2872: Change default order of folder contents. refs #2872

10 years ago2872: Ensure name link tail_uuid == owner_uuid. refs #2872
Tom Clegg [Mon, 2 Jun 2014 19:13:52 +0000 (15:13 -0400)]
2872: Ensure name link tail_uuid == owner_uuid. refs #2872

10 years agoMerge branch '2681-new-inactive-user-notification'
Ward Vandewege [Mon, 2 Jun 2014 19:17:44 +0000 (15:17 -0400)]
Merge branch '2681-new-inactive-user-notification'

refs #2681

10 years agoMerge branch 'master' into 2681-new-inactive-user-notification
Ward Vandewege [Mon, 2 Jun 2014 19:15:42 +0000 (15:15 -0400)]
Merge branch 'master' into 2681-new-inactive-user-notification

10 years agoMerge branch 'master' into 2919-provenance-graph-cutoff
radhika [Mon, 2 Jun 2014 18:52:54 +0000 (14:52 -0400)]
Merge branch 'master' into 2919-provenance-graph-cutoff

10 years ago2882: Added button to cancel a running job.
Peter Amstutz [Mon, 2 Jun 2014 18:47:33 +0000 (14:47 -0400)]
2882: Added button to cancel a running job.

10 years ago2882: arv-mount --exec forwards SIGINT and SIGTERM to the underlying subprocess.
Peter Amstutz [Mon, 2 Jun 2014 18:22:00 +0000 (14:22 -0400)]
2882: arv-mount --exec forwards SIGINT and SIGTERM to the underlying subprocess.

10 years ago2903: rename db migrate script with clear description
radhika [Mon, 2 Jun 2014 17:56:50 +0000 (13:56 -0400)]
2903: rename db migrate script with clear description

10 years agoMerge branch 'master' into 2903-remove-pi-active-and-success
radhika [Mon, 2 Jun 2014 17:51:03 +0000 (13:51 -0400)]
Merge branch 'master' into 2903-remove-pi-active-and-success

Conflicts:
services/api/db/schema.rb

10 years agoMerge branch 'master' into 2882-job-process-stats refs #2882
Peter Amstutz [Mon, 2 Jun 2014 17:32:23 +0000 (13:32 -0400)]
Merge branch 'master' into 2882-job-process-stats refs #2882

10 years agoMerge branch 'master' into 2681-new-inactive-user-notification
Ward Vandewege [Mon, 2 Jun 2014 17:31:33 +0000 (13:31 -0400)]
Merge branch 'master' into 2681-new-inactive-user-notification

10 years agoDTRT with system_user in our user test case. Partial revocation of
Ward Vandewege [Mon, 2 Jun 2014 17:02:30 +0000 (13:02 -0400)]
DTRT with system_user in our user test case. Partial revocation of
commit:e9fc734b