arvados.git
9 years ago3889: fix tests that were doing multiple actions in one test.
radhika [Thu, 25 Sep 2014 15:16:07 +0000 (11:16 -0400)]
3889: fix tests that were doing multiple actions in one test.

9 years ago3889: update the test "non-admin user can limit index" to perform the limit check...
radhika [Thu, 25 Sep 2014 13:54:11 +0000 (09:54 -0400)]
3889: update the test "non-admin user can limit index" to perform the limit check in two tests rather than twice in one test.

9 years ago3889: split the test "setup user in multiple steps and verify response" into multiple...
radhika [Thu, 25 Sep 2014 13:46:50 +0000 (09:46 -0400)]
3889: split the test "setup user in multiple steps and verify response" into multiple tests invoking setup on active user,
rather than perform three setup actions in one test.

9 years ago3889: remove the functional test "setup and unsetup user" that is performing two...
radhika [Thu, 25 Sep 2014 13:19:59 +0000 (09:19 -0400)]
3889: remove the functional test "setup and unsetup user" that is performing two actions in one test,
since other tests in this file already cover the two actions and hence this test is not reduntant.

9 years ago3889: fix a few tests that were performing multiple actions on a single instance...
radhika [Thu, 25 Sep 2014 13:14:29 +0000 (09:14 -0400)]
3889: fix a few tests that were performing multiple actions on a single instance of TestCase object.

9 years ago3889: Fix two functional tests that were performing multiple actions on a single...
radhika [Thu, 25 Sep 2014 12:15:08 +0000 (08:15 -0400)]
3889: Fix two functional tests that were performing multiple actions on a single instance of TestCase object.

9 years agorefs #3889: Merge monkey patch code updates to detect tests that are reusing ActionCo...
radhika [Thu, 25 Sep 2014 02:10:45 +0000 (22:10 -0400)]
refs #3889: Merge monkey patch code updates to detect tests that are reusing ActionController::TestCase.
For now, print warning instead of raising error. After the tests are corrected, we can change this behavior to raise an error.
Merge branch '3889-functional-testing'

9 years agoMerge branch 'master' into 3889-functional-testing
radhika [Thu, 25 Sep 2014 02:03:23 +0000 (22:03 -0400)]
Merge branch 'master' into 3889-functional-testing

9 years agoAPI server: setting workbench_address is not required. This unbreaks the
Ward Vandewege [Thu, 25 Sep 2014 01:57:25 +0000 (21:57 -0400)]
API server: setting workbench_address is not required. This unbreaks the
docker build for the api server image.

refs #3038

9 years agoProtect the one place in the api server code where we assume the
Ward Vandewege [Thu, 25 Sep 2014 01:42:10 +0000 (21:42 -0400)]
Protect the one place in the api server code where we assume the
workbench_address parameter is always set, it is in fact optional.

refs #3038

9 years agoMerge branch 'master' into 3889-functional-testing
radhika [Thu, 25 Sep 2014 01:40:26 +0000 (21:40 -0400)]
Merge branch 'master' into 3889-functional-testing

9 years agoMerge branch '3960-show-more-repos' closes #3960
Tom Clegg [Wed, 24 Sep 2014 21:45:41 +0000 (17:45 -0400)]
Merge branch '3960-show-more-repos' closes #3960

9 years ago3960: Merge branch 'master' into 3960-show-more-repos
Tom Clegg [Wed, 24 Sep 2014 19:49:02 +0000 (15:49 -0400)]
3960: Merge branch 'master' into 3960-show-more-repos

9 years agoMerge branch '2881-node-has-job-wip'
Brett Smith [Wed, 24 Sep 2014 19:34:21 +0000 (15:34 -0400)]
Merge branch '2881-node-has-job-wip'

Refs #2881.  Closes #3944.

9 years ago2881: crunch-dispatch updates nodes' job assignments.
Brett Smith [Mon, 22 Sep 2014 15:11:28 +0000 (11:11 -0400)]
2881: crunch-dispatch updates nodes' job assignments.

With this commit, crunch-dispatch updates all the information that
update_node_attributes used to, so it's removed.

9 years ago2881: API server associates nodes with their assigned jobs.
Brett Smith [Mon, 22 Sep 2014 15:10:42 +0000 (11:10 -0400)]
2881: API server associates nodes with their assigned jobs.

