arvados.git
10 years agoMerge branch '3187-pipeline-instance-page' into 3605-improved-dashboard
Peter Amstutz [Wed, 17 Sep 2014 15:42:29 +0000 (11:42 -0400)]
Merge branch '3187-pipeline-instance-page' into 3605-improved-dashboard

10 years ago3187: Fix tests and some debug spew.
Peter Amstutz [Wed, 17 Sep 2014 15:36:53 +0000 (11:36 -0400)]
3187: Fix tests and some debug spew.

10 years agoMerge branch 'master' into 3605-improved-dashboard
Peter Amstutz [Wed, 17 Sep 2014 13:13:52 +0000 (09:13 -0400)]
Merge branch 'master' into 3605-improved-dashboard

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

10 years agoMerge branch '3605-node-info-field' refs #3605
Peter Amstutz [Wed, 17 Sep 2014 13:11:36 +0000 (09:11 -0400)]
Merge branch '3605-node-info-field' refs #3605

10 years agoFix test
Peter Amstutz [Wed, 17 Sep 2014 01:00:14 +0000 (21:00 -0400)]
Fix test

10 years agoMerge branch '3705-keep-blockworklist'
Tim Pierce [Wed, 17 Sep 2014 02:40:16 +0000 (22:40 -0400)]
Merge branch '3705-keep-blockworklist'

Closes #3705.

10 years ago3705: use %v to format interface types
Tim Pierce [Wed, 17 Sep 2014 02:34:20 +0000 (22:34 -0400)]
3705: use %v to format interface types

10 years agoFix arv-run-pipeline-instance to not crash when template is null. no issue #
Peter Amstutz [Wed, 17 Sep 2014 02:30:21 +0000 (22:30 -0400)]
Fix arv-run-pipeline-instance to not crash when template is null.  no issue #

10 years ago3705: drop unnecessary 'items' from BlockWorkList
Tim Pierce [Wed, 17 Sep 2014 02:09:34 +0000 (22:09 -0400)]
3705: drop unnecessary 'items' from BlockWorkList

10 years ago3705: use helper functions in tests
Tim Pierce [Wed, 17 Sep 2014 01:56:55 +0000 (21:56 -0400)]
3705: use helper functions in tests

10 years agoFix test
Peter Amstutz [Wed, 17 Sep 2014 01:00:14 +0000 (21:00 -0400)]
Fix test

10 years ago3705: drop unnecessary current_list pointer
Tim Pierce [Tue, 16 Sep 2014 21:54:40 +0000 (17:54 -0400)]
3705: drop unnecessary current_list pointer

10 years agono issue # remove pipeline instance fixture to address failing test.
radhika [Tue, 16 Sep 2014 21:27:33 +0000 (17:27 -0400)]
no issue # remove pipeline instance fixture to address failing test.
Merge branch '2875-pipeline-description'

10 years ago2875: remove pipeline instance fixture and use an existing one.
radhika [Tue, 16 Sep 2014 21:26:13 +0000 (17:26 -0400)]
2875: remove pipeline instance fixture and use an existing one.

10 years agoMerge branch '3877-log-memory-leak' closes #3877
Tom Clegg [Tue, 16 Sep 2014 21:04:10 +0000 (17:04 -0400)]
Merge branch '3877-log-memory-leak' closes #3877

10 years agoMake sure to run apt-get update before trying to install
Ward Vandewege [Tue, 16 Sep 2014 20:36:03 +0000 (16:36 -0400)]
Make sure to run apt-get update before trying to install
openjdk-7-jre-headless into the java-bwa-samtools arvados docker image.

no issue #

10 years agoMerge branch '3878-arv-mount-block-cache' closes #3878
Peter Amstutz [Tue, 16 Sep 2014 20:05:18 +0000 (16:05 -0400)]
Merge branch '3878-arv-mount-block-cache' closes #3878

10 years ago3878: Remove raise debugging exception.
Peter Amstutz [Tue, 16 Sep 2014 20:04:37 +0000 (16:04 -0400)]
3878: Remove raise debugging exception.

10 years ago3605: Automatically reload the dashboard using ajax.
Peter Amstutz [Tue, 16 Sep 2014 19:23:14 +0000 (15:23 -0400)]
3605: Automatically reload the dashboard using ajax.

