arvados.git
7 years agoMerge branch 'master' into 11652-recursive-contents-wb
radhika [Tue, 6 Jun 2017 19:49:34 +0000 (15:49 -0400)]
Merge branch 'master' into 11652-recursive-contents-wb

7 years agoMerge branch '11652-recursive-contents'
Tom Clegg [Tue, 6 Jun 2017 19:22:57 +0000 (15:22 -0400)]
Merge branch '11652-recursive-contents'

refs #11652

7 years ago11652: Merge branch 'master' into 11652-recursive-contents
Tom Clegg [Tue, 6 Jun 2017 17:53:36 +0000 (13:53 -0400)]
11652: Merge branch 'master' into 11652-recursive-contents

7 years ago11652: Add tests for non-recursive and home-project cases.
Tom Clegg [Tue, 6 Jun 2017 17:53:25 +0000 (13:53 -0400)]
11652: Add tests for non-recursive and home-project cases.

7 years ago11652: use "recursive=true" in workbench search requests
radhika [Tue, 6 Jun 2017 17:06:19 +0000 (13:06 -0400)]
11652: use "recursive=true" in workbench search requests

7 years agoMerge branch 'master' into 11652-recursive-contents
radhika [Tue, 6 Jun 2017 15:17:29 +0000 (11:17 -0400)]
Merge branch 'master' into 11652-recursive-contents

7 years agocloses #9587
radhika [Tue, 6 Jun 2017 15:07:36 +0000 (11:07 -0400)]
closes #9587
Merge branch '9587-trash-page'

7 years ago9587: rename pane name to "Recent trash"
radhika [Tue, 6 Jun 2017 15:01:06 +0000 (11:01 -0400)]
9587: rename pane name to "Recent trash"

7 years ago9587: sort the trash page rows by trash_at timestamp
radhika [Tue, 6 Jun 2017 00:40:46 +0000 (20:40 -0400)]
9587: sort the trash page rows by trash_at timestamp

7 years agoMerge branch 'master' into 9587-trash-page
radhika [Tue, 6 Jun 2017 00:29:18 +0000 (20:29 -0400)]
Merge branch 'master' into 9587-trash-page

7 years agocloses #9587
radhika [Mon, 5 Jun 2017 22:58:03 +0000 (18:58 -0400)]
closes #9587
Merge branch '9587-trash-page'

7 years ago9587: sort order issue
radhika [Fri, 2 Jun 2017 21:31:04 +0000 (17:31 -0400)]
9587: sort order issue

7 years ago9587: expose untrash api
radhika [Wed, 31 May 2017 19:03:53 +0000 (15:03 -0400)]
9587: expose untrash api

7 years ago9587: trash page
radhika [Tue, 30 May 2017 22:35:06 +0000 (18:35 -0400)]
9587: trash page

7 years agocloses #4921
radhika [Mon, 5 Jun 2017 17:00:02 +0000 (13:00 -0400)]
closes #4921
Merge branch '4921-clear-modal-preview-pane'

7 years agoMerge branch '9005-share-discovery'
Tom Clegg [Mon, 5 Jun 2017 14:06:26 +0000 (10:06 -0400)]
Merge branch '9005-share-discovery'

closes #9005

7 years ago4921: also clear preview pane when a project is selected from projects dropdown menu
radhika [Sat, 3 Jun 2017 15:08:39 +0000 (11:08 -0400)]
4921: also clear preview pane when a project is selected from projects dropdown menu

7 years ago9587: show trash page contents in Recent tab pane
radhika [Fri, 2 Jun 2017 21:45:06 +0000 (17:45 -0400)]
9587: show trash page contents in Recent tab pane

7 years ago9587: sort order issue
radhika [Fri, 2 Jun 2017 21:31:04 +0000 (17:31 -0400)]
9587: sort order issue

7 years ago9005: Serve keep_services/accessible regardless of auth status.
Tom Clegg [Fri, 2 Jun 2017 19:43:28 +0000 (15:43 -0400)]
9005: Serve keep_services/accessible regardless of auth status.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