This will enable us to write better administrative tools (like the
Node Manager) and dashboards.

9 years agoMerge branch '3413-keep-trash-list'
Tim Pierce [Wed, 24 Sep 2014 19:05:03 +0000 (15:05 -0400)]
Merge branch '3413-keep-trash-list'

Closes #3413.

9 years agoMerge branch 'master' into 3889-functional-testing
radhika [Wed, 24 Sep 2014 17:52:51 +0000 (13:52 -0400)]
Merge branch 'master' into 3889-functional-testing

9 years agocloses #3038
radhika [Wed, 24 Sep 2014 17:46:45 +0000 (13:46 -0400)]
closes #3038
Merge branch '3038-default-port-numbers'

9 years ago3889: update test_helper.rb with Tom's updates.
radhika [Wed, 24 Sep 2014 17:44:23 +0000 (13:44 -0400)]
3889: update test_helper.rb with Tom's updates.

9 years agoMerge branch '3889-functional-testing-TC' into 3889-functional-testing
radhika [Wed, 24 Sep 2014 17:28:22 +0000 (13:28 -0400)]
Merge branch '3889-functional-testing-TC' into 3889-functional-testing

9 years agoMerge branch 'master' into 3889-functional-testing
radhika [Wed, 24 Sep 2014 17:24:30 +0000 (13:24 -0400)]
Merge branch 'master' into 3889-functional-testing

9 years ago3038: address review feeback; change the config parametter values in default yml...
radhika [Wed, 24 Sep 2014 17:06:22 +0000 (13:06 -0400)]
3038: address review feeback; change the config parametter values in default yml files to avoid conflicts

9 years ago3413: code review update
Tim Pierce [Wed, 24 Sep 2014 15:45:47 +0000 (11:45 -0400)]
3413: code review update

9 years ago3889: Clean up counter checks. For now, warn instead of failing.
Tom Clegg [Wed, 24 Sep 2014 15:41:24 +0000 (11:41 -0400)]
3889: Clean up counter checks. For now, warn instead of failing.

9 years ago3038: revert update to remove implementation that was accidentatlly pushed to this...
radhika [Wed, 24 Sep 2014 14:21:20 +0000 (10:21 -0400)]
3038: revert update to remove implementation that was accidentatlly pushed to this branch instead of 3836 branch!

9 years agoMerge branch 'master' into 3038-default-port-numbers
radhika [Wed, 24 Sep 2014 14:02:58 +0000 (10:02 -0400)]
Merge branch 'master' into 3038-default-port-numbers

9 years ago3038: if there is a unique constraint violation when a collection is removed from...
radhika [Wed, 24 Sep 2014 14:00:51 +0000 (10:00 -0400)]
3038: if there is a unique constraint violation when a collection is removed from a project,
which happens if there is already a collection with that same name in the Home project,
rename the collection to ensure the removal process can complete.

9 years agoMerge branch '3967-improve-keepstore-logging'
Ward Vandewege [Wed, 24 Sep 2014 01:14:37 +0000 (21:14 -0400)]
Merge branch '3967-improve-keepstore-logging'

refs #3967

9 years agoFix typos in workbench language.
Ward Vandewege [Wed, 24 Sep 2014 01:13:11 +0000 (21:13 -0400)]
Fix typos in workbench language.

No issue #

9 years agoMake keepstore log normal operation with more detail, and follow the
Ward Vandewege [Tue, 23 Sep 2014 21:38:55 +0000 (17:38 -0400)]
Make keepstore log normal operation with more detail, and follow the
standard apache logging pattern.

refs #3967

9 years ago3960: Fix readonly/writable flag on repo list. Add tests.
Tom Clegg [Tue, 23 Sep 2014 20:32:57 +0000 (16:32 -0400)]
3960: Fix readonly/writable flag on repo list. Add tests.

9 years ago* Do not blow up when arv-get requests a collection that gets a 404 from the api...
Ward Vandewege [Tue, 23 Sep 2014 18:59:48 +0000 (14:59 -0400)]
* Do not blow up when arv-get requests a collection that gets a 404 from the api server.

* Be more consistent in naming of error variables.

no issue #

9 years agoBugfix time display, also bugfix for job state "Completed" -> "Complete". refs ...
Peter Amstutz [Tue, 23 Sep 2014 18:48:17 +0000 (14:48 -0400)]
Bugfix time display, also bugfix for job state "Completed" -> "Complete".  refs #3187

