[ARVADOS] updated: 558574e31f56db08c82ca7c2b955e74df04242dd

[git at public.curoverse.com]

Summary of changes:
 docker/compute/Dockerfile                 |  4 ++-
 services/keepstore/handler_test.go        | 56 +++++++++++++++----------------
 services/keepstore/handlers.go            |  6 ++--
 services/keepstore/keepstore.go           | 50 +++++++++++++--------------
 services/keepstore/keepstore_test.go      |  2 +-
 services/keepstore/pull_worker_test.go    | 34 +++++++++----------
 services/keepstore/trash_worker.go        | 10 +++---
 services/keepstore/trash_worker_test.go   | 20 +++++------
 services/keepstore/volume.go              |  4 +--
 services/keepstore/volume_generic_test.go |  4 +--
 services/keepstore/volume_test.go         |  2 +-
 services/keepstore/volume_unix.go         |  4 +--
 12 files changed, 99 insertions(+), 97 deletions(-)

       via  558574e31f56db08c82ca7c2b955e74df04242dd (commit)
       via  3acd3536404f889e259ed3634015ed66b173ff3d (commit)
       via  3b1598bb557a30f9a896ed36988702c5ae9f2ba9 (commit)
       via  c38c6e5f72a7b42ef0c473f77e9c660d65e32b7e (commit)
      from  91c929939c115f1abac3c5a3d0497a09901559a6 (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 558574e31f56db08c82ca7c2b955e74df04242dd
Merge: 91c9299 3acd353
Author: radhika <radhika at curoverse.com>
Date:   Tue Sep 15 12:24:30 2015 -0400

    Merge branch 'master' into 6260-test-datamanager
    
    Conflicts:
    	services/keepstore/keepstore.go

diff --cc services/keepstore/keepstore.go
index a79a401,c4a12c5..ec11af5
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@@ -347,13 -347,8 +347,13 @@@ func main() 
  			log.Fatalf("reading data manager token: %s\n", err)
  		}
  	}
 +
- 	if never_delete != true && data_manager_token != TEST_DATA_MANAGER_TOKEN {
++	if neverDelete != true && dataManagerToken != TEST_DATA_MANAGER_TOKEN {
 +		log.Fatal("never_delete must be true, see #6221")
 +	}
 +
- 	if blob_signing_key_file != "" {
- 		if buf, err := ioutil.ReadFile(blob_signing_key_file); err == nil {
+ 	if blobSigningKeyFile != "" {
+ 		if buf, err := ioutil.ReadFile(blobSigningKeyFile); err == nil {
  			PermissionSecret = bytes.TrimSpace(buf)
  		} else {
  			log.Fatalf("reading permission key: %s\n", err)

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


hooks/post-receive
--