[ARVADOS] updated: 3e0f54e6f4d0be807d3e3a0f2b6a49cfef0c6a5e

[git at public.curoverse.com]

Summary of changes:
 sdk/go/arvadostest/run_servers.go   | 6 +++---
 services/api/Gemfile                | 2 +-
 services/api/Gemfile.lock           | 8 ++++----
 tools/keep-rsync/keep-rsync.go      | 2 +-
 tools/keep-rsync/keep-rsync_test.go | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

       via  3e0f54e6f4d0be807d3e3a0f2b6a49cfef0c6a5e (commit)
       via  c7e90eb35082a139d4f3f254efc538516fefaffa (commit)
       via  6445c6a979f54a9dfea782077cc39b62a6901416 (commit)
       via  3ce19b04f941270fc46bcfe739a215c3feab161d (commit)
       via  b212abf2074b52057f9c1dbf8ad9cef77b2ca8ce (commit)
      from  e02d4d685419b759d904bb265b3f24e2061012b2 (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 3e0f54e6f4d0be807d3e3a0f2b6a49cfef0c6a5e
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 15 12:18:20 2015 -0400

    7167: update the progress message to say "est. time remaining" instead of "ETA" which is not accurate in this case.

diff --git a/tools/keep-rsync/keep-rsync.go b/tools/keep-rsync/keep-rsync.go
index c39f067..705025b 100644
--- a/tools/keep-rsync/keep-rsync.go
+++ b/tools/keep-rsync/keep-rsync.go
@@ -262,7 +262,7 @@ func copyBlocksToDst(toBeCopied []string, kcSrc, kcDst *keepclient.KeepClient, b
 				float64(done)/float64(total)*100, locator)
 		} else {
 			timePerBlock := time.Since(startedAt) / time.Duration(done)
-			log.Printf("Copying data block %d of %d (%.2f%% done, ETA %v): %v", done+1, total,
+			log.Printf("Copying data block %d of %d (%.2f%% done, %v est. time remaining): %v", done+1, total,
 				float64(done)/float64(total)*100, timePerBlock*time.Duration(total-done), locator)
 		}
 

commit c7e90eb35082a139d4f3f254efc538516fefaffa
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 15 11:56:36 2015 -0400

    7167: rename the newly added StopKeepServers as StopKeepWithParams; it now sounds similar to StartKeepWithParams and is self explanatory.

diff --git a/sdk/go/arvadostest/run_servers.go b/sdk/go/arvadostest/run_servers.go
index d20a095..e922104 100644
--- a/sdk/go/arvadostest/run_servers.go
+++ b/sdk/go/arvadostest/run_servers.go
@@ -111,7 +111,7 @@ func StartKeepWithParams(numKeepServers int, enforcePermissions bool) {
 	defer os.Chdir(cwd)
 	chdirToPythonTests()
 
-	cmdArgs := []string{"run_test_server.py", "start_keep",	"--num-keep-servers", strconv.Itoa(numKeepServers)}
+	cmdArgs := []string{"run_test_server.py", "start_keep", "--num-keep-servers", strconv.Itoa(numKeepServers)}
 	if enforcePermissions {
 		cmdArgs = append(cmdArgs, "--keep-enforce-permissions")
 	}
@@ -129,13 +129,13 @@ func StartKeepWithParams(numKeepServers int, enforcePermissions bool) {
 }
 
 func StopKeep() {
-	StopKeepServers(2)
+	StopKeepWithParams(2)
 }
 
 // StopKeepServers stops keep servers that were started with
 // StartKeep. numkeepServers should be the same value that was passed
 // to StartKeep.
-func StopKeepServers(numKeepServers int) {
+func StopKeepWithParams(numKeepServers int) {
 	cwd, _ := os.Getwd()
 	defer os.Chdir(cwd)
 	chdirToPythonTests()
diff --git a/tools/keep-rsync/keep-rsync_test.go b/tools/keep-rsync/keep-rsync_test.go
index bb9d4a6..299df5a 100644
--- a/tools/keep-rsync/keep-rsync_test.go
+++ b/tools/keep-rsync/keep-rsync_test.go
@@ -51,7 +51,7 @@ func (s *ServerRequiredSuite) SetUpTest(c *C) {
 }
 
 func (s *ServerRequiredSuite) TearDownTest(c *C) {
-	arvadostest.StopKeepServers(3)
+	arvadostest.StopKeepWithParams(3)
 }
 
 var testKeepServicesJSON = "{ \"kind\":\"arvados#keepServiceList\", \"etag\":\"\", \"self_link\":\"\", \"offset\":null, \"limit\":null, \"items\":[ { \"href\":\"/keep_services/zzzzz-bi6l4-123456789012340\", \"kind\":\"arvados#keepService\", \"etag\":\"641234567890enhj7hzx432e5\", \"uuid\":\"zzzzz-bi6l4-123456789012340\", \"owner_uuid\":\"zzzzz-tpzed-123456789012345\", \"service_host\":\"keep0.zzzzz.arvadosapi.com\", \"service_port\":25107, \"service_ssl_flag\":false, \"service_type\":\"disk\", \"read_only\":false }, { \"href\":\"/keep_services/zzzzz-bi6l4-123456789012341\", \"kind\":\"arvados#keepService\", \"etag\":\"641234567890enhj7hzx432e5\", \"uuid\":\"zzzzz-bi6l4-123456789012341\", \"owner_uuid\":\"zzzzz-tpzed-123456789012345\", \"service_host\":\"keep0.zzzzz.arvadosapi.com\", \"service_port\":25108, \"service_ssl_flag\":false, \"service_type\":\"disk\", \"read_only\":false } ], \"items_available\":2 }"

commit 6445c6a979f54a9dfea782077cc39b62a6901416
Merge: 3ce19b0 e02d4d6
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 15 11:08:10 2015 -0400

    Merge branch '7167-keep-rsync' of git.curoverse.com:arvados into 7167-keep-rsync


commit 3ce19b04f941270fc46bcfe739a215c3feab161d
Merge: 845f7b9 b212abf
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 14 23:01:13 2015 -0400

    Merge branch 'master' into 7167-keep-rsync


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


hooks/post-receive
--