[ARVADOS] updated: 5744e0bd6cdf57815739599291951884ba7f540d

git at public.curoverse.com git at public.curoverse.com
Mon Mar 9 22:54:18 EDT 2015


Summary of changes:
 apps/workbench/app/helpers/application_helper.rb   |   4 +-
 .../app/views/collections/_show_files.html.erb     |   2 +-
 .../test/integration/anonymous_access_test.rb      |   1 +
 ...tion_portable_data_hash_with_hinted_manifest.rb | 112 +++++++++++++++++++++
 services/api/db/structure.sql                      |   4 +-
 services/api/test/fixtures/collections.yml         |   2 +-
 services/keepstore/pull_worker_integration_test.go |   2 +-
 7 files changed, 122 insertions(+), 5 deletions(-)
 create mode 100644 services/api/db/migrate/20150303210106_fix_collection_portable_data_hash_with_hinted_manifest.rb

       via  5744e0bd6cdf57815739599291951884ba7f540d (commit)
       via  3e39701d68357b30030c5d187b8fc1da3c26cf6c (commit)
       via  cab38660eec30ff5d4e023f5d607d783ffd91785 (commit)
       via  c11612fdde6d2f9cdf3347f41a80f11a8ac65fac (commit)
       via  ef09ad4c9162eaf913e1a9bb65991b87116e40c0 (commit)
       via  349983851afa2bce63fbff33933d33a5ba13b8eb (commit)
       via  de828286fa92432a0075a5f16103011e52cd09d1 (commit)
       via  e6c2f09b14d03db040f2b81c451a7630bb78f1b1 (commit)
       via  efd59dbd5925023e9986875d9b0af4a456388db7 (commit)
       via  19656a41f019488120f950b06ecf9e19074b11a3 (commit)
       via  2a610a9d5d7e9446935436ff37267b8ada25fdbd (commit)
       via  cf3a1032b04dd30774e21680f5f26d75922919e3 (commit)
       via  ca111ab9aa86c7c25e547a44a46be71f3977c649 (commit)
       via  aa50f466c7515de653141964d13f3e204d46bb29 (commit)
      from  eb1b1a9e03b9a00d3180fb666e696067ba595041 (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 5744e0bd6cdf57815739599291951884ba7f540d
Merge: 3e39701 cab3866
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Mar 9 22:53:46 2015 -0400

    Merge branch 'master' into 3761-pull-list-worker


commit 3e39701d68357b30030c5d187b8fc1da3c26cf6c
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Mar 9 22:53:15 2015 -0400

    3761: need at least 1 replica

diff --git a/services/keepstore/pull_worker_integration_test.go b/services/keepstore/pull_worker_integration_test.go
index 05da98b..decc668 100644
--- a/services/keepstore/pull_worker_integration_test.go
+++ b/services/keepstore/pull_worker_integration_test.go
@@ -35,7 +35,7 @@ func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe
 
 	keepClient = keepclient.KeepClient{
 		Arvados:       &arv,
-		Want_replicas: 0,
+		Want_replicas: 1,
 		Using_proxy:   true,
 		Client:        &http.Client{},
 	}

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list