[ARVADOS] updated: 0ba145115071473ba46a3fac30c2dc98b74f49ad

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/config/application.default.yml | 47 ++++++++++++++++++++++++---
 sdk/cli/bin/crunch-job                        | 17 +++++-----
 sdk/go/keepclient/support.go                  |  6 +---
 services/api/config/application.default.yml   | 43 ++++++++++++++++++++++--
 services/api/script/crunch-dispatch.rb        |  5 +++
 5 files changed, 99 insertions(+), 19 deletions(-)

       via  0ba145115071473ba46a3fac30c2dc98b74f49ad (commit)
       via  0fdfc23c640c831cb2c0ee1e04fb639eb032de6f (commit)
       via  73ce0cf7675e060d33e75488edfa4f533c177f82 (commit)
       via  32a29ee7d171dccdb424990ff9c73e4b893dc3e4 (commit)
       via  5a55113805af906145449be18ec86b1a95a5017b (commit)
       via  285c0092f8ae4d757e31754c91314baa4db5af44 (commit)
       via  559dc0ac07ea3d6820f5e220b9f6faf850ae63bf (commit)
       via  5a974b0568f7645a7e4377394da04940fa1ec137 (commit)
       via  99349abd0ee7347b5bac3d4a9638853c6d4b97ab (commit)
       via  acd1241cec9260d54c2dca55785e309644334c41 (commit)
       via  e45aa811c8489cae3ac83836aceca7f2ce6ba398 (commit)
       via  6d352c4bfe2d0e9a405a52863c28b00de47f4be5 (commit)
      from  2b20a0ec9a32abfd85c09474e044cfd4c09f4963 (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 0ba145115071473ba46a3fac30c2dc98b74f49ad
Author: radhika <radhika at curoverse.com>
Date:   Fri Sep 25 12:13:25 2015 -0400

    7162: Removed the call to get keep_disks when there is an error getting keep_services,
    since keep_services has been available since May 2014, #2776 according to Tom.

diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index ee308dd..63800b1 100644
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -85,12 +85,8 @@ func (this *KeepClient) DiscoverKeepServers() error {
 
 	// Get keep services from api server
 	err := this.Arvados.Call("GET", "keep_services", "", "accessible", nil, &m)
-
-	// If there is error getting keep services, get list of keep disks
 	if err != nil {
-		if err := this.Arvados.List("keep_disks", nil, &m); err != nil {
-			return err
-		}
+		return err
 	}
 
 	listed := make(map[string]bool)

commit 0fdfc23c640c831cb2c0ee1e04fb639eb032de6f
Merge: 5a974b0 73ce0cf
Author: radhika <radhika at curoverse.com>
Date:   Fri Sep 25 12:05:44 2015 -0400

    Merge branch 'master' into 7162-support-service-types


commit 5a974b0568f7645a7e4377394da04940fa1ec137
Merge: 2b20a0e 99349ab
Author: radhika <radhika at curoverse.com>
Date:   Fri Sep 25 08:29:59 2015 -0400

    Merge branch 'master' into 7162-support-service-types


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


hooks/post-receive
--