arvados.git
9 years ago2871: add preload methods for collections and logs in application_controller. Use...
radhika [Wed, 4 Jun 2014 15:15:24 +0000 (11:15 -0400)]
2871: add preload methods for collections and logs in application_controller. Use the preload methods in dashboard.

9 years ago2871: add helper method to get "n" number of objects of specific dataclass
radhika [Tue, 3 Jun 2014 18:44:32 +0000 (14:44 -0400)]
2871: add helper method to get "n" number of objects of specific dataclass

9 years agoMerge branch 'master' into 2871-preload-objects
radhika [Tue, 3 Jun 2014 15:27:41 +0000 (11:27 -0400)]
Merge branch 'master' into 2871-preload-objects

9 years ago2871: preload links helper method is added to workbench application_controller.
radhika [Tue, 3 Jun 2014 15:26:23 +0000 (11:26 -0400)]
2871: preload links helper method is added to workbench application_controller.

9 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

9 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

9 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

9 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

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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 years ago2752: Show arv-put output on stdin test failure.
Brett Smith [Mon, 2 Jun 2014 14:55:15 +0000 (10:55 -0400)]
2752: Show arv-put output on stdin test failure.

9 years ago2755: Adjust arv-put test invocation.
Brett Smith [Mon, 2 Jun 2014 14:54:43 +0000 (10:54 -0400)]
2755: Adjust arv-put test invocation.

This method works better with the new test layout.

9 years ago2752: arv-put works when it can't write a cache file.
Brett Smith [Mon, 2 Jun 2014 14:23:42 +0000 (10:23 -0400)]
2752: arv-put works when it can't write a cache file.

9 years ago2752: Rename test_arv_put.py.
Brett Smith [Mon, 2 Jun 2014 14:03:30 +0000 (10:03 -0400)]
2752: Rename test_arv_put.py.

This allows us to run specific test cases from the command-line.  The
hyphen in the filename prevented that before.

9 years ago2752/2755: Move test_cmdline code to test_arv-put.
Brett Smith [Mon, 2 Jun 2014 13:48:58 +0000 (09:48 -0400)]
2752/2755: Move test_cmdline code to test_arv-put.

Tim and I wrote tests for arv-put simultaneously.  This commit merges
them together.

9 years ago2872: Remove name column from collections table.
Tom Clegg [Sun, 1 Jun 2014 04:13:33 +0000 (00:13 -0400)]
2872: Remove name column from collections table.

9 years ago2903: merge master
radhika [Fri, 30 May 2014 21:42:22 +0000 (17:42 -0400)]
2903: merge master

9 years agoMerge branch 'master' into 2903-remove-pi-active-and-success
radhika [Fri, 30 May 2014 21:39:44 +0000 (17:39 -0400)]
Merge branch 'master' into 2903-remove-pi-active-and-success

9 years ago2893: Fix accepting JSON-encoded components_summary in API calls. refs #2893
Tom Clegg [Fri, 30 May 2014 21:12:34 +0000 (17:12 -0400)]
2893: Fix accepting JSON-encoded components_summary in API calls. refs #2893

9 years agoMerge branch 'master' into 2681-new-inactive-user-notification
Ward Vandewege [Fri, 30 May 2014 19:50:59 +0000 (15:50 -0400)]
Merge branch 'master' into 2681-new-inactive-user-notification

9 years agoRefactor user notification tests
Ward Vandewege [Fri, 30 May 2014 19:49:44 +0000 (15:49 -0400)]
Refactor user notification tests

9 years agoMerge branch '2755-python-sdk-permissions'
Tim Pierce [Fri, 30 May 2014 19:27:48 +0000 (15:27 -0400)]
Merge branch '2755-python-sdk-permissions'

Closes #2755.

9 years agoMerge branch 'master' into 2755-python-sdk-permissions
Tim Pierce [Fri, 30 May 2014 19:22:32 +0000 (15:22 -0400)]
Merge branch 'master' into 2755-python-sdk-permissions

Conflicts:
sdk/python/bin/arv-put

9 years ago2752: Include arvados.commands submodule in built packages.
Brett Smith [Fri, 30 May 2014 19:06:37 +0000 (15:06 -0400)]
2752: Include arvados.commands submodule in built packages.

9 years ago2893: Merge branch '2893-no-symbols-in-db' closes #2893
Tom Clegg [Fri, 30 May 2014 18:55:21 +0000 (14:55 -0400)]
2893: Merge branch '2893-no-symbols-in-db' closes #2893

