[ARVADOS] updated: 1e2ace543b5614023e30f77d85c19da954cbf1cb

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/collections_controller.rb      |  86 ++++++++-
 apps/workbench/config/application.default.yml      |  29 +++
 .../controllers/collections_controller_test.rb     | 129 ++++++++++++-
 apps/workbench/test/helpers/download_helper.rb     |  21 +++
 .../test/integration/collection_upload_test.rb     |  42 +++--
 apps/workbench/test/integration/download_test.rb   |  51 +++++
 apps/workbench/test/integration_helper.rb          |  16 +-
 apps/workbench/test/test_helper.rb                 |   5 +
 doc/install/install-keep-web.html.textile.liquid   |  42 +++--
 sdk/go/arvadosclient/arvadosclient_test.go         |   5 +
 sdk/go/arvadostest/run_servers.go                  |  62 +++---
 sdk/go/keepclient/discover.go                      | 130 +++++++++++++
 sdk/go/keepclient/discover_test.go                 |  21 +++
 sdk/go/keepclient/support.go                       |  81 --------
 sdk/python/tests/nginx.conf                        |  14 ++
 sdk/python/tests/run_test_server.py                | 182 +++++++++++++-----
 .../api/app/controllers/database_controller.rb     |   4 +
 .../test/fixtures/api_client_authorizations.yml    |   2 +-
 services/keep-web/handler.go                       |  68 ++++++-
 services/keep-web/handler_test.go                  | 103 ++++++++--
 services/keepproxy/keepproxy.go                    |  48 +----
 services/keepproxy/keepproxy_test.go               | 209 ++++++---------------
 services/keepstore/pull_worker_integration_test.go |   4 +
 tools/keep-rsync/keep-rsync_test.go                |   6 +-
 24 files changed, 933 insertions(+), 427 deletions(-)
 create mode 100644 apps/workbench/test/helpers/download_helper.rb
 create mode 100644 apps/workbench/test/integration/download_test.rb
 create mode 100644 sdk/go/keepclient/discover.go
 create mode 100644 sdk/go/keepclient/discover_test.go

       via  1e2ace543b5614023e30f77d85c19da954cbf1cb (commit)
       via  206451cdcaee133836761024c8517629de429f10 (commit)
       via  51169558811743fcd2e21e4b9397f9fb2d4766b0 (commit)
       via  f8fdd0cbdf1de1464bc1fc7cc5e7660205edf56b (commit)
       via  1e427ad73a413642bfe35d7865f8b03b8564c1da (commit)
       via  05a38f1bd00d572cbfd67d7276f5bcae6bb24805 (commit)
       via  a4ed403c77477b7cc869c5fdd801ac839e941b9c (commit)
       via  9d2a99db8f9b1259d94f650c550d2101e5d915d5 (commit)
       via  a7b140ac8c00ca5f9dfb1f3a46c78dd7b9a68730 (commit)
       via  b86c7d168ce73f830f01d204189ed0941bf8e469 (commit)
       via  6fab045dba4714e9c748337ef974ef257df37353 (commit)
       via  a3dfcea5c3767936aa7bff6e03268d4ecadd0489 (commit)
       via  1e10339657c1dee2b71b4d10eddffd0a35c949b3 (commit)
       via  100b485f4295cbb414ed743b2fdba990591272e7 (commit)
       via  745cfb876277f0c65244d570c1736fb936446f35 (commit)
       via  b1ef43a1dbb4a66e1646fc68ac88ff6d54026ac1 (commit)
       via  767e1199d0e1bdf2b564b5c58a91d29141eb67d7 (commit)
       via  ce2bf31ba0831d9704f2edf82297f701b3b994df (commit)
       via  ecc0d50421458b1ccd175b4e1e9fc539a98088ed (commit)
       via  6fbf2a60cf4a41156cf97c98e36ff54ec76f8401 (commit)
       via  a4acb3ae95b2fc7f4b5f1e174c910a54cc6681da (commit)
       via  0f535af4fbcb7a9f6ca1e25675b31cc9656d88f3 (commit)
       via  813d35123538b00ab70719e247b6bb0881269460 (commit)
       via  de1aef9bd3cd982604b1f9f1ad8433d0b28112ee (commit)
       via  0795b298257f0441f94993999e1dc718a1f64bbd (commit)
       via  9bc64c76164e6b11cbbfd0bdb86483243bb08306 (commit)
       via  bf159738719badbbe1e08ee4f839027892912ab2 (commit)
      from  3cdc4e8e3668b783f42f887f6a8662b66ecb7f9a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1e2ace543b5614023e30f77d85c19da954cbf1cb
Merge: 3cdc4e8 206451c
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Nov 11 12:14:16 2015 -0500

    Merge branch '5824-keep-web-workbench' refs #5824


commit 206451cdcaee133836761024c8517629de429f10
Merge: 5116955 3cdc4e8
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Nov 11 12:11:46 2015 -0500

    5824: Merge branch 'master' into 5824-keep-web-workbench
    
    Conflicts:
    	services/keepproxy/keepproxy_test.go

diff --cc sdk/go/arvadosclient/arvadosclient_test.go
index d148723,f2fd0b1..8e32efe
--- a/sdk/go/arvadosclient/arvadosclient_test.go
+++ b/sdk/go/arvadosclient/arvadosclient_test.go
@@@ -23,13 -26,9 +26,14 @@@ type ServerRequiredSuite struct{
  func (s *ServerRequiredSuite) SetUpSuite(c *C) {
  	arvadostest.StartAPI()
  	arvadostest.StartKeep(2, false)
+ 	RetryDelay = 0
  }
  
 +func (s *ServerRequiredSuite) TearDownSuite(c *C) {
 +	arvadostest.StopKeep(2)
 +	arvadostest.StopAPI()
 +}
 +
  func (s *ServerRequiredSuite) SetUpTest(c *C) {
  	arvadostest.ResetEnv()
  }

-----------------------------------------------------------------------


hooks/post-receive
--