[ARVADOS] updated: 1356cd61457b8a48ed879b97c5cd14eb4ccf0f29

Git user git at public.curoverse.com
Mon Aug 22 09:22:37 EDT 2016


Summary of changes:
 sdk/cwl/test_with_arvbox.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

  discards  630c30fcf5f56b66db173f718aead72cb0bb111a (commit)
       via  1356cd61457b8a48ed879b97c5cd14eb4ccf0f29 (commit)
       via  6b2ee0dd59e39307649b72940824ceafada35fac (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (630c30fcf5f56b66db173f718aead72cb0bb111a)
            \
             N -- N -- N (1356cd61457b8a48ed879b97c5cd14eb4ccf0f29)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 1356cd61457b8a48ed879b97c5cd14eb4ccf0f29
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 22 09:13:15 2016 -0400

    9826: Deserialize symbols when loading server config YAML.

diff --git a/services/api/config/initializers/load_config.rb b/services/api/config/initializers/load_config.rb
index de9770d..76234d3 100644
--- a/services/api/config/initializers/load_config.rb
+++ b/services/api/config/initializers/load_config.rb
@@ -28,7 +28,7 @@ $application_config = {}
   path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
   if File.exists? path
     yaml = ERB.new(IO.read path).result(binding)
-    confs = YAML.load(yaml)
+    confs = YAML.load(yaml, deserialize_symbols: true)
     # Ignore empty YAML file:
     next if confs == false
     $application_config.merge!(confs['common'] || {})

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list