Merge branch 'merged-bundler' into develop

1 files changed, 0 insertions, 34 deletions

diff --git a/vendor/gems/json-1.5.1/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log b/vendor/gems/json-1.5.1/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log
deleted file mode 100644
index 7df444512..000000000
--- a/vendor/gems/json-1.5.1/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log
+++ /dev/null
@@ -1,34 +0,0 @@
-========================== 2009-04-01T16:49:51 CEST ===========================
-
-Comparing times (call_time_mean):
- 1 ParserBenchmarkExt#parser   900 repeats:
-       553.922304770 (  real) ->   21.500x 
-         0.001805307
- 2 ParserBenchmarkYAML#parser  1000 repeats:
-       224.513358139 (  real) ->    8.714x 
-         0.004454078
- 3 ParserBenchmarkPure#parser  1000 repeats:
-        26.755020642 (  real) ->    1.038x 
-         0.037376163
- 4 ParserBenchmarkRails#parser 1000 repeats:
-        25.763381731 (  real) ->    1.000x 
-         0.038814780
-           calls/sec (  time) ->    speed  covers
-           secs/call
-
-Comparing times (call_time_median):
- 1 ParserBenchmarkExt#parser   900 repeats:
-       800.592479481 (  real) ->   26.936x 
-         0.001249075
- 2 ParserBenchmarkYAML#parser  1000 repeats:
-       271.002390644 (  real) ->    9.118x 
-         0.003690004
- 3 ParserBenchmarkRails#parser 1000 repeats:
-        30.227910865 (  real) ->    1.017x 
-         0.033082008
- 4 ParserBenchmarkPure#parser  1000 repeats:
-        29.722384421 (  real) ->    1.000x 
-         0.033644676
-           calls/sec (  time) ->    speed  covers
-           secs/call
-===============================================================================