[ARVADOS] updated: 5dfc48c1a1697d9c29eac0061a491e96c9b72441

[Git user]

Summary of changes:
 sdk/cwl/tests/test_container.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

  discards  6e09079c0459de11a9002453c9d7a1c19989fa6e (commit)
       via  5dfc48c1a1697d9c29eac0061a491e96c9b72441 (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 (6e09079c0459de11a9002453c9d7a1c19989fa6e)
            \
             N -- N -- N (5dfc48c1a1697d9c29eac0061a491e96c9b72441)

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 5dfc48c1a1697d9c29eac0061a491e96c9b72441
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Feb 10 16:21:37 2017 -0500

    11088: Fix keep_cache_ram units.

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 4c4db17..f7a523a 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -103,7 +103,7 @@ class ArvadosContainer(object):
         runtime_req, _ = get_feature(self, "http://arvados.org/cwl#RuntimeConstraints")
         if runtime_req:
             if "keep_cache" in runtime_req:
-                runtime_constraints["keep_cache_ram"] = runtime_req["keep_cache"]
+                runtime_constraints["keep_cache_ram"] = runtime_req["keep_cache"] * 2**20
 
         partition_req, _ = get_feature(self, "http://arvados.org/cwl#PartitionRequirement")
         if partition_req:
diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py
index 45e2c7c..98297f3 100644
--- a/sdk/cwl/tests/test_container.py
+++ b/sdk/cwl/tests/test_container.py
@@ -127,7 +127,7 @@ class TestContainer(unittest.TestCase):
                 'runtime_constraints': {
                     'vcpus': 3,
                     'ram': 3145728000,
-                    'keep_cache_ram': 512,
+                    'keep_cache_ram': 536870912,
                     'API': True
                 },
                 'use_existing': True,

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


hooks/post-receive
--