arvados.git
8 years agoMerge branch 'master' into 7490-datamanager-dont-die-return-error
radhika [Wed, 11 Nov 2015 17:34:04 +0000 (12:34 -0500)]
Merge branch 'master' into 7490-datamanager-dont-die-return-error

8 years agoMerge branch '5824-keep-web-workbench' refs #5824
Tom Clegg [Wed, 11 Nov 2015 17:14:16 +0000 (12:14 -0500)]
Merge branch '5824-keep-web-workbench' refs #5824

8 years ago5824: Merge branch 'master' into 5824-keep-web-workbench
Tom Clegg [Wed, 11 Nov 2015 17:11:46 +0000 (12:11 -0500)]
5824: Merge branch 'master' into 5824-keep-web-workbench

Conflicts:
services/keepproxy/keepproxy_test.go

8 years agoMerge branch 'master' into 7490-datamanager-dont-die-return-error
radhika [Wed, 11 Nov 2015 16:36:10 +0000 (11:36 -0500)]
Merge branch 'master' into 7490-datamanager-dont-die-return-error

8 years agocloses #7661
radhika [Wed, 11 Nov 2015 16:01:24 +0000 (11:01 -0500)]
closes #7661
Merge branch '7661-fuse-by-pdh'

8 years agoMerge branch 'master' into 7661-fuse-by-pdh
radhika [Wed, 11 Nov 2015 16:01:02 +0000 (11:01 -0500)]
Merge branch 'master' into 7661-fuse-by-pdh

8 years ago5824: Update/clarify docs and comments.
Tom Clegg [Wed, 11 Nov 2015 01:48:24 +0000 (20:48 -0500)]
5824: Update/clarify docs and comments.

8 years ago7661: Pass pdh_only when adding by_id subdir; test now passes.
radhika [Tue, 10 Nov 2015 23:41:55 +0000 (18:41 -0500)]
7661: Pass pdh_only when adding by_id subdir; test now passes.

8 years agoMerge branch '5538-test-post-retry' refs #5538
Tom Clegg [Tue, 10 Nov 2015 16:35:03 +0000 (11:35 -0500)]
Merge branch '5538-test-post-retry' refs #5538

8 years ago5538: Update comments to match new tests.
Tom Clegg [Tue, 10 Nov 2015 16:33:32 +0000 (11:33 -0500)]
5538: Update comments to match new tests.

8 years ago7661: added test with only_pdh (not working yet)
radhika [Tue, 10 Nov 2015 15:52:35 +0000 (10:52 -0500)]
7661: added test with only_pdh (not working yet)

8 years ago5538: Test that POST method is not retried.
Tom Clegg [Tue, 10 Nov 2015 15:10:55 +0000 (10:10 -0500)]
5538: Test that POST method is not retried.

8 years agoUse a different port number for each test case. No issue #
Tom Clegg [Tue, 10 Nov 2015 07:20:34 +0000 (02:20 -0500)]
Use a different port number for each test case. No issue #

8 years ago5824: Support configuration with a download-only host.
Tom Clegg [Tue, 10 Nov 2015 06:29:11 +0000 (01:29 -0500)]
5824: Support configuration with a download-only host.

8 years agoMerge branch 'master' into 7661-fuse-by-pdh
radhika [Mon, 9 Nov 2015 20:41:46 +0000 (15:41 -0500)]
Merge branch 'master' into 7661-fuse-by-pdh

8 years ago5824: Preserve query in keep_web_url template. Warn when redirecting preview to a...
Tom Clegg [Mon, 9 Nov 2015 20:00:14 +0000 (15:00 -0500)]
5824: Preserve query in keep_web_url template. Warn when redirecting preview to a single-origin keep_web_url.

8 years agoMerge branch '3585-arpi-project-uuid-wip' closes #3585
Peter Amstutz [Mon, 9 Nov 2015 19:33:09 +0000 (14:33 -0500)]
Merge branch '3585-arpi-project-uuid-wip' closes #3585

8 years agoMerge branch 'master' into 7661-fuse-by-pdh
radhika [Mon, 9 Nov 2015 19:01:17 +0000 (14:01 -0500)]
Merge branch 'master' into 7661-fuse-by-pdh

8 years agoMerge branch 'master' into 7490-datamanager-dont-die-return-error
radhika [Mon, 9 Nov 2015 18:54:56 +0000 (13:54 -0500)]
Merge branch 'master' into 7490-datamanager-dont-die-return-error