9 years ago2893: Merge branch 'master' into 2893-no-symbols-in-db
Tom Clegg [Fri, 30 May 2014 18:54:27 +0000 (14:54 -0400)]
2893: Merge branch 'master' into 2893-no-symbols-in-db

Conflicts:
services/api/test/fixtures/links.yml

9 years agoMerge remote-tracking branch 'refs/remotes/origin/2755-python-sdk-permissions-TC...
Tim Pierce [Fri, 30 May 2014 18:42:03 +0000 (14:42 -0400)]
Merge remote-tracking branch 'refs/remotes/origin/2755-python-sdk-permissions-TC' into 2755-python-sdk-permissions

Refs #2755.

9 years ago2755: add unit test for Collection.normalize_uuid.
Tim Pierce [Fri, 30 May 2014 18:40:37 +0000 (14:40 -0400)]
2755: add unit test for Collection.normalize_uuid.

9 years ago2893: Add test cases. Stringify all serialized attrs coming from DB,
Tom Clegg [Fri, 30 May 2014 17:26:45 +0000 (13:26 -0400)]
2893: Add test cases. Stringify all serialized attrs coming from DB,
not just Hash. Rename has_any_symbols? to has_symbols?.

9 years ago2755: Let the API server decide the correct collection UUID format.
Tom Clegg [Fri, 30 May 2014 15:06:17 +0000 (11:06 -0400)]
2755: Let the API server decide the correct collection UUID format.

9 years ago2931: Remove {dependent: :destroy} in ArvadosModel. HasUuid does that now. closes...
Tom Clegg [Fri, 30 May 2014 14:45:00 +0000 (10:45 -0400)]
2931: Remove {dependent: :destroy} in ArvadosModel. HasUuid does that now. closes #2931

9 years agoMerge branch '2752-arv-put-resume'
Brett Smith [Fri, 30 May 2014 14:45:02 +0000 (10:45 -0400)]
Merge branch '2752-arv-put-resume'

Closes #2752, #2864.

9 years ago2752: arv-put doesn't update the resume cache when aborted.
Brett Smith [Fri, 30 May 2014 14:21:59 +0000 (10:21 -0400)]
2752: arv-put doesn't update the resume cache when aborted.

It's appealing to try to save the latest state when we have the
opportunity, but the problem is that we can't be sure that our
CollectionWriter is in a consistent state when we get a signal or
exception.  The previous code could potentially write inconsistent
state, which would appear to resume successfully but PUT different
data.  Instead rely exclusively on cache updates that are done from a
known consistent state.

9 years ago2752: arv-put explains resumed uploads in more detail.
Brett Smith [Fri, 30 May 2014 13:49:34 +0000 (09:49 -0400)]
2752: arv-put explains resumed uploads in more detail.

Wording suggested by Peter in refs #2752.

9 years ago2752: arv-put writes newline after 100% human progress report.
Brett Smith [Fri, 30 May 2014 13:46:08 +0000 (09:46 -0400)]
2752: arv-put writes newline after 100% human progress report.

9 years ago2752: arv-put always displays 100% progress at the end.
Brett Smith [Fri, 30 May 2014 13:45:24 +0000 (09:45 -0400)]
2752: arv-put always displays 100% progress at the end.

It's okay to call writer.finish_current_stream() this way, because
every branch at the end ultimately calls it.

9 years ago2752: Avoid ResumeCache name collisions from concatenating paths.
Brett Smith [Fri, 30 May 2014 13:08:50 +0000 (09:08 -0400)]
2752: Avoid ResumeCache name collisions from concatenating paths.

9 years ago2752: arv-put checkpoints after a PUT to Keep.
Brett Smith [Thu, 29 May 2014 20:36:30 +0000 (16:36 -0400)]
2752: arv-put checkpoints after a PUT to Keep.

This allows us to recover after a pulled-the-plug kind of failure, but
is still noticeably less overhead than checkpointing after each file.

9 years ago2752: arv-put handles exit signals.
Brett Smith [Thu, 29 May 2014 20:09:36 +0000 (16:09 -0400)]
2752: arv-put handles exit signals.

9 years ago2752: Resumed collection writer doesn't do_queued_work immediately.
Brett Smith [Thu, 29 May 2014 20:36:14 +0000 (16:36 -0400)]
2752: Resumed collection writer doesn't do_queued_work immediately.

As noted in the comments, callers that build a writer from resumed
state must do_queued_work on it before anything else.  But this split
makes it easier to treat initialization problems and work problems
separately, which is critical.

This required refactor progress reporting a bit.

9 years ago2752: Remove unused CollectionWriter checkpoint hook.
Brett Smith [Thu, 29 May 2014 17:53:29 +0000 (13:53 -0400)]
2752: Remove unused CollectionWriter checkpoint hook.