10 years ago3878: Fix block cache sharing across threads so arv-mount uses a bounded amount
Peter Amstutz [Tue, 16 Sep 2014 18:49:38 +0000 (14:49 -0400)]
3878: Fix block cache sharing across threads so arv-mount uses a bounded amount
of memory to store block.  Also fixes bug in cache management code and cleans
some exception handler error reporting.

10 years agocloses #2875
radhika [Tue, 16 Sep 2014 15:28:53 +0000 (11:28 -0400)]
closes #2875
Merge branch '2875-pipeline-description'

10 years ago2875: minor text update
radhika [Tue, 16 Sep 2014 15:27:30 +0000 (11:27 -0400)]
2875: minor text update

10 years ago2875: collection description is now textile and also the display is updated.
radhika [Tue, 16 Sep 2014 15:22:02 +0000 (11:22 -0400)]
2875: collection description is now textile and also the display is updated.

10 years ago2875: remove junk migration lines
radhika [Tue, 16 Sep 2014 14:54:53 +0000 (10:54 -0400)]
2875: remove junk migration lines

10 years ago3877: Fix memory leak after "log truncated" decision. Clean up code.
Tom Clegg [Tue, 16 Sep 2014 14:51:27 +0000 (10:51 -0400)]
3877: Fix memory leak after "log truncated" decision. Clean up code.

10 years ago3705: update for code review
Tim Pierce [Tue, 16 Sep 2014 06:15:13 +0000 (02:15 -0400)]
3705: update for code review

* Changed the type of the NextItem channel from *list.Element to
  interface{} (i.e. a list.Element.Value)
* Better comments
* Cleaner testing framework
* TestBlockWorkListReaderBlocks to exercise the case where readers block
  when the list is exhausted, and resume when new data is supplied.

10 years ago3605: Getting jobs/queue_size from API server works. Fixed server-side
Peter Amstutz [Tue, 16 Sep 2014 00:41:26 +0000 (20:41 -0400)]
3605: Getting jobs/queue_size from API server works.  Fixed server-side
sorting.  Date rendering improvements.

10 years ago3705: describe BlockWorkList flow more explicitly
Tim Pierce [Mon, 15 Sep 2014 22:19:40 +0000 (18:19 -0400)]
3705: describe BlockWorkList flow more explicitly

Updated file comments to describe the overall data flow for a
BlockWorkList manager and worker more explicitly.

10 years agoMerge remote-tracking branch 'origin/master' into 3605-improved-dashboard
Peter Amstutz [Mon, 15 Sep 2014 19:08:19 +0000 (15:08 -0400)]
Merge remote-tracking branch 'origin/master' into 3605-improved-dashboard

10 years ago3605: Finally settled on a layout. Adding in remaining information and fixing bugs.
Peter Amstutz [Mon, 15 Sep 2014 19:08:08 +0000 (15:08 -0400)]
3605: Finally settled on a layout.  Adding in remaining information and fixing bugs.

10 years agono issue # fix failing test to use selenium driver
radhika [Mon, 15 Sep 2014 15:27:45 +0000 (11:27 -0400)]
no issue # fix failing test to use selenium driver

10 years ago2875: integration tests to verify description on pipeline templates, instances, and...
radhika [Mon, 15 Sep 2014 14:54:10 +0000 (10:54 -0400)]
2875: integration tests to verify description on pipeline templates, instances, and jobs.

10 years agoUpdated Gemfile to pull in changes from commit:ac594f1 refs #3187
Peter Amstutz [Mon, 15 Sep 2014 13:46:54 +0000 (09:46 -0400)]
Updated Gemfile to pull in changes from commit:ac594f1 refs #3187

10 years agoRemove projects panels from dashboard
Peter Amstutz [Mon, 15 Sep 2014 13:44:57 +0000 (09:44 -0400)]
Remove projects panels from dashboard

10 years agoMerge branch '3187-pipeline-instance-page' into 3605-improved-dashboard
Peter Amstutz [Mon, 15 Sep 2014 13:41:46 +0000 (09:41 -0400)]
Merge branch '3187-pipeline-instance-page' into 3605-improved-dashboard

10 years ago2875: render template description as textile attribte in show recent page
radhika [Mon, 15 Sep 2014 12:18:37 +0000 (08:18 -0400)]
2875: render template description as textile attribte in show recent page

