diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-04 13:14:44 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-04 13:14:44 +0000 |
| commit | 8260f0b40f8954f1822a0f856f7c0706afbba0bd (patch) | |
| tree | 1ec6fe65274eeb87c2030ba2daa3e230a375e846 /railties/lib/rails/commands/performance | |
| parent | 6241d4e5535190b817e546130cfe179b641da1ba (diff) | |
| parent | 6d6e6105c074eb9f266619e77a0873635af94124 (diff) | |
| download | rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.tar.gz rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.tar.bz2 rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
railties/guides/source/3_0_release_notes.textile
Diffstat (limited to 'railties/lib/rails/commands/performance')
| -rw-r--r-- | railties/lib/rails/commands/performance/benchmarker.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands/performance/profiler.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/performance/benchmarker.rb b/railties/lib/rails/commands/performance/benchmarker.rb index dfba4bf034..ad84d94dbf 100644 --- a/railties/lib/rails/commands/performance/benchmarker.rb +++ b/railties/lib/rails/commands/performance/benchmarker.rb @@ -1,5 +1,5 @@ if ARGV.empty? - puts "Usage: ./script/performance/benchmarker [times] 'Person.expensive_way' 'Person.another_expensive_way' ..." + puts "Usage: benchmarker [times] 'Person.expensive_way' 'Person.another_expensive_way' ..." exit 1 end diff --git a/railties/lib/rails/commands/performance/profiler.rb b/railties/lib/rails/commands/performance/profiler.rb index aaa075018c..50ae411166 100644 --- a/railties/lib/rails/commands/performance/profiler.rb +++ b/railties/lib/rails/commands/performance/profiler.rb @@ -1,5 +1,5 @@ if ARGV.empty? - $stderr.puts "Usage: ./script/performance/profiler 'Person.expensive_method(10)' [times] [flat|graph|graph_html]" + $stderr.puts "Usage: profiler 'Person.expensive_method(10)' [times] [flat|graph|graph_html]" exit(1) end |