9 years ago2752: arv-put only caches state on failure.
Brett Smith [Thu, 29 May 2014 17:07:23 +0000 (13:07 -0400)]
2752: arv-put only caches state on failure.

This is slightly less robust, but writing the cache after every data
flush is too expensive.

9 years ago2752: Don't duplicate arv-put work after resume.
Brett Smith [Thu, 29 May 2014 17:02:14 +0000 (13:02 -0400)]
2752: Don't duplicate arv-put work after resume.

This change serializes the command-line arguments that we've actually
processed, vs. not.  That allows us to safely iterate over them again
to upload any files that we hadn't started, while skipping the ones
we've already done.

9 years ago2752: arv-put displays progress quickly after resuming.
Brett Smith [Thu, 29 May 2014 12:55:25 +0000 (08:55 -0400)]
2752: arv-put displays progress quickly after resuming.

Refs #2752.

9 years ago2752: arv-put displays a notice when it resumes.
Brett Smith [Thu, 29 May 2014 12:54:33 +0000 (08:54 -0400)]
2752: arv-put displays a notice when it resumes.

Based on a suggestion from Peter in refs #2752.

9 years ago2752: arv-put ResumeCache constructor only accepts path argument.
Brett Smith [Wed, 28 May 2014 21:27:47 +0000 (17:27 -0400)]
2752: arv-put ResumeCache constructor only accepts path argument.

Refs #2752.  Using exceptions to accept parsed arguments in the
constructor as well was too clever by half.

9 years ago2752: Fix arv-put's write percentage output.
Brett Smith [Wed, 28 May 2014 17:56:10 +0000 (13:56 -0400)]
2752: Fix arv-put's write percentage output.

9 years ago2752: Quiet arv-put stdin integration test.
Brett Smith [Wed, 28 May 2014 17:55:43 +0000 (13:55 -0400)]
2752: Quiet arv-put stdin integration test.

9 years ago2752: Avoid hiccup on arv-put with short stdin.
Brett Smith [Tue, 27 May 2014 14:49:13 +0000 (10:49 -0400)]
2752: Avoid hiccup on arv-put with short stdin.

Trying to call os.stat(os.path.realpath('/dev/stdin')) usually fails
in this case.  Since we're never going to be able to resume from stdin
anyway, don't bother with that check in this case.

9 years ago2752: Improve arv-put initialization from cache.
Brett Smith [Tue, 27 May 2014 14:20:50 +0000 (10:20 -0400)]
2752: Improve arv-put initialization from cache.

This puts ArvPutCollectionWriter's own instance variables, like the
progress reporter function, in place before work is resumed.

9 years ago2752: arv-put saves and restores write progress information.
Brett Smith [Tue, 27 May 2014 14:04:19 +0000 (10:04 -0400)]
2752: arv-put saves and restores write progress information.

This will make output less confusing to the user, and help them
understand that an upload is resuming.

9 years ago2752: arv-put shouldn't resume from expired Keep locators.
Brett Smith [Mon, 26 May 2014 11:31:07 +0000 (07:31 -0400)]
2752: arv-put shouldn't resume from expired Keep locators.

9 years ago2752: Add KeepLocator class to Python SDK.
Brett Smith [Mon, 26 May 2014 11:15:37 +0000 (07:15 -0400)]
2752: Add KeepLocator class to Python SDK.

I hope this can be one place to parse and manipulate locator strings.

9 years ago2752: arv-put resumes interrupted downloads from cache.
Brett Smith [Mon, 26 May 2014 12:12:25 +0000 (08:12 -0400)]
2752: arv-put resumes interrupted downloads from cache.

This commit simply uses all the state-saving work in arv-put's main()
function.

9 years ago2752: Add ResumeCache.restart().
Brett Smith [Fri, 23 May 2014 20:46:49 +0000 (16:46 -0400)]
2752: Add ResumeCache.restart().

This will make it easier for the user to bypass the cache.

9 years ago2752: Refactor progress reporting in arv-put's CollectionWriter.
Brett Smith [Fri, 23 May 2014 20:22:39 +0000 (16:22 -0400)]
2752: Refactor progress reporting in arv-put's CollectionWriter.

9 years ago2752: Separate and test progress reporting functions.
Brett Smith [Fri, 23 May 2014 19:52:50 +0000 (15:52 -0400)]
2752: Separate and test progress reporting functions.

9 years ago2752: Factor out arv-put byte tally, and test.
Brett Smith [Fri, 23 May 2014 18:55:56 +0000 (14:55 -0400)]
2752: Factor out arv-put byte tally, and test.

