[ARVADOS] updated: d0284f9f1af01be566d671e875f31b12eeca1960

[git at public.curoverse.com]

Summary of changes:
 sdk/python/bin/arv-ls            | 3 ++-
 sdk/python/tests/test_arv_put.py | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

       via  d0284f9f1af01be566d671e875f31b12eeca1960 (commit)
       via  c2278f1529e9c6d0488920ec924684208f56e6ee (commit)
       via  22060b240f43ee4301032ba395ddd6ce59b4b581 (commit)
      from  5126d94fd644a657243e5ec80d5ef1fc250f8b76 (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 d0284f9f1af01be566d671e875f31b12eeca1960
Merge: 5126d94 c2278f1
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 3 12:28:22 2014 -0400

    Merge branch '3174-arv-ls-size-fencepost' closes #3174


commit c2278f1529e9c6d0488920ec924684208f56e6ee
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 3 11:11:48 2014 -0400

    3174: Round up, not down, when reporting file sizes in KB.

diff --git a/sdk/python/bin/arv-ls b/sdk/python/bin/arv-ls
index 9cfd5e4..cccce59 100755
--- a/sdk/python/bin/arv-ls
+++ b/sdk/python/bin/arv-ls
@@ -28,6 +28,7 @@ cr = arvados.CollectionReader(arvados.Keep.get(args.locator))
 
 for f in cr.all_files():
     if args.s:
-        print "{:>10} {}".format(f.size() / 1024, f.stream_name() + "/" + f.name())
+        print "{:>10} {}".format((f.size() + 1023) / 1024,
+                                 f.stream_name() + "/" + f.name())
     else:
         print f.stream_name() + "/" + f.name()

commit 22060b240f43ee4301032ba395ddd6ce59b4b581
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 3 11:10:35 2014 -0400

    3174: Heed "common" section of config yaml the same way apiserver does.

diff --git a/sdk/python/tests/test_arv_put.py b/sdk/python/tests/test_arv_put.py
index e0f3215..6e7c729 100644
--- a/sdk/python/tests/test_arv_put.py
+++ b/sdk/python/tests/test_arv_put.py
@@ -398,7 +398,10 @@ class ArvPutIntegrationTest(unittest.TestCase):
                                "config",
                                "application.yml")) as f:
             rails_config = yaml.load(f.read())
-        config_blob_signing_key = rails_config["test"]["blob_signing_key"]
+        try:
+            config_blob_signing_key = rails_config["test"]["blob_signing_key"]
+        except KeyError:
+            config_blob_signing_key = rails_config["common"]["blob_signing_key"]
         run_test_server.run()
         run_test_server.run_keep(blob_signing_key=config_blob_signing_key,
                                  enforce_permissions=True)

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


hooks/post-receive
--