8 years agocloses #5538
radhika [Mon, 9 Nov 2015 18:54:29 +0000 (13:54 -0500)]
closes #5538
Merge branch '5538-arvadosclient-retry'

8 years ago5538: update the test case for "error" to use better stub parameters with nil status...
radhika [Mon, 9 Nov 2015 18:49:31 +0000 (13:49 -0500)]
5538: update the test case for "error" to use better stub parameters with nil status codes and response body to avoid any confusion to the reader.

8 years ago7661: rename MagiDirectory by_pdh as pdh_only
radhika [Mon, 9 Nov 2015 16:21:35 +0000 (11:21 -0500)]
7661: rename MagiDirectory by_pdh as pdh_only

8 years agoMerge branch 'master' into 7661-fuse-by-pdh
radhika [Mon, 9 Nov 2015 15:43:13 +0000 (10:43 -0500)]
Merge branch 'master' into 7661-fuse-by-pdh

8 years ago7490: Convert several fatalf statements into returning errors. No new tests are added...
radhika [Mon, 9 Nov 2015 15:37:18 +0000 (10:37 -0500)]
7490: Convert several fatalf statements into returning errors. No new tests are added yet, but all the existing tests are passing.

8 years ago5538: add a test that simulates error during requesting server so that we can test...
radhika [Mon, 9 Nov 2015 13:38:29 +0000 (08:38 -0500)]
5538: add a test that simulates error during requesting server so that we can test the error path as well.

8 years ago3585: Add --project-uuid switch to a-r-p-i.
Brett Smith [Mon, 9 Nov 2015 11:05:28 +0000 (06:05 -0500)]
3585: Add --project-uuid switch to a-r-p-i.

8 years ago5824: Add anonymous-404 and download-by-pdh tests.
Tom Clegg [Mon, 9 Nov 2015 08:28:50 +0000 (03:28 -0500)]
5824: Add anonymous-404 and download-by-pdh tests.