9 years ago2752: Add ResumableCollectionWriter serialization to arv-put.
Brett Smith [Fri, 23 May 2014 17:16:25 +0000 (13:16 -0400)]
2752: Add ResumableCollectionWriter serialization to arv-put.

9 years ago2752: Add ResumeCache to arv-put.
Brett Smith [Mon, 26 May 2014 12:02:15 +0000 (08:02 -0400)]
2752: Add ResumeCache to arv-put.

This class encapsulates all the functionality necessary to
de/serialize ResumableWriter state.

9 years ago2752: Generate cache filenames from arv-put arguments.
Brett Smith [Mon, 26 May 2014 12:01:27 +0000 (08:01 -0400)]
2752: Generate cache filenames from arv-put arguments.

9 years ago2752: Add basic test for arv-put.
Brett Smith [Thu, 22 May 2014 21:10:40 +0000 (17:10 -0400)]
2752: Add basic test for arv-put.

9 years ago2752: Extract common Python test methods.
Brett Smith [Thu, 22 May 2014 20:46:15 +0000 (16:46 -0400)]
2752: Extract common Python test methods.

I'm going to reuse these to test arv-put.

9 years ago2752: Move arv-put functionality to arvados.commands.put.
Brett Smith [Thu, 22 May 2014 20:11:10 +0000 (16:11 -0400)]
2752: Move arv-put functionality to arvados.commands.put.

This will make it easier to unit test arv-put, and make it easier for
developers to extend or customize its functionality.

9 years ago2752: Move Python tests to dedicated subdirectory.
Brett Smith [Thu, 22 May 2014 19:49:31 +0000 (15:49 -0400)]
2752: Move Python tests to dedicated subdirectory.

This better follows Python convention, and will let us build out our
test frameworks without cluttering the root source directories.

This change brings a small change to the way we run tests.  Pass the
directory name to the discover command:

    $ python -m unittest discover tests

9 years ago2752: Add arvados.collections.ResumableCollectionWriter.
Brett Smith [Fri, 30 May 2014 14:40:07 +0000 (10:40 -0400)]
2752: Add arvados.collections.ResumableCollectionWriter.

This is a subclass of CollectionWriter that only accepts data from the
filesystem.  In exchange, it can record its own state, and resume
writing from one of those states.  arv-put will use this to make the
user experience nicer if a long upload is interrupted.

9 years ago2752: Implement CollectionWriter with a work queue.
Brett Smith [Tue, 20 May 2014 16:14:07 +0000 (12:14 -0400)]
2752: Implement CollectionWriter with a work queue.

This will make it easier to capture and restore state.

9 years ago2752: Reuse CollectionWriter.write_file() where possible.
Brett Smith [Tue, 20 May 2014 15:29:44 +0000 (11:29 -0400)]
2752: Reuse CollectionWriter.write_file() where possible.

9 years ago2752: Add method CollectionWriter.write_file().
Brett Smith [Tue, 20 May 2014 15:15:00 +0000 (11:15 -0400)]
2752: Add method CollectionWriter.write_file().

9 years ago2752: Remove trailing whitespace in arv-put.
Brett Smith [Tue, 20 May 2014 15:12:56 +0000 (11:12 -0400)]
2752: Remove trailing whitespace in arv-put.

9 years ago2752: Add tests for CollectionWriter.write_directory_tree().
Brett Smith [Tue, 20 May 2014 14:25:18 +0000 (10:25 -0400)]
2752: Add tests for CollectionWriter.write_directory_tree().

9 years ago2752: Clean up after Python SDK Collections tests.
Brett Smith [Tue, 20 May 2014 13:47:27 +0000 (09:47 -0400)]
2752: Clean up after Python SDK Collections tests.

9 years ago2752: Refactor Python SDK test_collections.
Brett Smith [Tue, 20 May 2014 13:40:53 +0000 (09:40 -0400)]
2752: Refactor Python SDK test_collections.

This eliminates duplication in setup and teardown code, and clarifies
dependencies between tests a bit.

9 years ago2752: Clean up arv-put imports.
Brett Smith [Mon, 19 May 2014 18:10:41 +0000 (14:10 -0400)]
2752: Clean up arv-put imports.

9 years ago2755: comment doc fix.
Tim Pierce [Fri, 30 May 2014 13:49:26 +0000 (09:49 -0400)]
2755: comment doc fix.

9 years ago2755: code review.
Tim Pierce [Thu, 29 May 2014 21:08:22 +0000 (17:08 -0400)]
2755: code review.