10 years ago2875: add description option
radhika [Mon, 15 Sep 2014 12:10:29 +0000 (08:10 -0400)]
2875: add description option

10 years ago2875: add initial description to pipeline instance when created using arv-run-pipelin...
radhika [Fri, 12 Sep 2014 22:15:21 +0000 (18:15 -0400)]
2875: add initial description to pipeline instance when created using arv-run-pipeline-instance script

10 years agoMerge branch 'master' into 2875-pipeline-description
radhika [Fri, 12 Sep 2014 20:49:57 +0000 (16:49 -0400)]
Merge branch 'master' into 2875-pipeline-description

10 years agocloses #3654
radhika [Fri, 12 Sep 2014 20:46:51 +0000 (16:46 -0400)]
closes #3654
Merge branch '3654-combine-selections'

10 years agoMerge branch 'master' into 3654-combine-selections
radhika [Fri, 12 Sep 2014 20:43:28 +0000 (16:43 -0400)]
Merge branch 'master' into 3654-combine-selections

10 years ago2875: initial description on pipeline instance when the template has no name.
radhika [Fri, 12 Sep 2014 20:41:48 +0000 (16:41 -0400)]
2875: initial description on pipeline instance when the template has no name.

10 years agoWorking on recent pipelines/collections tables
Peter Amstutz [Fri, 12 Sep 2014 20:32:01 +0000 (16:32 -0400)]
Working on recent pipelines/collections tables

10 years agoMerge branch 'master' into 3605-improved-dashboard
Peter Amstutz [Fri, 12 Sep 2014 19:52:30 +0000 (15:52 -0400)]
Merge branch 'master' into 3605-improved-dashboard

10 years ago3605: Dashboard compute node and pipeline status work in progress
Peter Amstutz [Fri, 12 Sep 2014 19:52:03 +0000 (15:52 -0400)]
3605: Dashboard compute node and pipeline status work in progress

10 years agoMerge branch 'master' into 2875-pipeline-description
radhika [Fri, 12 Sep 2014 19:48:45 +0000 (15:48 -0400)]
Merge branch 'master' into 2875-pipeline-description

10 years ago2875: set initial description on the new pipeline instance created by running a template.
radhika [Fri, 12 Sep 2014 19:46:05 +0000 (15:46 -0400)]
2875: set initial description on the new pipeline instance created by running a template.

10 years agoBug fix: manifests with extra spaces
Tim Pierce [Fri, 12 Sep 2014 19:18:15 +0000 (15:18 -0400)]
Bug fix: manifests with extra spaces

Extend the regular expression to match manifest_text to permit more than
a single space in manifest entries (seen in e.g. 91534558193f42a2f7f8aca872e5a78d+15723)

No issue #

10 years ago3654: disable search icon collection show page rather than hide it when it is not...
radhika [Fri, 12 Sep 2014 18:19:44 +0000 (14:19 -0400)]
3654: disable search icon collection show page rather than hide it when it is not applicable.

10 years agoMerge branch 'master' into 3654-combine-selections
radhika [Fri, 12 Sep 2014 17:26:37 +0000 (13:26 -0400)]
Merge branch 'master' into 3654-combine-selections

10 years agoMerge branch 'master' into 2875-pipeline-description
radhika [Fri, 12 Sep 2014 17:23:06 +0000 (13:23 -0400)]
Merge branch 'master' into 2875-pipeline-description

Conflicts:
services/api/app/models/pipeline_instance.rb
services/api/db/structure.sql

10 years ago2875: add new partial to display name and description.
radhika [Fri, 12 Sep 2014 17:17:14 +0000 (13:17 -0400)]
2875: add new partial to display name and description.

10 years ago3605: Provide "info" field to all requesters. Filters out any keys with text
Peter Amstutz [Fri, 12 Sep 2014 14:25:55 +0000 (10:25 -0400)]
3605: Provide "info" field to all requesters.  Filters out any keys with text
"secret" to non-admin users.  Also fix fiddlesticks on workbench viewing
details for node.

10 years agoMerge branch '3187-start-finish-timestamps-tasks-pipelines' refs #3187
Peter Amstutz [Fri, 12 Sep 2014 13:43:34 +0000 (09:43 -0400)]
Merge branch '3187-start-finish-timestamps-tasks-pipelines' refs #3187