8 years ago5824: Propagate non-token parts of query string (notably ?attachment=disposition...
Tom Clegg [Sun, 8 Nov 2015 20:52:29 +0000 (15:52 -0500)]
5824: Propagate non-token parts of query string (notably ?attachment=disposition) when redirecting.

8 years ago5824: Support partial content with Range header (only if start==0).
Tom Clegg [Sun, 8 Nov 2015 11:39:05 +0000 (06:39 -0500)]
5824: Support partial content with Range header (only if start==0).

8 years ago5824: Fix disposition=attachment handling.
Tom Clegg [Sat, 7 Nov 2015 09:36:01 +0000 (04:36 -0500)]
5824: Fix disposition=attachment handling.

Propagate disposition=attachment from Workbench to keep-web when
redirecting.

Include a filename in the Content-Disposition header if the request
URL contains "?", so UAs don't mistakenly include the query string as
part of the default filename.

8 years ago5824: Fixup new keepproxy tests to use simplified test setup.
Tom Clegg [Sat, 7 Nov 2015 09:06:47 +0000 (04:06 -0500)]
5824: Fixup new keepproxy tests to use simplified test setup.

See 813d35123538b00ab70719e247b6bb0881269460

8 years ago5824: Move "periodically refresh Keep services" func from keepproxy to SDK.
Tom Clegg [Sat, 7 Nov 2015 09:03:27 +0000 (04:03 -0500)]
5824: Move "periodically refresh Keep services" func from keepproxy to SDK.

8 years ago5824: Fix server shutdown code.
Tom Clegg [Sat, 7 Nov 2015 09:00:50 +0000 (04:00 -0500)]
5824: Fix server shutdown code.

* Pay attention to --num-keep-servers in stop_keep.

* Wait for processes to exit, to avoid start/stop races.

* Tighten exception handling in kill_server_pid() and warn instead of
  crashing in various races.

* Log TERM signals.

* Log when a server does not shut down within the given deadline.

8 years ago5824: Fix Keep server shutdown, check errors, simplify stderr redirection.
Tom Clegg [Sat, 7 Nov 2015 08:54:03 +0000 (03:54 -0500)]
5824: Fix Keep server shutdown, check errors, simplify stderr redirection.

(Oops, we forgot to actually Run() the python command for stop_keep.)

8 years ago5538: update the test to set resp.body with the given string from stub than hard...
radhika [Sat, 7 Nov 2015 14:25:48 +0000 (09:25 -0500)]
5538: update the test to set resp.body with the given string from stub than hard code it (overlooked in previous commit)

8 years ago5538: correct retryable list and use it to determine whether to close idle connection...
radhika [Sat, 7 Nov 2015 14:00:49 +0000 (09:00 -0500)]
5538: correct retryable list and use it to determine whether to close idle connections; add a few more test cases.

8 years agoMerge branch 'master' into 5538-arvadosclient-retry
radhika [Sat, 7 Nov 2015 13:42:38 +0000 (08:42 -0500)]
Merge branch 'master' into 5538-arvadosclient-retry

8 years ago5824: Use fifo2stderr for arv-git-httpd and keep-web logs, too.
Tom Clegg [Sat, 7 Nov 2015 07:22:07 +0000 (02:22 -0500)]
5824: Use fifo2stderr for arv-git-httpd and keep-web logs, too.

8 years ago5824: Sync test suite to new keep-web argument names.
Tom Clegg [Fri, 6 Nov 2015 21:58:32 +0000 (16:58 -0500)]
5824: Sync test suite to new keep-web argument names.

8 years ago5824: Merge branch 'master' into 5824-keep-web-workbench
Tom Clegg [Fri, 6 Nov 2015 21:53:01 +0000 (16:53 -0500)]
5824: Merge branch 'master' into 5824-keep-web-workbench

8 years agoMerge branch 'master' into 7490-datamanager-dont-die-return-error
radhika [Fri, 6 Nov 2015 15:35:54 +0000 (10:35 -0500)]
Merge branch 'master' into 7490-datamanager-dont-die-return-error

Conflicts:
services/datamanager/datamanager_test.go

8 years ago5538: much simpler and neater api stub test case array; golint
radhika [Fri, 6 Nov 2015 15:11:27 +0000 (10:11 -0500)]
5538: much simpler and neater api stub test case array; golint

8 years ago7724: Use datamanager token in keep-rsync tests. refs #7724
Tom Clegg [Fri, 6 Nov 2015 04:17:32 +0000 (23:17 -0500)]
7724: Use datamanager token in keep-rsync tests. refs #7724

8 years agoMerge branch 'master' into 5538-arvadosclient-retry
radhika [Fri, 6 Nov 2015 03:19:54 +0000 (22:19 -0500)]
Merge branch 'master' into 5538-arvadosclient-retry

8 years ago5538: Merge FailHandler and FailThenSucceedHandler into one APIStub to facilitate...
radhika [Fri, 6 Nov 2015 03:17:59 +0000 (22:17 -0500)]
5538: Merge FailHandler and FailThenSucceedHandler into one APIStub to facilitate testing many more error states; also add update and delete retry tests.

8 years ago5538: code improvements; use switch statement instead of if statement with several...
radhika [Fri, 6 Nov 2015 01:13:32 +0000 (20:13 -0500)]
5538: code improvements; use switch statement instead of if statement with several status code checks, sleep between retries.

8 years ago7724: Use datamanager token in keepproxy index test. refs #7724
Tom Clegg [Thu, 5 Nov 2015 19:35:38 +0000 (14:35 -0500)]
7724: Use datamanager token in keepproxy index test. refs #7724

8 years agoMerge branch '7724-scoped-token' closes #7724
Tom Clegg [Thu, 5 Nov 2015 18:46:20 +0000 (13:46 -0500)]
Merge branch '7724-scoped-token' closes #7724

8 years agoFix non-packaged API server paths in the install guide.
Brett Smith [Thu, 5 Nov 2015 17:12:17 +0000 (12:12 -0500)]
Fix non-packaged API server paths in the install guide.

No issue #.

8 years agoMerge branch '5824-keep-web' refs #5824
Tom Clegg [Thu, 5 Nov 2015 16:37:03 +0000 (11:37 -0500)]
Merge branch '5824-keep-web' refs #5824

8 years ago7724: Use a scoped token in data manager tests.
Tom Clegg [Thu, 5 Nov 2015 16:33:42 +0000 (11:33 -0500)]
7724: Use a scoped token in data manager tests.

8 years ago5824: Use ARVADOS_API_TOKEN=foo + -allow-anonymous instead of -anonymous-token=foo.
Tom Clegg [Thu, 5 Nov 2015 15:54:13 +0000 (10:54 -0500)]
5824: Use ARVADOS_API_TOKEN=foo + -allow-anonymous instead of -anonymous-token=foo.

8 years ago5824: Rename -address to -listen
Tom Clegg [Thu, 5 Nov 2015 15:11:06 +0000 (10:11 -0500)]
5824: Rename -address to -listen

8 years ago7490: The makeArvadosClient func, which is invoked by singlerun, should return error...
radhika [Thu, 5 Nov 2015 14:39:04 +0000 (09:39 -0500)]
7490: The makeArvadosClient func, which is invoked by singlerun, should return error; not fatalf.
The main method expects error in all error cases and decides next action; when wait time in makeArvadosClient is provided it will retry.

8 years ago5538: update the newly added TestFail* to use proper client with http.Transport
radhika [Wed, 4 Nov 2015 22:18:25 +0000 (17:18 -0500)]
5538: update the newly added TestFail* to use proper client with http.Transport

8 years agoMerge branch 'master' into 5538-arvadosclient-retry
radhika [Wed, 4 Nov 2015 22:11:10 +0000 (17:11 -0500)]
Merge branch 'master' into 5538-arvadosclient-retry

Conflicts:
sdk/go/arvadosclient/arvadosclient.go

8 years agorefs #5538
radhika [Wed, 4 Nov 2015 21:39:59 +0000 (16:39 -0500)]
refs #5538
Merge branch '5538-close-idle-connections'

8 years ago5538: update test to reuse arvados client in TestCreatePipelineTemplate between idle...
radhika [Wed, 4 Nov 2015 21:38:28 +0000 (16:38 -0500)]
5538: update test to reuse arvados client in TestCreatePipelineTemplate between idle and current connections.

8 years agoMerge branch 'master' into 5538-close-idle-connections
radhika [Wed, 4 Nov 2015 21:25:32 +0000 (16:25 -0500)]
Merge branch 'master' into 5538-close-idle-connections

8 years agocloses #7719
radhika [Wed, 4 Nov 2015 21:19:51 +0000 (16:19 -0500)]
closes #7719
Merge branch '7719-permit-net-delete'

8 years ago7719: permit never-delte to be set to false; add warning that datamanager is not...
radhika [Wed, 4 Nov 2015 21:13:29 +0000 (16:13 -0500)]
7719: permit never-delte to be set to false; add warning that datamanager is not yet fully tested.

8 years ago5538: add test with a connection idle for longer than MaxIdleConnectionDuration
radhika [Wed, 4 Nov 2015 19:58:46 +0000 (14:58 -0500)]
5538: add test with a connection idle for longer than MaxIdleConnectionDuration

8 years agoMerge branch 'master' into 5538-close-idle-connections
radhika [Wed, 4 Nov 2015 19:36:42 +0000 (14:36 -0500)]
Merge branch 'master' into 5538-close-idle-connections

8 years agoMerge branch '7713-node-manager-blacklist-broken-nodes-wip'
Brett Smith [Wed, 4 Nov 2015 19:32:01 +0000 (14:32 -0500)]
Merge branch '7713-node-manager-blacklist-broken-nodes-wip'

Closes #7713, #7718.

8 years ago5538: using fake arvados server to generate errors, added tests with retries.
radhika [Wed, 4 Nov 2015 19:08:24 +0000 (14:08 -0500)]
5538: using fake arvados server to generate errors, added tests with retries.

8 years ago7713: Node Manager blackholes broken nodes that can't shut down.
Brett Smith [Wed, 4 Nov 2015 17:20:36 +0000 (12:20 -0500)]
7713: Node Manager blackholes broken nodes that can't shut down.

We are seeing situations on Azure where some nodes in an UNKNOWN state
cannot be shut down.  The API call to destroy them always fails.

There are two related halves to this commit.  In the first half,
after a cloud shutdown request fails, ComputeNodeShutdownActor checks
whether the node is broken.  If it is, it cancels shutdown retries.

In the second half, the daemon checks for this shutdown outcome.  When
it happens, it blacklists the broken node: it will immediately filter
it out of node lists from the cloud.  It is no longer monitored in any
way or counted as a live node, so Node Manager will boot a replacement
for it.

This lets Node Manager create cloud nodes above max_nodes, up to the
number of broken nodes.  We're reasonably bounded in for now because
only the Azure driver will ever declare a node broken.  Other clouds
will never blacklist nodes this way.

8 years agoMerge branch 'master' into 5538-arvadosclient-retry
radhika [Wed, 4 Nov 2015 16:36:24 +0000 (11:36 -0500)]
Merge branch 'master' into 5538-arvadosclient-retry

8 years ago5538: close any idle connections before a POST or DELETE request.
radhika [Wed, 4 Nov 2015 16:34:35 +0000 (11:34 -0500)]
5538: close any idle connections before a POST or DELETE request.

8 years ago5538: retry failed arvados api requests when appropriate.
radhika [Wed, 4 Nov 2015 15:13:53 +0000 (10:13 -0500)]
5538: retry failed arvados api requests when appropriate.

8 years agoMerge branch '7444-dockercleaner-containers' closes #7444
Tom Clegg [Wed, 4 Nov 2015 05:19:40 +0000 (00:19 -0500)]
Merge branch '7444-dockercleaner-containers' closes #7444

8 years agoMerge branch '5824-keep-web'
Tom Clegg [Wed, 4 Nov 2015 04:55:11 +0000 (23:55 -0500)]
Merge branch '5824-keep-web'

refs #5824

8 years agoMerge branch '5824-keep-web' into 5824-keep-web-workbench
Tom Clegg [Wed, 4 Nov 2015 04:20:27 +0000 (23:20 -0500)]
Merge branch '5824-keep-web' into 5824-keep-web-workbench

Conflicts:
services/keepproxy/keepproxy.go

8 years ago5824: Merge branch 'master' into 5824-keep-web
Tom Clegg [Wed, 4 Nov 2015 04:06:45 +0000 (23:06 -0500)]
5824: Merge branch 'master' into 5824-keep-web

8 years ago5824: Avoid sending empty slices through toRead chan. Fixes race in test case.
Tom Clegg [Wed, 4 Nov 2015 03:50:50 +0000 (22:50 -0500)]
5824: Avoid sending empty slices through toRead chan. Fixes race in test case.

8 years ago5824: Turn off debug printfs unless enabled by calling program.
Tom Clegg [Tue, 3 Nov 2015 19:06:52 +0000 (14:06 -0500)]
5824: Turn off debug printfs unless enabled by calling program.

8 years agocloses #7534
radhika [Tue, 3 Nov 2015 15:43:33 +0000 (10:43 -0500)]
closes #7534
Merge branch '7534-superuser-token'

8 years agoMerge branch 'master' into 7534-superuser-token
radhika [Tue, 3 Nov 2015 15:43:07 +0000 (10:43 -0500)]
Merge branch 'master' into 7534-superuser-token

8 years ago7661: add --by-pdh option to FUSE and use this option in crunch-job. Do not start...
radhika [Tue, 3 Nov 2015 15:04:02 +0000 (10:04 -0500)]
7661: add --by-pdh option to FUSE and use this option in crunch-job. Do not start web socket client when --by-pdh is used.

8 years ago5824: Use session cookie instead of persistent.
Tom Clegg [Tue, 3 Nov 2015 14:55:50 +0000 (09:55 -0500)]
5824: Use session cookie instead of persistent.

8 years ago5824: Clarity edits in usage docs.
Tom Clegg [Tue, 3 Nov 2015 14:52:33 +0000 (09:52 -0500)]
5824: Clarity edits in usage docs.

8 years agoMerge branch '7593-cwl-crunchrunner' closes #7593
Peter Amstutz [Mon, 2 Nov 2015 22:42:54 +0000 (17:42 -0500)]
Merge branch '7593-cwl-crunchrunner' closes #7593

8 years ago7444: Rename kwarg remove_stopped_containers -> remove_containers_onexit
Tom Clegg [Mon, 2 Nov 2015 20:53:05 +0000 (15:53 -0500)]
7444: Rename kwarg remove_stopped_containers -> remove_containers_onexit

8 years ago7444: Set docker container name to {taskUUID}-{attemptNum}.
Tom Clegg [Mon, 2 Nov 2015 15:26:39 +0000 (10:26 -0500)]
7444: Set docker container name to {taskUUID}-{attemptNum}.

8 years ago7444: Do not remove docker containers with docker --rm; let dockercleaner do it.
Tom Clegg [Fri, 30 Oct 2015 22:28:46 +0000 (18:28 -0400)]
7444: Do not remove docker containers with docker --rm; let dockercleaner do it.

8 years ago7444: Clean stopped containers at startup.
Tom Clegg [Mon, 2 Nov 2015 20:46:22 +0000 (15:46 -0500)]
7444: Clean stopped containers at startup.

8 years ago7593: Add version hint to arvados-python-client. Add get_uploaded() and
Peter Amstutz [Mon, 2 Nov 2015 20:42:48 +0000 (15:42 -0500)]
7593: Add version hint to arvados-python-client.  Add get_uploaded() and
add_uploaded(). Add comments to clarify CollectionFsAccess._match

8 years ago7444: Test deletion error handling.
Tom Clegg [Mon, 2 Nov 2015 19:03:52 +0000 (14:03 -0500)]
7444: Test deletion error handling.

8 years ago7444: Note automatic removal of stopped containers, and how to disable.
Tom Clegg [Fri, 30 Oct 2015 22:44:20 +0000 (18:44 -0400)]
7444: Note automatic removal of stopped containers, and how to disable.

8 years ago7444: Delete containers as soon as they stop.
Tom Clegg [Fri, 30 Oct 2015 22:18:09 +0000 (18:18 -0400)]
7444: Delete containers as soon as they stop.

8 years ago5824: Mention -anonymous-token in godoc. Sync usage messages.
Tom Clegg [Fri, 30 Oct 2015 19:57:44 +0000 (15:57 -0400)]
5824: Mention -anonymous-token in godoc. Sync usage messages.

8 years ago5824: Give an anonymous token to keepproxy, not an admin token.
Tom Clegg [Fri, 30 Oct 2015 19:44:43 +0000 (15:44 -0400)]
5824: Give an anonymous token to keepproxy, not an admin token.

8 years ago5824: Send keepproxy and keepstore logs to stderr via fifo, just like nginx_access_log.
Tom Clegg [Fri, 30 Oct 2015 19:38:49 +0000 (15:38 -0400)]
5824: Send keepproxy and keepstore logs to stderr via fifo, just like nginx_access_log.

8 years ago6638/7370: Force new builds of Python backports with dependencies.
Brett Smith [Fri, 30 Oct 2015 19:12:04 +0000 (15:12 -0400)]
6638/7370: Force new builds of Python backports with dependencies.

Even though we've declared these dependencies for a while now, Jenkins
has not published packages with them, because without a new upstream
version, fpm believes that there's no new package to build.  This
resolves that by building a new iteration of the affected packages.

This is less than ideal, because if a new version is released, we'll
automatically package it with iteration 2.  That is not correct, but
it doesn't affect any functionality, and we already have a plan to do
things properly in #6885.  So we'll live with "correct functionality,
gross aesthetics" until then.

Ward approved in conversation.  Refs #6638, #7370.

8 years agoMerge branch '7668-crunch-node-properties-wip'
Brett Smith [Fri, 30 Oct 2015 18:47:31 +0000 (14:47 -0400)]
Merge branch '7668-crunch-node-properties-wip'

Closes #7668, #7672.

8 years ago7668: Move node stats from info to properties in fixtures.
Tom Clegg [Thu, 29 Oct 2015 16:06:55 +0000 (12:06 -0400)]
7668: Move node stats from info to properties in fixtures.

8 years ago7668: crunch-dispatch gets node stats from properties field.
Brett Smith [Wed, 28 Oct 2015 15:37:58 +0000 (11:37 -0400)]
7668: crunch-dispatch gets node stats from properties field.

This information moved from the info field to the properties field as
part of #3605.  This simply updates crunch-dispatch to catch up with
the change.

8 years ago5824: Enable anonymous use of keep-web in integration tests.
Tom Clegg [Fri, 30 Oct 2015 18:33:44 +0000 (14:33 -0400)]
5824: Enable anonymous use of keep-web in integration tests.

8 years agoMerge branch '5824-keep-web' into 5824-keep-web-workbench
Tom Clegg [Fri, 30 Oct 2015 18:30:13 +0000 (14:30 -0400)]
Merge branch '5824-keep-web' into 5824-keep-web-workbench

Conflicts:
sdk/python/tests/run_test_server.py
services/keepproxy/keepproxy_test.go

8 years ago5824: Merge branch 'master' into 5824-keep-web
Tom Clegg [Fri, 30 Oct 2015 18:22:21 +0000 (14:22 -0400)]
5824: Merge branch 'master' into 5824-keep-web

8 years agoSync Gemfile.lock to current Gemfile.
Tom Clegg [Fri, 30 Oct 2015 18:19:35 +0000 (14:19 -0400)]
Sync Gemfile.lock to current Gemfile.

amends 77460b2190e84df4178c25f014bbf136d559922e
refs #7582