9 years agoBugfix extra space in display in render_runtime and queued time for pipeline.
Peter Amstutz [Tue, 23 Sep 2014 18:35:54 +0000 (14:35 -0400)]
Bugfix extra space in display in render_runtime and queued time for pipeline.
refs #3187

9 years ago3960: Make editable? return false or true, never nil.
Tom Clegg [Tue, 23 Sep 2014 18:32:09 +0000 (14:32 -0400)]
3960: Make editable? return false or true, never nil.

9 years ago3960: Remove unused has_permission? method.
Tom Clegg [Tue, 23 Sep 2014 18:31:09 +0000 (14:31 -0400)]
3960: Remove unused has_permission? method.

9 years agoMerge branch '3605-improved-dashboard' refs #3605
Peter Amstutz [Tue, 23 Sep 2014 17:58:50 +0000 (13:58 -0400)]
Merge branch '3605-improved-dashboard' refs #3605

9 years ago3605: Remove total nodes from compute summary table.
Peter Amstutz [Tue, 23 Sep 2014 17:50:52 +0000 (13:50 -0400)]
3605: Remove total nodes from compute summary table.

9 years agoMerge branch 'master' into 3038-default-port-numbers
radhika [Tue, 23 Sep 2014 17:14:41 +0000 (13:14 -0400)]
Merge branch 'master' into 3038-default-port-numbers

9 years ago3038: test needed minor update to match current pipeline instance display.
radhika [Tue, 23 Sep 2014 17:10:53 +0000 (13:10 -0400)]
3038: test needed minor update to match current pipeline instance display.

9 years agoMerge remote-tracking branch 'origin/master' into 3605-improved-dashboard
Peter Amstutz [Tue, 23 Sep 2014 15:20:54 +0000 (11:20 -0400)]
Merge remote-tracking branch 'origin/master' into 3605-improved-dashboard

9 years ago3605: Rename "default_show" to "title_and_buttons". Revert capitalization
Peter Amstutz [Tue, 23 Sep 2014 15:20:16 +0000 (11:20 -0400)]
3605: Rename "default_show" to "title_and_buttons".  Revert capitalization
change to "curl".  Eliminate excess top margin on page title.  Restored
RunningOnClient to running list.

9 years ago3038: Recommended default port number related update. Now the defaults are as follows:
radhika [Tue, 23 Sep 2014 15:10:44 +0000 (11:10 -0400)]
3038: Recommended default port number related update. Now the defaults are as follows:
API server (dev mode): 3030
API server (test mode): 3000
Workbench (dev mode): 3031
Workbench (test mode): 3001

9 years ago3605: Filter out nodes that have a last ping time of more than 1 hour. Add
Peter Amstutz [Tue, 23 Sep 2014 14:38:07 +0000 (10:38 -0400)]
3605: Filter out nodes that have a last ping time of more than 1 hour.  Add
queue to compute status panel.  Refactor utc-date spans to
render_localized_date().

9 years agoReport crunch_worker_state=down for nodes not occupying a worker slot. refs #3605
Tom Clegg [Tue, 23 Sep 2014 14:36:36 +0000 (10:36 -0400)]
Report crunch_worker_state=down for nodes not occupying a worker slot. refs #3605

9 years ago3605: Fallback to 0 (instead of nil) when tasks is empty
Peter Amstutz [Tue, 23 Sep 2014 01:51:08 +0000 (21:51 -0400)]
3605: Fallback to 0 (instead of nil) when tasks is empty

9 years ago3605: Check that a pipeline component entry is a hash before trying to render it.
Peter Amstutz [Tue, 23 Sep 2014 01:46:56 +0000 (21:46 -0400)]
3605: Check that a pipeline component entry is a hash before trying to render it.

9 years agoRevert "Bugfix: do not try to overwrite docker_image_locator if it is already set...
Tom Clegg [Mon, 22 Sep 2014 23:25:04 +0000 (19:25 -0400)]
Revert "Bugfix: do not try to overwrite docker_image_locator if it is already set." refs #3898

This reverts commit 7e27eb2cca7e9e22ad1f56a6f0ecbbc40ad4cb64.

9 years agoMerge branch '3898-job-state-attr-TC' closes #3898
Tom Clegg [Mon, 22 Sep 2014 20:56:06 +0000 (16:56 -0400)]
Merge branch '3898-job-state-attr-TC' closes #3898

