diff options
author | Christoph Helma <helma@in-silico.ch> | 2011-01-27 17:41:23 +0100 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2011-01-27 17:41:23 +0100 |
commit | 98f71b5587f0dfb9b5293947b7e78fde5a3e642d (patch) | |
tree | adc1948eba5cc84ec2493bcb49fd62213c00535e | |
parent | 0468af7ef5a0bc00c0fb83bd71e0d6287671d465 (diff) |
master branch for las-utils
-rw-r--r-- | Rakefile | 12 | ||||
m--------- | last-utils | 0 | ||||
-rw-r--r-- | lazar.rb | 4 |
3 files changed, 8 insertions, 8 deletions
@@ -30,10 +30,10 @@ namespace "fminer" do end puts `make ruby` Dir.chdir('../../last-utils') - puts `git fetch` + #puts `git fetch` # AM LAST: need branch 'experimental' until merged to master in last-utils - puts `git checkout -f -b experimental origin/experimental` - puts `git checkout experimental` + #puts `git checkout -f -b experimental origin/experimental` + puts `git checkout master` puts `git pull` end @@ -63,10 +63,10 @@ namespace "fminer" do end puts `make ruby` Dir.chdir('../../last-utils') - puts `git fetch` + #puts `git fetch` # AM LAST: need branch 'experimental' until merged to master in last-utils - puts `git checkout -f -b experimental origin/experimental` - puts `git checkout experimental` + #puts `git checkout -f -b experimental origin/experimental` + puts `git checkout master` puts `git pull` end end diff --git a/last-utils b/last-utils -Subproject 9bba490c02a5fea57d65b61e7f68e88ed72893c +Subproject 324a179b992c7b8b6f52963d4912ce5f92fe81c @@ -25,8 +25,8 @@ end # @param [String] dataset_uri Training dataset URI # @param [optional,String] prediction_feature URI of the feature to be predicted # @param [optional,String] feature_generation_uri URI of the feature generation algorithm -# @param [optional] - further parameters for the feature generation service -# @ return [text/uri-list] Task URI +# @param [optional,String] - further parameters for the feature generation service +# @return [text/uri-list] Task URI post '/lazar/?' do halt 404, "No dataset_uri parameter." unless params[:dataset_uri] |