10 years agoFixed typo Y% -> %Y
Peter Amstutz [Fri, 12 Sep 2014 13:39:09 +0000 (09:39 -0400)]
Fixed typo Y% -> %Y

10 years ago3187: Text tweaks.
Peter Amstutz [Fri, 12 Sep 2014 12:52:03 +0000 (08:52 -0400)]
3187: Text tweaks.

10 years ago3654: update tests to match the selection dropdown text changes.
radhika [Thu, 11 Sep 2014 23:37:39 +0000 (19:37 -0400)]
3654: update tests to match the selection dropdown text changes.

10 years ago2875: add description to jobs and pipeline_instances.
radhika [Thu, 11 Sep 2014 23:20:04 +0000 (19:20 -0400)]
2875: add description to jobs and pipeline_instances.

10 years ago3187: Setting dates to locale works.
Peter Amstutz [Thu, 11 Sep 2014 21:12:10 +0000 (17:12 -0400)]
3187: Setting dates to locale works.

10 years agoMerge branch 'master' into 3654-combine-selections
radhika [Thu, 11 Sep 2014 20:19:52 +0000 (16:19 -0400)]
Merge branch 'master' into 3654-combine-selections

10 years ago3654: move the checkbox to the left of the row in collection show page. also, fixed...
radhika [Thu, 11 Sep 2014 20:18:07 +0000 (16:18 -0400)]
3654: move the checkbox to the left of the row in collection show page. also, fixed a bug where the newly added selection dropdown shows up in the collection file chooser popup.

10 years agoMerge branch '3187-start-finish-timestamps-tasks-pipelines' into 3187-pipeline-instan...
Peter Amstutz [Thu, 11 Sep 2014 19:55:10 +0000 (15:55 -0400)]
Merge branch '3187-start-finish-timestamps-tasks-pipelines' into 3187-pipeline-instance-page

10 years ago3187: Update the task start time when the task actually starts.
Peter Amstutz [Thu, 11 Sep 2014 19:54:50 +0000 (15:54 -0400)]
3187: Update the task start time when the task actually starts.

10 years ago3187: Generalized reloading to reload other parts of the page in addition to
Peter Amstutz [Thu, 11 Sep 2014 19:52:14 +0000 (15:52 -0400)]
3187: Generalized reloading to reload other parts of the page in addition to
just tabs.  Panel reloading no longer messes up collapsable panel state.

10 years agoFallout from #3036: the test for the checkbox value on acceptance of the
Ward Vandewege [Thu, 11 Sep 2014 19:01:41 +0000 (15:01 -0400)]
Fallout from #3036: the test for the checkbox value on acceptance of the
user agreement was expecting a keep hash, rather than an Arvados UUID.

This fixes accepting the user agreement (if one or more are present).

refs #3036

10 years ago3654: add a default name to newly created combined collection
radhika [Thu, 11 Sep 2014 19:01:07 +0000 (15:01 -0400)]
3654: add a default name to newly created combined collection

10 years ago3705: replace pullmgr with a BlockWorkList
Tim Pierce [Thu, 11 Sep 2014 18:44:48 +0000 (14:44 -0400)]
3705: replace pullmgr with a BlockWorkList

10 years agoMerge branch 'master' into 3654-combine-selections
radhika [Thu, 11 Sep 2014 17:38:00 +0000 (13:38 -0400)]
Merge branch 'master' into 3654-combine-selections

10 years ago3187: Tested and fixed and time calculation algorithm.
Peter Amstutz [Thu, 11 Sep 2014 15:57:12 +0000 (11:57 -0400)]
3187: Tested and fixed and time calculation algorithm.

10 years agoClean up manifest whitespace in split-fastq.
Brett Smith [Thu, 11 Sep 2014 15:21:36 +0000 (11:21 -0400)]
Clean up manifest whitespace in split-fastq.

The previous code was generating two spaces between the stream name
and block list, because it had the space from as_manifest() as well as
its own join.  This yielded an invalid manifest.

No issue #.

10 years agoMerge branch 'master' into 3187-start-finish-timestamps-tasks-pipelines
Peter Amstutz [Thu, 11 Sep 2014 13:02:14 +0000 (09:02 -0400)]
Merge branch 'master' into 3187-start-finish-timestamps-tasks-pipelines

