setting up 3.2.0 as main dev branch

newrelic · Jun 15, 2011 · 9dd122e · 9dd122e
2 parents 09fc7cc + c265ab0
commit 9dd122e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,8 @@
 v3.1.0 
-  * Experimental support for aggregating data from short-running
-    processes using NewRelic::Agent.load_data and
-    NewRelic::Agent.save_data
+  * Support for aggregating data from short-running
+    processes to reduce reporting overhead
+  * Numerous bug fixes
+  * Increased unit test coverage
 
 v3.0.1 
   * Updated Real User Monitoring to reduce javascript size and improve

diff --git a/Rakefile b/Rakefile
@@ -5,7 +5,7 @@ require 'rake/testtask'
 
 GEM_NAME = "newrelic_rpm"
 GEM_VERSION = NewRelic::VERSION::STRING
-AUTHORS = "Bill Kayser", "Justin George"
+AUTHORS = "Bill Kayser", "Justin George", "Jon Guymon"
 EMAIL = "support@newrelic.com"
 HOMEPAGE = "http://www.github.com/newrelic/rpm"
 SUMMARY = "New Relic Ruby Agent"

diff --git a/newrelic_rpm.gemspec b/newrelic_rpm.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Justin George", "Jon Guymon"]
-  s.date = %q{2011-06-10}
+  s.date = %q{2011-06-15}
   s.description = %q{New Relic is a performance management system, developed by New Relic,
 Inc (http://www.newrelic.com).  New Relic provides you with deep
 information about the performance of your web application as it runs
@@ -92,6 +92,7 @@ http://github.com/newrelic/rpm/
     "lib/new_relic/control.rb",
     "lib/new_relic/control/class_methods.rb",
     "lib/new_relic/control/configuration.rb",
+    "lib/new_relic/control/frameworks.rb",
     "lib/new_relic/control/frameworks/external.rb",
     "lib/new_relic/control/frameworks/merb.rb",
     "lib/new_relic/control/frameworks/rails.rb",
@@ -171,16 +172,19 @@ http://github.com/newrelic/rpm/
     "test/new_relic/agent/transaction_sample_builder_test.rb",
     "test/new_relic/agent/transaction_sampler_test.rb",
     "test/new_relic/agent/worker_loop_test.rb",
+    "test/new_relic/agent_test.rb",
     "test/new_relic/collection_helper_test.rb",
     "test/new_relic/command/deployments_test.rb",
     "test/new_relic/control/class_methods_test.rb",
+    "test/new_relic/control/configuration_test.rb",
     "test/new_relic/control/logging_methods_test.rb",
     "test/new_relic/control_test.rb",
     "test/new_relic/data_serialization_test.rb",
     "test/new_relic/local_environment_test.rb",
     "test/new_relic/metric_data_test.rb",
     "test/new_relic/metric_spec_test.rb",
     "test/new_relic/rack/all_test.rb",
+    "test/new_relic/rack/browser_monitoring_test.rb",
     "test/new_relic/rack/developer_mode_test.rb",
     "test/new_relic/stats_test.rb",
     "test/new_relic/transaction_analysis/segment_summary_test.rb",
@@ -295,12 +299,7 @@ Refer to the README.md file for more information.
 Please see http://github.com/newrelic/rpm/blob/master/CHANGELOG
 for a complete description of the features and enhancements available
 in version 3.2 of the Ruby Agent.
-
-For details on this specific release, refer to the CHANGELOG file.
-
-Notice: Developer Mode now supports only Rails 2.3+ - refer to README
-for instructions for previous versions
-
+  
 }
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
   s.require_paths = ["lib"]

diff --git a/test/new_relic/rack/browser_monitoring_test.rb b/test/new_relic/rack/browser_monitoring_test.rb
@@ -21,7 +21,9 @@ def app
   <body>im some body text</body>
 </html>
 EOL
-    mock_app = lambda { |env| [200, {'Content-Type' => 'text/html'}, @doc] }
+    mock_app = lambda do |env|
+      [200, {'Content-Type' => 'text/html'}, Rack::Response.new(@doc)]
+    end
     NewRelic::Rack::BrowserMonitoring.new(mock_app)
   end