[ARVADOS] updated: 89c2982376a7275e873d203c949d13b40fbd3bc4

[git at public.curoverse.com]

Summary of changes:
 README                                      |  4 ++--
 services/api/config/application.yml.example |  4 ++--
 tools/keep-rsync/keep-rsync_test.go         | 11 +++++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

       via  89c2982376a7275e873d203c949d13b40fbd3bc4 (commit)
       via  3445ed729dbccd21878373e01477be79e74a8453 (commit)
       via  d954b40925d8315ede49e9a05c05c0ba24a74ba9 (commit)
       via  f76d7ea1946e2ed67c8d64e13f49c885c5add83b (commit)
       via  2667ae2edcb79651eb55d85e21914ddf6638bb09 (commit)
       via  a5d766f5b4596d9b7b4996d5ccce43f46d61799a (commit)
      from  0bb6625febf6838867e105e3e7f66a485b639c76 (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 89c2982376a7275e873d203c949d13b40fbd3bc4
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 28 12:21:21 2015 -0400

    7167: update keep-rsync tests to use "Contains" instead of "HasSuffix" to make sure the error message checks pass even when retries happen.

diff --git a/tools/keep-rsync/keep-rsync_test.go b/tools/keep-rsync/keep-rsync_test.go
index 143e155..e728890 100644
--- a/tools/keep-rsync/keep-rsync_test.go
+++ b/tools/keep-rsync/keep-rsync_test.go
@@ -369,7 +369,7 @@ func (s *ServerRequiredSuite) TestErrorDuringRsync_ErrorPuttingBlockInDst(c *C)
 	kcDst.Want_replicas = 2
 
 	err := performKeepRsync(kcSrc, kcDst, blobSigningKey, "")
-	c.Check(strings.HasSuffix(err.Error(), "Could not write sufficient replicas"), Equals, true)
+	c.Check(strings.Contains(err.Error(), "Could not write sufficient replicas"), Equals, true)
 }
 
 // Test loadConfig func
@@ -413,7 +413,7 @@ func (s *ServerNotRequiredSuite) TestLoadConfig_MissingSrcConfig(c *C) {
 // Test loadConfig func - error reading config
 func (s *ServerNotRequiredSuite) TestLoadConfig_ErrorLoadingSrcConfig(c *C) {
 	_, _, err := loadConfig("no-such-config-file")
-	c.Assert(strings.HasSuffix(err.Error(), "no such file or directory"), Equals, true)
+	c.Assert(strings.Contains(err.Error(), "no such file or directory"), Equals, true)
 }
 
 func setupConfigFile(c *C, name string) *os.File {

commit 3445ed729dbccd21878373e01477be79e74a8453
Merge: 2667ae2 d954b40
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 28 12:18:33 2015 -0400

    Merge branch 'master' into 7492-keepproxy-upstream-errors


commit 2667ae2edcb79651eb55d85e21914ddf6638bb09
Merge: 0bb6625 a5d766f
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 28 09:51:26 2015 -0400

    Merge branch 'master' into 7492-keepproxy-upstream-errors


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


hooks/post-receive
--