7 years ago11652: Update API docs.
Tom Clegg [Fri, 2 Jun 2017 18:58:28 +0000 (14:58 -0400)]
11652: Update API docs.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

7 years ago11652: Add "recursive" flag to groups#contents controller.
Tom Clegg [Fri, 2 Jun 2017 18:53:20 +0000 (14:53 -0400)]
11652: Add "recursive" flag to groups#contents controller.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

7 years agocloses #4921
radhika [Fri, 2 Jun 2017 17:55:06 +0000 (13:55 -0400)]
closes #4921
Merge branch '4921-clear-modal-preview-pane'

7 years ago9005: Replace matchTrue regexp with StringBool func.
Tom Clegg [Thu, 1 Jun 2017 21:37:37 +0000 (17:37 -0400)]
9005: Replace matchTrue regexp with StringBool func.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

7 years ago4921: clear preview pane when the selectable container is cleared
radhika [Thu, 1 Jun 2017 20:09:24 +0000 (16:09 -0400)]
4921: clear preview pane when the selectable container is cleared

7 years ago9005: Restore "refresh services on SIGHUP" to keepproxy.
Tom Clegg [Thu, 1 Jun 2017 19:31:26 +0000 (15:31 -0400)]
9005: Restore "refresh services on SIGHUP" to keepproxy.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

7 years ago9005: Rename ClearCache to RefreshServiceDiscovery
Tom Clegg [Thu, 1 Jun 2017 19:26:42 +0000 (15:26 -0400)]
9005: Rename ClearCache to RefreshServiceDiscovery

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

7 years ago9587: include "owner" in trash rows; update trash icon.
radhika [Thu, 1 Jun 2017 18:05:46 +0000 (14:05 -0400)]
9587: include "owner" in trash rows; update trash icon.

7 years ago9587: test /trash page
radhika [Thu, 1 Jun 2017 16:59:57 +0000 (12:59 -0400)]
9587: test /trash page

7 years ago9005: Tidy up test suite.
Tom Clegg [Thu, 1 Jun 2017 01:49:43 +0000 (21:49 -0400)]
9005: Tidy up test suite.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

7 years ago9005: Fix test cases to accommodate service discovery changes.
Tom Clegg [Thu, 1 Jun 2017 01:48:52 +0000 (21:48 -0400)]
9005: Fix test cases to accommodate service discovery changes.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

7 years ago9587: cleanup trashed_items method
radhika [Wed, 31 May 2017 21:16:48 +0000 (17:16 -0400)]
9587: cleanup trashed_items method

7 years ago9587: display name instead of clickable link and remove tags
radhika [Wed, 31 May 2017 20:54:57 +0000 (16:54 -0400)]
9587: display name instead of clickable link and remove tags

7 years ago9005: Keep service discovery up to date automatically.
Tom Clegg [Wed, 31 May 2017 18:16:43 +0000 (14:16 -0400)]
9005: Keep service discovery up to date automatically.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

7 years ago9005: De-duplicate arvadosclient setup.
Tom Clegg [Tue, 30 May 2017 19:24:45 +0000 (15:24 -0400)]
9005: De-duplicate arvadosclient setup.

Fix ignored KeepServiceURIs when using an arvados.Client to create an
arvadosclient.ArvadosClient.

Fix ARVADOS_API_HOST_INSECURE=no or =false interpreted as "insecure
mode" in arvados.Client setup.

Log & ignore invalid entries in ARVADOS_KEEP_SERVICES in
arvados.Client setup. Handle extra separator chars more gracefully.

7 years ago11720: Fix go test recipe so *_test=-check.vv uses vendor dir, too.
Tom Clegg [Tue, 30 May 2017 19:22:21 +0000 (15:22 -0400)]
11720: Fix go test recipe so *_test=-check.vv uses vendor dir, too.

7 years agoMerge branch '9005-keep-http-client'
Tom Clegg [Wed, 31 May 2017 20:13:50 +0000 (16:13 -0400)]
Merge branch '9005-keep-http-client'

refs #9005

7 years ago9005: Modify default transport instead of building from scratch.
Tom Clegg [Wed, 31 May 2017 20:12:44 +0000 (16:12 -0400)]
9005: Modify default transport instead of building from scratch.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

