[ARVADOS] updated: 1.3.0-966-g60560d144

[Git user]

Summary of changes:
 services/api/config/arvados_config.rb | 7 +++++++
 1 file changed, 7 insertions(+)

       via  60560d144b7abf7ff98eb12ca3a591211df19ce9 (commit)
      from  74b22016e6213628510414c96a7b7cd04c432378 (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 60560d144b7abf7ff98eb12ca3a591211df19ce9
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue May 28 13:53:47 2019 -0400

    15003: Ignore SAMPLE entries in default config file.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb
index 9ea36315f..22a8fed58 100644
--- a/services/api/config/arvados_config.rb
+++ b/services/api/config/arvados_config.rb
@@ -48,6 +48,13 @@ if $arvados_config_defaults.empty?
   raise "Missing #{::Rails.root.to_s}/config/config.default.yml"
 end
 
+def remove_sample_entries(h)
+  return unless h.is_a? Hash
+  h.delete("SAMPLE")
+  h.each { |k, v| remove_sample_entries(v) }
+end
+remove_sample_entries($arvados_config_defaults)
+
 clusterID, clusterConfig = $arvados_config_defaults["Clusters"].first
 $arvados_config_defaults = clusterConfig
 $arvados_config_defaults["ClusterID"] = clusterID

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


hooks/post-receive
--