[ARVADOS] updated: c3604c1cc57556520634f9af57213abc80c86da9
git at public.curoverse.com
git at public.curoverse.com
Wed Mar 18 10:06:46 EDT 2015
Summary of changes:
apps/workbench/config/initializers/mime_types.rb | 10 ++++----
sdk/python/arvados/commands/arv_copy.py | 4 ++-
.../app/controllers/arvados/v1/jobs_controller.rb | 11 +++++---
.../app/controllers/arvados/v1/nodes_controller.rb | 4 ++-
.../controllers/arvados/v1/schema_controller.rb | 4 ++-
services/api/app/models/arvados_model.rb | 6 +++--
services/api/app/models/blob.rb | 5 ++--
services/api/app/models/job.rb | 10 ++++----
services/api/app/models/keep_disk.rb | 2 +-
services/api/app/models/log.rb | 4 +--
services/api/app/models/node.rb | 10 +++++---
.../api/config/initializers/db_current_time.rb | 1 +
services/api/lib/db_current_time.rb | 7 +++++
services/api/test/unit/arvados_model_test.rb | 30 ++++++++++++++++++++++
.../arvnodeman/computenode/dispatch/__init__.py | 15 ++++++++---
.../arvnodeman/computenode/driver/__init__.py | 6 +++++
.../arvnodeman/computenode/driver/dummy.py | 4 +++
.../arvnodeman/computenode/driver/ec2.py | 4 +++
.../arvnodeman/computenode/driver/gce.py | 10 ++++++++
services/nodemanager/arvnodeman/daemon.py | 1 +
.../nodemanager/tests/test_computenode_dispatch.py | 27 ++++++++++++++++---
.../tests/test_computenode_driver_ec2.py | 6 +++++
.../tests/test_computenode_driver_gce.py | 13 ++++++++++
services/nodemanager/tests/testutil.py | 5 ++++
24 files changed, 164 insertions(+), 35 deletions(-)
create mode 100644 services/api/config/initializers/db_current_time.rb
create mode 100644 services/api/lib/db_current_time.rb
via c3604c1cc57556520634f9af57213abc80c86da9 (commit)
via f46eed2ad6bc456cd57ed363e1adc8d60f802f39 (commit)
via 6a13c4e44ce35056fb1ccbdf470a79b8b6b8bfa5 (commit)
via 44823f311ea0328c3a2aeefb7208a74031436d52 (commit)
via 9917d9eef58c161420fe119f19611d332a345507 (commit)
via b38fea181afac08137243a294a502e4605d679d8 (commit)
via fff9d822fdf8857a7d8e22c024bc4f04b3b94129 (commit)
via 3c191493c9c4d778525751d15dea8e83ed61fda6 (commit)
via 18148ec24bf63ec3353a2cd38f6f07c460037db2 (commit)
via 3606f69d567cb34cd3ab53c0fb994e30867450e1 (commit)
via beebf2cbe5edc986e1a268fabdd10a3f710dedd4 (commit)
via a1a1aed711dec0676575bd914cbe1356f7c0bb03 (commit)
via ff04973bb7508493a9cdc29a50d36c9c4a50936d (commit)
via 29dd43933769bf47d0018d967037bc31b679dfd9 (commit)
via 8efc8d844b03a0cb41955eaf0ab18ce53565bbd8 (commit)
via 2507d47331437166d89f6147faaf8aaabb965a94 (commit)
via b63b1c67513ee167aa579fa5182341d51e71d2aa (commit)
via b0c5270a1a88ab2a19bfff5ced4e5e17f5264e9e (commit)
via b5c40a0304a9de42ae0ed3d0517e1365552c0e04 (commit)
via 50e9e5553d2cc194698633753c302789ae5bb2fc (commit)
via 32926d6543e52daa4db8e47c2870bef4d6bdf71d (commit)
via aabde5c5f0cba198c90558a3f3bb100ea9a09b6d (commit)
via 79a18f2eb4c02212d30462b3c8eb4f989ab750d3 (commit)
via 610d9aea55464f9bde956c8df7c97a4a2103e738 (commit)
via 68483f1bc4d5d170471d02a60cebc28e794501b2 (commit)
via 00c2e9b28c1228b2ba327223d5576d44e4fdae4d (commit)
via 94d2af98f5882985e57d8dd1b17a2fd2e8cc8734 (commit)
from fe6bad60cace3d6e0f611b1c07fc7f4cb593c48e (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 c3604c1cc57556520634f9af57213abc80c86da9
Author: Radhika Chippada <radhika at curoverse.com>
Date: Wed Mar 18 10:04:29 2015 -0400
5375: after much hair pulling, found the syntax to replace MIME::Types.add(MIME::Type.from_array... since from_array is deprecated; now using MIME::Types.add(MIME::Type.new...
diff --git a/apps/workbench/config/initializers/mime_types.rb b/apps/workbench/config/initializers/mime_types.rb
index ef95f43..f28391d 100644
--- a/apps/workbench/config/initializers/mime_types.rb
+++ b/apps/workbench/config/initializers/mime_types.rb
@@ -14,8 +14,8 @@ Mime::Type.register "application/sam", :sam
# register MIME type with MIME::Type gem
require 'mime/types'
include MIME
-MIME::Types.add(MIME::Type.from_array("application/fa", %(fa)))
-MIME::Types.add(MIME::Type.from_array("application/fasta", %(fasta)))
-MIME::Types.add(MIME::Type.from_array("application/go", %(go)))
-MIME::Types.add(MIME::Type.from_array("application/r", %(r)))
-MIME::Types.add(MIME::Type.from_array("application/sam", %(sam)))
+MIME::Types.add(MIME::Type.new(["application/fa", %(fa)]))
+MIME::Types.add(MIME::Type.new(["application/fasta", %(fasta)]))
+MIME::Types.add(MIME::Type.new(["application/go", %(go)]))
+MIME::Types.add(MIME::Type.new(["application/r", %(r)]))
+MIME::Types.add(MIME::Type.new(["application/sam", %(sam)]))
commit f46eed2ad6bc456cd57ed363e1adc8d60f802f39
Merge: 3c19149 6a13c4e
Author: Radhika Chippada <radhika at curoverse.com>
Date: Wed Mar 18 09:45:21 2015 -0400
Merge branch 'master' into 5375-preview-collection-text-files
commit 3c191493c9c4d778525751d15dea8e83ed61fda6
Merge: fe6bad6 18148ec
Author: Radhika Chippada <radhika at curoverse.com>
Date: Tue Mar 17 21:10:01 2015 -0400
Merge branch 'master' into 5375-preview-collection-text-files
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list