7 years ago9005: Remove periodic CloseIdleConnections().
Tom Clegg [Wed, 31 May 2017 19:46:29 +0000 (15:46 -0400)]
9005: Remove periodic CloseIdleConnections().

This is unnecessary now that the transport has a non-zero
IdleConnTimeout.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

7 years ago9587: expose untrash api
radhika [Wed, 31 May 2017 19:03:53 +0000 (15:03 -0400)]
9587: expose untrash api

7 years ago9005: Copy default transport if possible. Move magics to consts.
Tom Clegg [Wed, 31 May 2017 19:03:10 +0000 (15:03 -0400)]
9005: Copy default transport if possible. Move magics to consts.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

7 years agoMerge branch '11766-workflow-deadlock' closes #11766
Peter Amstutz [Wed, 31 May 2017 18:26:01 +0000 (14:26 -0400)]
Merge branch '11766-workflow-deadlock' closes #11766
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curoverse.com>

7 years agoMerge branch 'master' into 9587-trash-page
radhika [Wed, 31 May 2017 17:33:54 +0000 (13:33 -0400)]
Merge branch 'master' into 9587-trash-page

7 years ago9587: untrash option
radhika [Wed, 31 May 2017 17:33:19 +0000 (13:33 -0400)]
9587: untrash option

7 years ago9587: tab line buttons in trash page
radhika [Wed, 31 May 2017 15:22:43 +0000 (11:22 -0400)]
9587: tab line buttons in trash page

7 years ago9587: trash page
radhika [Tue, 30 May 2017 22:35:06 +0000 (18:35 -0400)]
9587: trash page

7 years agoMerge branch '11684-unsigned-locator-fix'
Lucas Di Pentima [Tue, 30 May 2017 21:24:23 +0000 (18:24 -0300)]
Merge branch '11684-unsigned-locator-fix'
Closes #11684

7 years ago11684: ArvadosFile.flush() now check if it is the only owner of a bufferblock before...
Lucas Di Pentima [Tue, 30 May 2017 20:56:07 +0000 (17:56 -0300)]
11684: ArvadosFile.flush() now check if it is the only owner of a bufferblock before deleting it, so the extra argument is not required.
On commit_all(), always check if the owner attribute is an instance of ArvadosFile before calling flush()
Fixed a couple tests that were mocking bufferblock.owner so that they work with this new behavior.

7 years agoMerge branch '11767-squeue-reasons' refs #11767
Peter Amstutz [Tue, 30 May 2017 18:42:34 +0000 (14:42 -0400)]
Merge branch '11767-squeue-reasons' refs #11767

7 years ago11767: Make squeue format output pipe (|) delimited so that it doesn't get
Peter Amstutz [Tue, 30 May 2017 18:34:39 +0000 (14:34 -0400)]
11767: Make squeue format output pipe (|) delimited so that it doesn't get
confused by spaces in the "Reasons" column

7 years ago11684: Merge branch 'master' into 11684-unsigned-locator-fix
Lucas Di Pentima [Tue, 30 May 2017 17:07:41 +0000 (14:07 -0300)]
11684: Merge branch 'master' into 11684-unsigned-locator-fix

7 years agoMerge branch '11769-scancel-jobs-only' closes #11769
Peter Amstutz [Tue, 30 May 2017 15:18:41 +0000 (11:18 -0400)]
Merge branch '11769-scancel-jobs-only' closes #11769

7 years ago9005: Share http Transports and Clients across KeepClients.
Tom Clegg [Mon, 29 May 2017 22:15:24 +0000 (18:15 -0400)]
9005: Share http Transports and Clients across KeepClients.

7 years agocloses #11739 , #11751
radhika [Mon, 29 May 2017 19:56:26 +0000 (15:56 -0400)]
closes #11739 , #11751
Merge branch '11739-container-requests-in-dashboard'

7 years ago11739: preload containers and children of all container_requests in dashboard display.
radhika [Mon, 29 May 2017 17:19:05 +0000 (13:19 -0400)]
11739: preload containers and children of all container_requests in dashboard display.
11751: in /container_requests page, use the column name "Name" and display either name of uuid of the object.