9 years ago3898: Merge branch 'master' into 3898-job-state-attr-TC
Tom Clegg [Mon, 22 Sep 2014 20:54:01 +0000 (16:54 -0400)]
3898: Merge branch 'master' into 3898-job-state-attr-TC

9 years ago3898: Assume a job Failed if it has started but state fields indicate Queued.
Tom Clegg [Mon, 22 Sep 2014 20:49:28 +0000 (16:49 -0400)]
3898: Assume a job Failed if it has started but state fields indicate Queued.

9 years ago3898: Assume a job Failed if it is locked but state fields indicate Queued.
Tom Clegg [Mon, 22 Sep 2014 20:44:26 +0000 (16:44 -0400)]
3898: Assume a job Failed if it is locked but state fields indicate Queued.

9 years agoBugfix: do not try to overwrite docker_image_locator if it is already set.
Ward Vandewege [Sat, 20 Sep 2014 02:28:37 +0000 (22:28 -0400)]
Bugfix: do not try to overwrite docker_image_locator if it is already set.

refs #3898

9 years ago3605: fix test text
Peter Amstutz [Mon, 22 Sep 2014 20:17:29 +0000 (16:17 -0400)]
3605: fix test text

9 years ago3605: Make compute node summary table no longer clickable since it was a little
Peter Amstutz [Mon, 22 Sep 2014 20:15:16 +0000 (16:15 -0400)]
3605: Make compute node summary table no longer clickable since it was a little
bit confusing.  Can still click on the titlebar.

9 years ago3605: Render individual job status using the same partial as the pipeline
Peter Amstutz [Mon, 22 Sep 2014 20:09:08 +0000 (16:09 -0400)]
3605: Render individual job status using the same partial as the pipeline
instance page.  Also list pipelines that reference this job.

9 years ago3898: Update tests to match the updated job status handling.
radhika [Mon, 22 Sep 2014 19:56:07 +0000 (15:56 -0400)]
3898: Update tests to match the updated job status handling.

9 years agoMerge branch '3894-gem-version' refs #3894
Tom Clegg [Mon, 22 Sep 2014 19:54:13 +0000 (15:54 -0400)]
Merge branch '3894-gem-version' refs #3894

9 years ago3894: Set arvados version in Gemfile.lock to one that exists.
Tom Clegg [Mon, 22 Sep 2014 19:53:48 +0000 (15:53 -0400)]
3894: Set arvados version in Gemfile.lock to one that exists.

9 years ago3605: More improvements to overflow rendering. More fixes to rendering when
Peter Amstutz [Mon, 22 Sep 2014 19:23:41 +0000 (15:23 -0400)]
3605: More improvements to overflow rendering.  More fixes to rendering when
started_at and finished_at are missing.

9 years ago3898: Populate state column using SQL transaction instead of load/save N times.
Tom Clegg [Mon, 22 Sep 2014 19:13:12 +0000 (15:13 -0400)]
3898: Populate state column using SQL transaction instead of load/save N times.

9 years ago3605: Change runtime() to render_runtime(). Improve rendering when started_at
Peter Amstutz [Mon, 22 Sep 2014 18:56:22 +0000 (14:56 -0400)]
3605: Change runtime() to render_runtime().  Improve rendering when started_at
and finished_at are missing from pipelines and tasks.  Include count of days
when rendering run times.  Add comments.

9 years ago3898: Add error messages to assertions. Use assert_raise.
Tom Clegg [Mon, 22 Sep 2014 18:53:13 +0000 (14:53 -0400)]
3898: Add error messages to assertions. Use assert_raise.

9 years ago3898: Clean up job state hooks and validations.
Tom Clegg [Mon, 22 Sep 2014 18:36:13 +0000 (14:36 -0400)]
3898: Clean up job state hooks and validations.

9 years ago3413: code review
Tim Pierce [Mon, 22 Sep 2014 17:50:14 +0000 (13:50 -0400)]
3413: code review

9 years ago3413: update for code review
Tim Pierce [Mon, 22 Sep 2014 17:27:32 +0000 (13:27 -0400)]
3413: update for code review

9 years ago3894: Merge branch 'master' into 3894-gem-version
Tom Clegg [Mon, 22 Sep 2014 15:19:04 +0000 (11:19 -0400)]
3894: Merge branch 'master' into 3894-gem-version