10 years ago3187: Added algorithm to calculate wall clock run time from a set of overlapping...
Peter Amstutz [Thu, 11 Sep 2014 12:57:55 +0000 (08:57 -0400)]
3187: Added algorithm to calculate wall clock run time from a set of overlapping ranges (i.e. concurrent jobs).

10 years ago3705: add BlockWorkList and unit tests
Tim Pierce [Wed, 10 Sep 2014 17:38:07 +0000 (13:38 -0400)]
3705: add BlockWorkList and unit tests

10 years ago3187: Lots of work on presentation of job details, calculating time and
Peter Amstutz [Wed, 10 Sep 2014 21:12:09 +0000 (17:12 -0400)]
3187: Lots of work on presentation of job details, calculating time and
concurrency factors.

10 years agoPrevent PySDK CollectionReader from sending UUIDs to Keep.
Brett Smith [Wed, 10 Sep 2014 21:00:21 +0000 (17:00 -0400)]
Prevent PySDK CollectionReader from sending UUIDs to Keep.

No issue #.  I tickled this while I was working on #3147.  Ward saw
the apparent symptom come up in a Job log, so I'm pushing the fix at
his request.  I have a test prepared in my branch, along with a bunch
of test infrastructure.

10 years ago3187: Added queue_position field to job response.
Peter Amstutz [Wed, 10 Sep 2014 21:01:01 +0000 (17:01 -0400)]
3187: Added queue_position field to job response.

10 years ago3846: Improve timeout handling in PySDK KeepClient.
Brett Smith [Wed, 10 Sep 2014 18:22:01 +0000 (14:22 -0400)]
3846: Improve timeout handling in PySDK KeepClient.

* Catch socket errors (including timeouts) and treat them as
  transient with regard to retry logic.
* Increase the default timeout to 5 minutes.  Given how long it can
  take to PUT 64MiB to a proxy and wait for two servers to return
  success, this seems like a reasonable default.  Future improvements
  could set different timeouts based on the request type and whether
  or not we're talking to a proxy.

Closes #3846.

10 years ago3842: Keep::Manifest concatenates file information from manifest.
Brett Smith [Wed, 10 Sep 2014 16:39:58 +0000 (12:39 -0400)]
3842: Keep::Manifest concatenates file information from manifest.

The previous implementation failed to consider the possibility that
file information would be spread across multiple lines of a manifest.
This would cause, e.g., the same file to be yielded many times from
each_file.

This requirement makes it impossible to return file size information
without parsing the entire manifest.  Because of that, I have reworked
the Ruby SDK API so that method names are more consistent with their
performance characteristics.  I have also added some methods to do
some basic file existence checking that do not require parsing the
whole manifest.

Closes #3842.  Refs #3720.

10 years ago3187: Record started_at and finished_at for tasks and pipelines.
Peter Amstutz [Tue, 9 Sep 2014 19:39:55 +0000 (15:39 -0400)]
3187: Record started_at and finished_at for tasks and pipelines.

10 years agoMerge branch 'master' into 3654-combine-selections
radhika [Tue, 9 Sep 2014 19:17:43 +0000 (15:17 -0400)]
Merge branch 'master' into 3654-combine-selections

10 years ago3654: display show icon for files only when the file suffix is one of txt, gif etc...
radhika [Tue, 9 Sep 2014 19:16:23 +0000 (15:16 -0400)]
3654: display show icon for files only when the file suffix is one of txt, gif etc. Also, fixed a bug in summary html where the collection show was failing when finished_at is not available.

10 years ago#3830: Make crunch-job's git calls more robust.
Brett Smith [Tue, 9 Sep 2014 19:16:22 +0000 (15:16 -0400)]
#3830: Make crunch-job's git calls more robust.

* Check git's exit status and only continue on 0.
* Log git's exit status after optional calls.
* Always log the resolved commit hash when it's found.

Hopefully this will prevent a recurrence of refs #3830, or help rule
out some possibilities if it does happen.  Tested by hand on 4xphq.

10 years ago3187: Migration to add started_at and finished_at to job_tasks and pipeline_instances.
Peter Amstutz [Tue, 9 Sep 2014 18:43:29 +0000 (14:43 -0400)]
3187: Migration to add started_at and finished_at to job_tasks and pipeline_instances.