7 years ago11684: Instead of fiddling with ArvadosFile object's internals from the BlockManager
Lucas Di Pentima [Mon, 29 May 2017 16:59:14 +0000 (13:59 -0300)]
11684: Instead of fiddling with ArvadosFile object's internals from the BlockManager
put threads to update the segments locators when committing synchronously a block
built from smaller blocks, take advantage of ArvadosFile.flush() existing mechanism
to update unrealized segments locators by building a list of bufferblock owners
and calling all owner's flush() method on commit_all().
To avoid calling delete_bufferblock() many times on a single bufferblock, added
a flag on flush() and delete the bufferblock after flushing all owners.

7 years ago11766: Bump cwltool version for deadlock fix.
Peter Amstutz [Fri, 26 May 2017 17:29:45 +0000 (13:29 -0400)]
11766: Bump cwltool version for deadlock fix.

7 years agoFix crunch script to set trash_intermediate and intermediate_output_ttl refs #11100
Peter Amstutz [Fri, 26 May 2017 20:22:10 +0000 (16:22 -0400)]
Fix crunch script to set trash_intermediate and intermediate_output_ttl refs #11100

7 years ago11769: HasUuid::UUID_REGEX matches anything that looks like an Arvados uuid. As a...
Peter Amstutz [Fri, 26 May 2017 19:49:32 +0000 (15:49 -0400)]
11769: HasUuid::UUID_REGEX matches anything that looks like an Arvados uuid. As a result, if crunchv1 and crunchv2 dispatchers are on the same cluster, crunch-dispatch.rb will try to scancel containers thinking they are "orphan jobs".  Tighten the regex to only match job uuids.

7 years agoMerge branch '11767-slurm-units' refs #11767
Peter Amstutz [Fri, 26 May 2017 19:32:46 +0000 (15:32 -0400)]
Merge branch '11767-slurm-units' refs #11767

7 years ago11767: Test cases that it will convert fractional values from squeue.
Peter Amstutz [Fri, 26 May 2017 19:31:57 +0000 (15:31 -0400)]
11767: Test cases that it will convert fractional values from squeue.

7 years ago11767: Slurm apparently will print out half values (like 2.5G).
Peter Amstutz [Fri, 26 May 2017 19:25:56 +0000 (15:25 -0400)]
11767: Slurm apparently will print out half values (like 2.5G).

7 years ago11767: Recognize lowercase suffixes, just in case future versions of slurm
Peter Amstutz [Fri, 26 May 2017 19:14:12 +0000 (15:14 -0400)]
11767: Recognize lowercase suffixes, just in case future versions of slurm
change the format again.

7 years ago11767: Correctly parse values with unit suffixes printed by squeue.
Peter Amstutz [Fri, 26 May 2017 18:48:16 +0000 (14:48 -0400)]
11767: Correctly parse values with unit suffixes printed by squeue.

7 years agoMerge branch '11100-cwl-set-output-ttl' closes #11100
Peter Amstutz [Fri, 26 May 2017 18:21:34 +0000 (14:21 -0400)]
Merge branch '11100-cwl-set-output-ttl' closes #11100

7 years agoMerge branch 'master' into 11100-cwl-set-output-ttl
Peter Amstutz [Fri, 26 May 2017 18:21:01 +0000 (14:21 -0400)]
Merge branch 'master' into 11100-cwl-set-output-ttl

7 years ago11100: Fix test
Peter Amstutz [Fri, 26 May 2017 16:13:25 +0000 (12:13 -0400)]
11100: Fix test

7 years ago11100: Add ciso8601 dependency
Peter Amstutz [Fri, 26 May 2017 15:06:35 +0000 (11:06 -0400)]
11100: Add ciso8601 dependency

7 years ago11100: Add test for --trash-intermediate. Add log message when intermediate
Peter Amstutz [Fri, 26 May 2017 14:42:47 +0000 (10:42 -0400)]
11100: Add test for --trash-intermediate.  Add log message when intermediate
outputs are scheduled for trash.