9 years ago3605: Additional layout fixes. Better handling of pipelines where started_at and...
Peter Amstutz [Mon, 22 Sep 2014 15:03:04 +0000 (11:03 -0400)]
3605: Additional layout fixes.  Better handling of pipelines where started_at and finished_at is missing or bogus.

9 years ago3894: Remove outdated README.
Tom Clegg [Mon, 22 Sep 2014 14:50:25 +0000 (10:50 -0400)]
3894: Remove outdated README.

9 years ago3894: Use git log --first-parent to get nearest commit/merge on
Tom Clegg [Mon, 22 Sep 2014 14:23:16 +0000 (10:23 -0400)]
3894: Use git log --first-parent to get nearest commit/merge on
current branch to label package version, rather than nearest
commit. This ensures the package version number increases when an
older commit is merged after a newer commit.

9 years agoMerge branch '3605-improved-dashboard' refs #3605
Peter Amstutz [Mon, 22 Sep 2014 14:05:02 +0000 (10:05 -0400)]
Merge branch '3605-improved-dashboard' refs #3605

9 years ago3605: Fix tab param['tab_pane'] merge conflicts causing tests to fail.
Peter Amstutz [Mon, 22 Sep 2014 14:01:30 +0000 (10:01 -0400)]
3605: Fix tab param['tab_pane'] merge conflicts causing tests to fail.

9 years ago3889: update ActionController::TestCase to monkey patch GET/POST/PUT/DELETE methods
radhika [Sun, 21 Sep 2014 01:28:29 +0000 (21:28 -0400)]
3889: update ActionController::TestCase to monkey patch GET/POST/PUT/DELETE methods

9 years ago3605: Fix tab_pane rendering. Remove spurious console.log.
Peter Amstutz [Sat, 20 Sep 2014 20:42:58 +0000 (16:42 -0400)]
3605: Fix tab_pane rendering.  Remove spurious console.log.

9 years ago3894: Merge branch 'master' into 3894-gem-version
Tom Clegg [Fri, 19 Sep 2014 21:40:28 +0000 (17:40 -0400)]
3894: Merge branch 'master' into 3894-gem-version

9 years ago3894: Fix up runtime dependency specs to make bundle comfortable.
Tom Clegg [Fri, 19 Sep 2014 21:37:51 +0000 (17:37 -0400)]
3894: Fix up runtime dependency specs to make bundle comfortable.

9 years agoMerge remote-tracking branch 'origin/master' into 3605-improved-dashboard
Peter Amstutz [Fri, 19 Sep 2014 20:42:03 +0000 (16:42 -0400)]
Merge remote-tracking branch 'origin/master' into 3605-improved-dashboard

9 years ago3413: added TrashHandler
Tim Pierce [Fri, 19 Sep 2014 19:50:14 +0000 (15:50 -0400)]
3413: added TrashHandler

* added a trashq WorkQueue to manage the trash list
* added TrashHandler to process "PUT /trash" requests
* added TestTrashHandler

9 years agorefs #3898
radhika [Fri, 19 Sep 2014 20:18:15 +0000 (16:18 -0400)]
refs #3898
Merge branch '3898-job-state-attr'

9 years agoMerge branch 'master' into 3898-job-state-attr
radhika [Fri, 19 Sep 2014 20:18:03 +0000 (16:18 -0400)]
Merge branch 'master' into 3898-job-state-attr

9 years ago3898: added include statement
radhika [Fri, 19 Sep 2014 20:17:28 +0000 (16:17 -0400)]
3898: added include statement

9 years agoMerge branch '3705-async-work-queue'
Tim Pierce [Fri, 19 Sep 2014 20:14:41 +0000 (16:14 -0400)]
Merge branch '3705-async-work-queue'

Refs #3705.

9 years ago3705: rename BlockWorkList -> WorkQueue
Tim Pierce [Fri, 19 Sep 2014 20:13:28 +0000 (16:13 -0400)]
3705: rename BlockWorkList -> WorkQueue

Per discussion at
https://github.com/curoverse/arvados/pull/8#discussion_r17637500

refs #3705.