* arv-put returns an unsigned manifest UUID.

* The ArvPutSignedManifest test first confirms that the collection is
  not present in the API server.  Also asserts that the arv-put command
  completed successfully.

* Additional tests for KeepPermissionTestCase for each potential
  combination of wrong authorization and signature.

9 years ago2762: Do not try to auto-destroy referring links when destroying a model with no...
Tom Clegg [Thu, 29 May 2014 20:48:30 +0000 (16:48 -0400)]
2762: Do not try to auto-destroy referring links when destroying a model with no uuid. refs #2762

9 years agoMerge branch 'master' into 2903-remove-pi-active-and-success
radhika [Thu, 29 May 2014 20:34:53 +0000 (16:34 -0400)]
Merge branch 'master' into 2903-remove-pi-active-and-success

9 years agoSwitch to using auth helpers instead of messing with Thread.current in the user tests.
Ward Vandewege [Thu, 29 May 2014 18:17:23 +0000 (14:17 -0400)]
Switch to using auth helpers instead of messing with Thread.current in the user tests.

9 years ago2754: Change "create pipeline" label to "run", to match others in same workflow.
Tom Clegg [Thu, 29 May 2014 17:58:02 +0000 (13:58 -0400)]
2754: Change "create pipeline" label to "run", to match others in same workflow.

9 years agoAnother fix to sharing scope to use keep_services/accessible. refs #2766
Peter Amstutz [Thu, 29 May 2014 17:41:23 +0000 (13:41 -0400)]
Another fix to sharing scope to use keep_services/accessible. refs #2766

9 years agoProvide link to users page in notification e-mails.
Ward Vandewege [Thu, 29 May 2014 17:32:59 +0000 (13:32 -0400)]
Provide link to users page in notification e-mails.

9 years agoAdded proper sharing scope to permit actually downloading shared files. refs #2766
Peter Amstutz [Thu, 29 May 2014 17:05:43 +0000 (13:05 -0400)]
Added proper sharing scope to permit actually downloading shared files. refs #2766

9 years ago2755: code review.
Tim Pierce [Thu, 29 May 2014 16:56:01 +0000 (12:56 -0400)]
2755: code review.

* CollectionWriter does not cache manifest_text, and recomputes it each
  time it is asked.

* Manifest uuid is computed from a manifest that has been stripped of
  permission hints, but not any other kind of locator hint.

9 years agoChange default for
Ward Vandewege [Thu, 29 May 2014 15:16:21 +0000 (11:16 -0400)]
Change default for

  new_user_notification_recipients
  new_inactive_user_notification_recipients

in config/application.default.yml to an empty array, so that it is
obvious how to specify multiple recipients.

9 years ago2753: Fix Collection inline file view.
Brett Smith [Thu, 29 May 2014 14:52:04 +0000 (10:52 -0400)]
2753: Fix Collection inline file view.

The height limit needs to be applied to the images themselves, rather
than the containing div.

9 years agoAdded rescue AccessForbiddenException to collections controller and view to
Peter Amstutz [Thu, 29 May 2014 14:18:53 +0000 (10:18 -0400)]
Added rescue AccessForbiddenException to collections controller and view to
disable the "sharing link" feature when the client is untrusted. refs #2766

9 years ago2903: during validation methods, set state instead of success
radhika [Thu, 29 May 2014 14:08:02 +0000 (10:08 -0400)]
2903: during validation methods, set state instead of success

9 years agoMerge branch 'master' into 2903-remove-pi-active-and-success
radhika [Thu, 29 May 2014 13:37:02 +0000 (09:37 -0400)]
Merge branch 'master' into 2903-remove-pi-active-and-success

9 years agoMerge branch '2044-share-button' refs #2766
Peter Amstutz [Thu, 29 May 2014 13:32:08 +0000 (09:32 -0400)]
Merge branch '2044-share-button' refs #2766

9 years agoGo Keep client correctly closes response body on client requests, should fix
Peter Amstutz [Thu, 29 May 2014 13:22:43 +0000 (09:22 -0400)]
Go Keep client correctly closes response body on client requests, should fix
lingering connections problem.  Also added graceful shutdown on SIGINT to
keepproxy. refs #1885

9 years agoMerge branch 'master' into 2681-new-inactive-user-notification
Ward Vandewege [Thu, 29 May 2014 00:29:12 +0000 (20:29 -0400)]
Merge branch 'master' into 2681-new-inactive-user-notification

9 years ago2903: active to state usage
radhika [Wed, 28 May 2014 23:12:11 +0000 (19:12 -0400)]
2903: active to state usage