7 years ago11684: When packing small blocks into one, save references of the files
Lucas Di Pentima [Fri, 26 May 2017 02:34:59 +0000 (23:34 -0300)]
11684: When packing small blocks into one, save references of the files
included on the block when committing it asynchronously, so that the
segment's locators can be updated at the put thread after the block is
committed and the permission token is returned from the API Server.

7 years agocloses #11362 Merge branch '11362-missing-input-sdk/cwl'
Jiayong Li [Fri, 26 May 2017 01:49:26 +0000 (21:49 -0400)]
closes #11362 Merge branch '11362-missing-input-sdk/cwl'

7 years agoChange visit in pathmapper.py to raise OSError if input file is not found, change...
Jiayong Li [Fri, 26 May 2017 01:47:59 +0000 (21:47 -0400)]
Change visit in pathmapper.py to raise OSError if input file is not found, change test_pathmapper.py to test it, and update python client version in setup.py

7 years agorefs #11362 Merge branch '11362-missing-input-sdk/python'
Jiayong Li [Fri, 26 May 2017 01:38:12 +0000 (21:38 -0400)]
refs #11362 Merge branch '11362-missing-input-sdk/python'

7 years agoChange statfile in run.py to be able to raise OSError, and change the mock in test_pa...
Jiayong Li [Fri, 26 May 2017 01:36:51 +0000 (21:36 -0400)]
Change statfile in run.py to be able to raise OSError, and change the mock in test_pathmapper.py accordingly

7 years agoMerge branch '11501-job-stats-discrepancy'
Lucas Di Pentima [Wed, 24 May 2017 18:10:53 +0000 (15:10 -0300)]
Merge branch '11501-job-stats-discrepancy'
Closes #11501

7 years ago11501: Simplified helper method call. Changed wording of run time description.
Lucas Di Pentima [Wed, 24 May 2017 16:51:47 +0000 (13:51 -0300)]
11501: Simplified helper method call. Changed wording of run time description.

7 years agoMerge branch '11543-collection-per-tool' closes #11543
Peter Amstutz [Wed, 24 May 2017 14:56:49 +0000 (10:56 -0400)]
Merge branch '11543-collection-per-tool' closes #11543

7 years ago11100: Separate "trash intermediate on success" behavior from "output intermediate...
Peter Amstutz [Wed, 24 May 2017 14:36:40 +0000 (10:36 -0400)]
11100: Separate "trash intermediate on success" behavior from "output intermediate TTL" option.  Update documentation.

7 years ago11501: Don't filter out reused children when calculating running time.
Lucas Di Pentima [Wed, 24 May 2017 13:47:56 +0000 (10:47 -0300)]
11501: Don't filter out reused children when calculating running time.
Use always wall time when saying how much time passed after completion/failure.

7 years ago11501: When calculating a work unit's running time, only include 'leaf' children...
Lucas Di Pentima [Tue, 23 May 2017 23:11:14 +0000 (20:11 -0300)]
11501: When calculating a work unit's running time, only include 'leaf' children, filtering those that were reused.

7 years ago11543: Bump version dependency on arvados-python-client.
Peter Amstutz [Tue, 23 May 2017 19:53:10 +0000 (15:53 -0400)]
11543: Bump version dependency on arvados-python-client.

7 years ago11543: Upload tool dependencies into single collection. Add test for collection...
Peter Amstutz [Wed, 17 May 2017 13:03:18 +0000 (09:03 -0400)]
11543: Upload tool dependencies into single collection.  Add test for collection per tool.  Fix other tests.

7 years agoMerge branch '11543-uploadfile-collection' refs #11543
Peter Amstutz [Tue, 23 May 2017 19:52:05 +0000 (15:52 -0400)]
Merge branch '11543-uploadfile-collection' refs #11543

7 years ago11543: arvados.command.run.uploadfiles takes optional Collection to upload to.
Peter Amstutz [Wed, 17 May 2017 13:03:18 +0000 (09:03 -0400)]
11543: arvados.command.run.uploadfiles takes optional Collection to upload to.

