projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ad92bb 294d3c8)
Merge branch 'origin-3609-arv-run' into master closes #3609
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 5 Nov 2014 20:43:40 +0000 (15:43 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 5 Nov 2014 20:44:12 +0000 (15:44 -0500)
Conflicts:
sdk/cli/bin/arv

1  2 
doc/_config.yml patch | diff1 | diff2 | blob | history
sdk/cli/bin/arv patch | diff1 | diff2 | blob | history

diff --cc doc/_config.yml
Simple merge
diff --cc sdk/cli/bin/arv
index 35de7c629ff67ff993676057a603ea8119bf1825,6f56a089b6a82e4cacf7a4008a04b69456bb1cc5..77affe909384cbefd6e5ea5dc0cae02cf252f5e3
--- 1/sdk/cli/bin/arv
--- 2/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@@ -113,7 -113,7 +113,8 @@@ def init_confi
    end
  end
  
- subcommands = %w(copy create edit keep pipeline tag ws)
 -subcommands = %w(create edit keep pipeline run tag ws)
++
++subcommands = %w(copy create edit keep pipeline run tag ws)
  
  def check_subcommands client, arvados, subcommand, global_opts, remaining_opts
    case subcommand