[ARVADOS] updated: adb949d39f83b47e1a3cd48a75ec2c6713381cd9
git at public.curoverse.com
git at public.curoverse.com
Wed Oct 15 13:56:11 EDT 2014
Summary of changes:
presentations/barcamp/dependencies.go | 20 ---
presentations/barcamp/genomes_640.jpg | Bin 90926 -> 0 bytes
presentations/barcamp/goroutine.go | 10 --
presentations/barcamp/keep.slide | 302 ----------------------------------
presentations/barcamp/lolwut.jpg | Bin 58786 -> 0 bytes
presentations/barcamp/server.go | 15 --
6 files changed, 347 deletions(-)
delete mode 100644 presentations/barcamp/dependencies.go
delete mode 100644 presentations/barcamp/genomes_640.jpg
delete mode 100644 presentations/barcamp/goroutine.go
delete mode 100644 presentations/barcamp/keep.slide
delete mode 100644 presentations/barcamp/lolwut.jpg
delete mode 100644 presentations/barcamp/server.go
discards 8a9fe2e16f1203f303afabc8c88b6e1ded9cec57 (commit)
discards 96ca1cadc8231a7d2e324602b70c73a76745e5eb (commit)
discards 153b599f212ffded5531007e086e2f8da8f8a5cb (commit)
discards df54f4111b0afaaf073c7387dff5960bf19a53e2 (commit)
discards 593316198c1647b24f66a64e4a0f7a34e75b54ab (commit)
discards debedb222cfea4bfc4519032cad8475858e04034 (commit)
discards 26d74dc0524c87c5dcc0c76040ce413a4848b57a (commit)
via adb949d39f83b47e1a3cd48a75ec2c6713381cd9 (commit)
via 286f418347570794d15ae26f9c66fd7362c25848 (commit)
via d7f9b8fdb408df9d0dc1d2e9d2dca8b57b6f1365 (commit)
via 61790a81094b7a21109c8607a11ad874d5aecd73 (commit)
via 0474aa89b8f497fd5abaa072f9bc501742cc5b42 (commit)
via d9eca6c665e600063cb2c04b17f38d540eb438f1 (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 (8a9fe2e16f1203f303afabc8c88b6e1ded9cec57)
\
N -- N -- N (adb949d39f83b47e1a3cd48a75ec2c6713381cd9)
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 adb949d39f83b47e1a3cd48a75ec2c6713381cd9
Author: Brett Smith <brett at curoverse.com>
Date: Wed Oct 15 09:22:40 2014 -0400
4196: arv-keepdocker uses Docker 1.0 pull syntax.
`docker pull -t` was the old way of pulling an image with a specific
tag. Docker 1.0 introduced `docker pull repo:tag`, and Docker 1.2
removes support for `-t` completely. We're well-standardized on 1.1+
at this point, and considering an upgrade to 1.2+, so now's the time
to switch.
Closes #4196.
diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py
index c091374..6fa1745 100644
--- a/sdk/python/arvados/commands/keepdocker.py
+++ b/sdk/python/arvados/commands/keepdocker.py
@@ -116,7 +116,8 @@ def stat_cache_name(image_file):
return getattr(image_file, 'name', image_file) + '.stat'
def pull_image(image_name, image_tag):
- check_docker(popen_docker(['pull', '-t', image_tag, image_name]), "pull")
+ check_docker(popen_docker(['pull', '{}:{}'.format(image_name, image_tag)]),
+ "pull")
def save_image(image_hash, image_file):
# Save the specified Docker image to image_file, then try to save its
commit 286f418347570794d15ae26f9c66fd7362c25848
Author: Brett Smith <brett at curoverse.com>
Date: Tue Oct 14 16:30:21 2014 -0400
4126: API server uses fixed a-r-p-i (again).
Refs #4126.
diff --git a/services/api/Gemfile b/services/api/Gemfile
index a31fe5c..996d3fc 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -72,7 +72,7 @@ gem 'database_cleaner'
gem 'themes_for_rails'
gem 'arvados', '>= 0.1.20140919104705'
-gem 'arvados-cli', '>= 0.1.20141010134550'
+gem 'arvados-cli', '>= 0.1.20141014201516'
# pg_power lets us use partial indexes in schema.rb in Rails 3
gem 'pg_power'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index c4b269e..ce79f85 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -41,7 +41,7 @@ GEM
google-api-client (~> 0.6.3)
json (>= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
- arvados-cli (0.1.20141014153331)
+ arvados-cli (0.1.20141014201516)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.0)
@@ -224,7 +224,7 @@ DEPENDENCIES
acts_as_api
andand
arvados (>= 0.1.20140919104705)
- arvados-cli (>= 0.1.20141010134550)
+ arvados-cli (>= 0.1.20141014201516)
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
commit d7f9b8fdb408df9d0dc1d2e9d2dca8b57b6f1365
Author: Brett Smith <brett at curoverse.com>
Date: Tue Oct 14 16:15:16 2014 -0400
4126: a-r-p-i dereferences parameter values when creating jobs.
Refs #4126. This is required to run jobs.
diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index e6ec7e5..b70fd7d 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -520,7 +520,9 @@ class WhRunPipelineInstance
my_submit_id = "instance #{@instance[:uuid]} rand #{rand(2**64).to_s(36)}"
job = JobCache.create(@instance, cname, {
:script => c[:script],
- :script_parameters => c[:script_parameters],
+ :script_parameters => Hash[c[:script_parameters].map do |key, spec|
+ [key, spec[:value]]
+ end],
:script_version => c[:script_version],
:repository => c[:repository],
:nondeterministic => c[:nondeterministic],
@@ -596,7 +598,7 @@ class WhRunPipelineInstance
c2[:script_parameters].each do |pname, p|
if p.is_a? Hash and p[:output_of] == cname.to_s
debuglog "parameter #{c2name}::#{pname} == #{c[:job][:output]}"
- c2[:script_parameters][pname] = c[:job][:output]
+ c2[:script_parameters][pname] = {value: c[:job][:output]}
moretodo = true
end
end
commit 61790a81094b7a21109c8607a11ad874d5aecd73
Author: Brett Smith <brett at curoverse.com>
Date: Tue Oct 14 14:49:49 2014 -0400
4126: API server uses fixed a-r-p-i.
Refs #4126.
diff --git a/services/api/Gemfile b/services/api/Gemfile
index 67cf109..a31fe5c 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -72,7 +72,7 @@ gem 'database_cleaner'
gem 'themes_for_rails'
gem 'arvados', '>= 0.1.20140919104705'
-gem 'arvados-cli', '>= 0.1.20140919104705'
+gem 'arvados-cli', '>= 0.1.20141010134550'
# pg_power lets us use partial indexes in schema.rb in Rails 3
gem 'pg_power'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index bb327d0..c4b269e 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -41,12 +41,12 @@ GEM
google-api-client (~> 0.6.3)
json (>= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
- arvados-cli (0.1.20140919104705)
+ arvados-cli (0.1.20141014153331)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
- arvados (~> 0.1.0)
+ arvados (~> 0.1, >= 0.1.0)
curb (~> 0.8)
- google-api-client (~> 0.6.3)
+ google-api-client (~> 0.6, >= 0.6.3)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
oj (~> 2.0, >= 2.0.3)
@@ -224,7 +224,7 @@ DEPENDENCIES
acts_as_api
andand
arvados (>= 0.1.20140919104705)
- arvados-cli (>= 0.1.20140919104705)
+ arvados-cli (>= 0.1.20141010134550)
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
commit 0474aa89b8f497fd5abaa072f9bc501742cc5b42
Merge: d9eca6c b8fdb90
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Oct 14 11:41:02 2014 -0400
Merge branch '3692-event-bus-fix-and' closes #3692
commit d9eca6c665e600063cb2c04b17f38d540eb438f1
Merge: 6bdfed0 9b50fd8
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Oct 14 11:33:31 2014 -0400
Merge branch '3656-arv-create' closes #3656
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list