9 years agoMerge branch '3187-pipeline-instance-page' into 3605-improved-dashboard
Peter Amstutz [Fri, 19 Sep 2014 19:40:53 +0000 (15:40 -0400)]
Merge branch '3187-pipeline-instance-page' into 3605-improved-dashboard

Conflicts:
apps/workbench/app/models/job.rb

9 years agoFix Canceled -> Cancelled (american vs canadian spelling, canada wins)
Peter Amstutz [Fri, 19 Sep 2014 19:36:34 +0000 (15:36 -0400)]
Fix Canceled -> Cancelled (american vs canadian spelling, canada wins)

9 years agocloses #3898
radhika [Fri, 19 Sep 2014 19:25:41 +0000 (15:25 -0400)]
closes #3898
Merge branch '3898-job-state-attr'

9 years agoMerge branch 'master' into 3187-pipeline-instance-page
Peter Amstutz [Fri, 19 Sep 2014 19:26:30 +0000 (15:26 -0400)]
Merge branch 'master' into 3187-pipeline-instance-page

Conflicts:
apps/workbench/app/models/job.rb
apps/workbench/app/views/application/_content.html.erb
services/api/app/models/job.rb

9 years agoMerge branch 'master' into 3898-job-state-attr
radhika [Fri, 19 Sep 2014 19:22:45 +0000 (15:22 -0400)]
Merge branch 'master' into 3898-job-state-attr

9 years agoFix Gemfile.lock to use a real gem, not a dev build. refs #3550
Tom Clegg [Fri, 19 Sep 2014 18:01:17 +0000 (14:01 -0400)]
Fix Gemfile.lock to use a real gem, not a dev build. refs #3550

9 years agoUse new --run-pipeline-here instead of --run-here flag, which no longer does what...
Tom Clegg [Fri, 19 Sep 2014 17:49:59 +0000 (13:49 -0400)]
Use new --run-pipeline-here instead of --run-here flag, which no longer does what crunch-dispatch wants. refs #3550

9 years agoMerge branch 'master' into 3898-job-state-attr
radhika [Fri, 19 Sep 2014 16:27:21 +0000 (12:27 -0400)]
Merge branch 'master' into 3898-job-state-attr

Conflicts:
services/api/db/structure.sql

9 years ago3898: cancelled_at takes precedence over success flag.
radhika [Fri, 19 Sep 2014 16:22:46 +0000 (12:22 -0400)]
3898: cancelled_at takes precedence over success flag.

9 years ago3894: gem version numbers reflect latest commit in the subdirectory
Tom Clegg [Fri, 19 Sep 2014 15:27:41 +0000 (11:27 -0400)]
3894: gem version numbers reflect latest commit in the subdirectory
where the gem content comes from.

Even if there are more recent commits elsewhere in the source tree,
those changes won't be reflected in the package so there's no need to
increment the package version.

In addition to avoiding the proliferation of packages with no changes
other than the version number, this makes it possible to change an
SDK, predict the gem version that the CI server will build, refer to
that version in a Gemfile elsewhere in the source tree, and push both
changes at once -- without time travel.

9 years agoBug fix: migration requires CurrentApiClient
Tim Pierce [Fri, 19 Sep 2014 14:45:50 +0000 (10:45 -0400)]
Bug fix: migration requires CurrentApiClient

Migration 20140918141529_change_user_owner_uuid_not_null requires
system_user_uuid, which is defined in CurrentApiClient.

No issue # (bug fix)

9 years ago3898: look for success before running.
radhika [Fri, 19 Sep 2014 14:19:08 +0000 (10:19 -0400)]
3898: look for success before running.

9 years ago3898: couple more test assertions
radhika [Fri, 19 Sep 2014 13:43:14 +0000 (09:43 -0400)]
3898: couple more test assertions

9 years ago3898: if state is changed to Running and is_locked_by_uuid is nil, return validation...
radhika [Fri, 19 Sep 2014 13:33:57 +0000 (09:33 -0400)]
3898: if state is changed to Running and is_locked_by_uuid is nil, return validation error.

9 years ago3898: set finished_at if nil when success is changed.
radhika [Fri, 19 Sep 2014 13:13:00 +0000 (09:13 -0400)]
3898: set finished_at if nil when success is changed.

9 years agoMerge branch 'master' into 3898-job-state-attr
radhika [Fri, 19 Sep 2014 12:50:05 +0000 (08:50 -0400)]
Merge branch 'master' into 3898-job-state-attr