diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-04 18:58:34 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-04 18:58:34 +0530 |
| commit | abb09054043c556ae38d2c9d1e9037eceb6dc426 (patch) | |
| tree | aa71edf8e300faa09135ba83331dffb1ab92a5d3 /railties/guides/source/performance_testing.textile | |
| parent | 74372f7e795dd0e1825dec19dd128b5ae6fb9dfc (diff) | |
| parent | a6bafb327d403361ef652d6749f0609cfc2a5578 (diff) | |
| download | rails-abb09054043c556ae38d2c9d1e9037eceb6dc426.tar.gz rails-abb09054043c556ae38d2c9d1e9037eceb6dc426.tar.bz2 rails-abb09054043c556ae38d2c9d1e9037eceb6dc426.zip | |
Merge docrails, resolving conflicts in the assets guide
Diffstat (limited to 'railties/guides/source/performance_testing.textile')
| -rw-r--r-- | railties/guides/source/performance_testing.textile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/performance_testing.textile b/railties/guides/source/performance_testing.textile index 75f81cf13d..5947735deb 100644 --- a/railties/guides/source/performance_testing.textile +++ b/railties/guides/source/performance_testing.textile @@ -207,7 +207,7 @@ GC Time measures the amount of time spent in GC for the performance test case. h5. Metric Availability -h6. Benchmarking +h6(#benchmarking_1). Benchmarking |_.Interpreter|_.Wall Time|_.Process Time|_.CPU Time|_.User Time|_.Memory|_.Objects|_.GC Runs|_.GC Time| |_.MRI | yes | yes | yes | no | yes | yes | yes | yes | @@ -215,7 +215,7 @@ h6. Benchmarking |_.Rubinius | yes | no | no | no | yes | yes | yes | yes | |_.JRuby | yes | no | no | yes | yes | yes | yes | yes | -h6. Profiling +h6(#profiling_1). Profiling |_.Interpreter|_.Wall Time|_.Process Time|_.CPU Time|_.User Time|_.Memory|_.Objects|_.GC Runs|_.GC Time| |_.MRI | yes | yes | no | no | yes | yes | yes | yes | |