7 years ago11501: Merge branch 'master' into 11501-job-stats-discrepancy
Lucas Di Pentima [Tue, 23 May 2017 14:26:33 +0000 (11:26 -0300)]
11501: Merge branch 'master' into 11501-job-stats-discrepancy

7 years ago11100: Update/add tests for --intermediate-output-ttl
Peter Amstutz [Mon, 22 May 2017 20:08:49 +0000 (16:08 -0400)]
11100: Update/add tests for --intermediate-output-ttl

7 years ago11684: Reverted easy fix to expose the bug: when there's a delay writing a block...
Lucas Di Pentima [Mon, 22 May 2017 20:05:45 +0000 (17:05 -0300)]
11684: Reverted easy fix to expose the bug: when there's a delay writing a block that's
produced by packing smaller blocks into one, its locator doesn't get updated with the
correct access token, so it will fail when trying to save the collection to the API
server.

7 years ago11100: Implement & document arv:IntermediateOutput hint.
Peter Amstutz [Mon, 22 May 2017 18:32:08 +0000 (14:32 -0400)]
11100: Implement & document arv:IntermediateOutput hint.

7 years ago11100: Propagate through to runner. Use intermediate_output_ttl consistently.
Peter Amstutz [Mon, 22 May 2017 17:06:39 +0000 (13:06 -0400)]
11100: Propagate through to runner.  Use intermediate_output_ttl consistently.

7 years ago11100: a-c-r sets output_ttl and deletes intermediate collections on success.
Peter Amstutz [Fri, 31 Mar 2017 21:49:38 +0000 (17:49 -0400)]
11100: a-c-r sets output_ttl and deletes intermediate collections on success.

7 years ago11501: Fix some tests when trying to use the walltime method on show_runtime.
Lucas Di Pentima [Mon, 22 May 2017 15:41:41 +0000 (12:41 -0300)]
11501: Fix some tests when trying to use the walltime method on show_runtime.

7 years ago11501: Improved test name
Lucas Di Pentima [Mon, 22 May 2017 15:40:57 +0000 (12:40 -0300)]
11501: Improved test name

7 years agoMerge branch '11369-crunchv2-notes' refs #11369
Peter Amstutz [Mon, 22 May 2017 15:10:50 +0000 (11:10 -0400)]
Merge branch '11369-crunchv2-notes' refs #11369

7 years ago11369: Add migration notes about crunchv1-to-crunchv2
Peter Amstutz [Mon, 22 May 2017 14:57:35 +0000 (10:57 -0400)]
11369: Add migration notes about crunchv1-to-crunchv2

7 years agoMerge branch '11720-govendor'
Tom Clegg [Sun, 21 May 2017 18:33:08 +0000 (14:33 -0400)]
Merge branch '11720-govendor'

closes #11720

7 years agoMerge branch '11590-log-reuse'
Tom Clegg [Fri, 19 May 2017 23:36:56 +0000 (19:36 -0400)]
Merge branch '11590-log-reuse'

closes #11590

7 years agoMerge branch '9005-disable-keepalive'
Tom Clegg [Fri, 19 May 2017 23:17:22 +0000 (19:17 -0400)]
Merge branch '9005-disable-keepalive'

refs #9005
refs #11726
refs #11729

7 years ago9005: 11726: 11729: Disable http keepalive.
Tom Clegg [Fri, 19 May 2017 23:11:05 +0000 (19:11 -0400)]
9005: 11726: 11729: Disable http keepalive.

The previous workaround for #9005 did not account for the prefetch
feature: if a goroutine is using the HTTP client to prefetch data at
the moment the handler exits, CloseIdleConnections() does not close
that connection, so it stays open indefinitely.

7 years ago11501: A work unit running time with children was only computed calculating its direct
Lucas Di Pentima [Fri, 19 May 2017 22:07:08 +0000 (19:07 -0300)]
11501: A work unit running time with children was only computed calculating its direct
childs, so if a work unit child has more children, its running time could differ.

7 years agoMerge branch '9005-conn-leak'
Tom Clegg [Fri, 19 May 2017 20:23:39 +0000 (16:23 -0400)]
Merge branch '9005-conn-leak'

refs #9005