10 years agoMerge branch 'master' into 3654-combine-selections
radhika [Tue, 9 Sep 2014 17:25:12 +0000 (13:25 -0400)]
Merge branch 'master' into 3654-combine-selections

10 years agoMerge branch '3453-arv-list-docker-images' closes #3453, #3472, refs #3125
Peter Amstutz [Tue, 9 Sep 2014 15:58:12 +0000 (11:58 -0400)]
Merge branch '3453-arv-list-docker-images' closes #3453, #3472, refs #3125

10 years ago3453: Rename check_project_exists to desired_project_uuid. Now raises and
Peter Amstutz [Tue, 9 Sep 2014 15:53:48 +0000 (11:53 -0400)]
3453: Rename check_project_exists to desired_project_uuid.  Now raises and
catches distinct apiclient.errors.Error, ValueError errors for project not
found or invalid uuid.

10 years agoMerge branch '3586-job-priority' closes #3586
Peter Amstutz [Tue, 9 Sep 2014 13:25:27 +0000 (09:25 -0400)]
Merge branch '3586-job-priority' closes #3586

10 years agoMerge branch 'master' into 3586-job-priority closes #3586
Peter Amstutz [Mon, 8 Sep 2014 20:56:51 +0000 (16:56 -0400)]
Merge branch 'master' into 3586-job-priority closes #3586

10 years agoMerge branch '3644-arv-mount-projects' closes #3644
Peter Amstutz [Mon, 8 Sep 2014 20:55:47 +0000 (16:55 -0400)]
Merge branch '3644-arv-mount-projects' closes #3644

10 years ago3453: Refactored arv-put to remove support for name links, correctly use
Peter Amstutz [Mon, 8 Sep 2014 20:54:49 +0000 (16:54 -0400)]
3453: Refactored arv-put to remove support for name links, correctly use
ensure_name_unique to prevent name collisions.  arv-keepdocker should now
correctly handle cases where the user provides a image hash instead of
repository/tag. Fixed tests.

10 years ago3644: Update tests broken by merge
Peter Amstutz [Mon, 8 Sep 2014 19:54:35 +0000 (15:54 -0400)]
3644: Update tests broken by merge

10 years ago3823: bug fixes for arvados-bcbio-nextgen.py
Tim Pierce [Mon, 8 Sep 2014 19:47:54 +0000 (15:47 -0400)]
3823: bug fixes for arvados-bcbio-nextgen.py

Refs #3823

10 years ago3644: Moved some common regex patterns into SDK
Peter Amstutz [Mon, 8 Sep 2014 19:37:55 +0000 (15:37 -0400)]
3644: Moved some common regex patterns into SDK

10 years agoMerge branch 'master' into 3644-arv-mount-projects
Peter Amstutz [Mon, 8 Sep 2014 19:07:05 +0000 (15:07 -0400)]
Merge branch 'master' into 3644-arv-mount-projects

10 years ago3644: Restore 'tag' tests and add 'SharedDirectory' and 'HomeDirectory' tests.
Peter Amstutz [Mon, 8 Sep 2014 19:06:33 +0000 (15:06 -0400)]
3644: Restore 'tag' tests and add 'SharedDirectory' and 'HomeDirectory' tests.
All tests should pass now.

10 years agoMerge branch '3663-collection-reader-performance'
Tim Pierce [Mon, 8 Sep 2014 18:06:43 +0000 (14:06 -0400)]
Merge branch '3663-collection-reader-performance'

Closes #3663.

10 years agoMerge branch 'master' into 3654-combine-selections
radhika [Mon, 8 Sep 2014 14:56:51 +0000 (10:56 -0400)]
Merge branch 'master' into 3654-combine-selections

10 years ago3453: Add ensure_unique_name=True to collection create.
Peter Amstutz [Mon, 8 Sep 2014 14:56:19 +0000 (10:56 -0400)]
3453: Add ensure_unique_name=True to collection create.

10 years ago3654: redirection to newly created collection is now working.
radhika [Mon, 8 Sep 2014 14:56:12 +0000 (10:56 -0400)]
3654: redirection to newly created collection is now working.

10 years agoMerge branch 'master' into 3453-arv-list-docker-images
Peter Amstutz [Mon, 8 Sep 2014 14:53:52 +0000 (10:53 -0400)]
Merge branch 'master' into 3453-arv-list-docker-images