[ARVADOS] updated: 9011a67f8fc545d62db07a8ab14d5f917b9d6613

[Git user]

Summary of changes:
 sdk/cli/arvados-cli.gemspec                        |   4 +-
 sdk/cli/bin/arv                                    |  29 +-
 sdk/go/arvadosclient/arvadosclient.go              |   2 +-
 sdk/go/arvadostest/fixtures.go                     |   3 +
 sdk/python/arvados/events.py                       |  46 ++--
 .../tests/{test_websockets.py => test_events.py}   | 143 +++++++++-
 sdk/ruby/arvados.gemspec                           |   4 +-
 .../v1/api_client_authorizations_controller.rb     |  10 +-
 .../arvados/v1/containers_controller.rb            |  15 ++
 services/api/app/models/container.rb               | 116 +++++---
 services/api/app/models/container_request.rb       |  62 +++--
 services/api/config/routes.rb                      |   5 +-
 .../20160506175108_add_auths_to_container.rb       |   6 +
 ...9143250_add_auth_and_lock_to_container_index.rb |  19 ++
 services/api/db/structure.sql                      |  12 +-
 services/api/lib/current_api_client.rb             |   6 +
 services/api/lib/whitelist_update.rb               |   4 +-
 .../test/fixtures/api_client_authorizations.yml    |   6 +
 services/api/test/fixtures/container_requests.yml  |  13 +
 services/api/test/fixtures/containers.yml          |   4 +-
 .../api_client_authorizations_controller_test.rb   |  13 +
 .../arvados/v1/containers_controller_test.rb       |  52 ++++
 services/api/test/test_helper.rb                   |   4 +
 services/api/test/unit/container_request_test.rb   |   8 +-
 services/api/test/unit/container_test.rb           | 295 +++++++++------------
 .../crunch-dispatch-local/crunch-dispatch-local.go | 146 ++++++----
 .../crunch-dispatch-local_test.go                  |  19 +-
 .../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 227 ++++++++++++----
 .../crunch-dispatch-slurm_test.go                  |  32 ++-
 services/keepstore/azure_blob_volume.go            |   2 +-
 30 files changed, 886 insertions(+), 421 deletions(-)
 rename sdk/python/tests/{test_websockets.py => test_events.py} (65%)
 create mode 100644 services/api/db/migrate/20160506175108_add_auths_to_container.rb
 create mode 100644 services/api/db/migrate/20160509143250_add_auth_and_lock_to_container_index.rb
 create mode 100644 services/api/test/fixtures/container_requests.yml
 create mode 100644 services/api/test/functional/arvados/v1/containers_controller_test.rb

       via  9011a67f8fc545d62db07a8ab14d5f917b9d6613 (commit)
       via  4c4387de5857ef00899fcb760a7cfc5ad4b76268 (commit)
       via  e0d2a1aa4e13da85575cef7ea4136e69b5423ba8 (commit)
       via  324d0d6d115488d0ac7fea7aa1a6cff3dd16be0e (commit)
       via  d2dad24530a065808487a3006ab20a98a67d8fa5 (commit)
       via  7f7ed63314bec77bf93edc233514c50a1030cac4 (commit)
       via  839a409f51114316c0683fbd00d8174fc24b4a9f (commit)
       via  3dd2a1957ae4106bfc2bd5405662c47c087eb79c (commit)
       via  ec38d4ae1a6597e1f35d5cd0b25f6384666c55be (commit)
       via  c60995ff0471ce31f0858d1f19a6788014112438 (commit)
       via  a7f30c913114a5e22d5e37b3fba67332f56ce6d9 (commit)
       via  3ede205bf0e5af7a88e04009cd66ff111e0729c3 (commit)
       via  408acd0b02c1d6f246b3723a9344c68c17d836b2 (commit)
       via  f1b2f6bf13b5e1a21d429a5b412e82fe84771cdd (commit)
       via  e348da8c60b35adae6bc9fdf388cebc8aee7dc6b (commit)
       via  b8be976adfabb17718dee8c569129cdf28036380 (commit)
       via  4e2763883588ac691da65ee316a52a052c002aa7 (commit)
       via  8e5206a5b1910ee7bc1d0a45af754ce507a7f237 (commit)
       via  55923446d946f11f03243ace3281b54ac5a4e80b (commit)
       via  14e317f75f2e3ecee53d78012eddaa59ce9e2712 (commit)
       via  1b4fa5760aab91a8422dc5d84c73bd627ff1dc51 (commit)
      from  3bd693d5a4732593817ff51fd49dc54f31f20b7e (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 9011a67f8fc545d62db07a8ab14d5f917b9d6613
Merge: 3bd693d 4c4387d
Author: radhika <radhika at curoverse.com>
Date:   Fri May 13 13:36:32 2016 -0400

    Merge branch 'master' into 8556-trash-untrash-azure-volume
    
    Conflicts:
    	services/keepstore/azure_blob_volume.go

diff --cc services/keepstore/azure_blob_volume.go
index 5b411eb,5bd7f10..55e5a95
--- a/services/keepstore/azure_blob_volume.go
+++ b/services/keepstore/azure_blob_volume.go
@@@ -289,16 -262,9 +289,16 @@@ func (v *AzureBlobVolume) Touch(loc str
  	if v.readonly {
  		return MethodDisabledError
  	}
 -	return v.bsClient.SetBlobMetadata(v.containerName, loc, map[string]string{
 -		"touch": fmt.Sprintf("%d", time.Now()),
 -	}, nil)
 +	trashed, metadata, err := v.checkTrashed(loc)
 +	if err != nil {
 +		return err
 +	}
 +	if trashed {
 +		return os.ErrNotExist
 +	}
 +
 +	metadata["touch"] = fmt.Sprintf("%d", time.Now())
- 	return v.bsClient.SetBlobMetadata(v.containerName, loc, metadata)
++	return v.bsClient.SetBlobMetadata(v.containerName, loc, metadata, nil)
  }
  
  // Mtime returns the last-modified property of a block blob.

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


hooks/post-receive
--