@@ -1,5 +1,10 @@ == 3.2.6 +* Upgraded to JSON 1.1.7 +* Added a guard to skip loading JSON when Rails has already done it for us + +== 3.2.6 + * Upgraded to Amalgalite 0.10.0 * Added an extra Timeout.timeout() loop to all API requests in an attempt to avoid Net::HTTP hanging on server errors CHANGELOG @@ -38,7 +38,7 @@ SA_SPEC = Gem::Specification.new do |spec| spec.add_dependency("arrayfields", "=4.7.3") # fix Amalgalite's results spec.add_dependency("amalgalite", "=0.10.0") spec.add_dependency("rest-client", "=1.0") - spec.add_dependency("json", "=1.1.6") + spec.add_dependency("json", "=1.1.7") spec.add_dependency("xmpp4r", "=0.4") spec.add_dependency("elif", "=0.1.0") # used by some plugins Rakefile @@ -27,7 +27,7 @@ require "scout_agent/dispatcher" require "scout_agent/api" # require gems -require_lib_or_gem "json", "=1.1.6" +require_lib_or_gem "json", "=1.1.7" unless defined? JSON require_lib_or_gem "amalgalite", "=0.10.0" require_lib_or_gem "rest_client", "=1.0" require_lib_or_gem "xmpp4r", "=0.4" @@ -92,7 +92,7 @@ module ScoutAgent end # The version of this agent. - VERSION = "3.2.6".freeze + VERSION = "3.2.7".freeze # A Pathname reference to the agent code directory, used in dynamic loading. LIB_DIR = Pathname.new(File.dirname(__FILE__)) + agent_name end lib/scout_agent.rb 8352c4c78287e05cc59a5d74bb42163ff779067e James Edward Gray II james@graysoftinc.com http://github.com/highgroove/scout_agent/commit/108cb979f6dca9b05407fe59822ff6fd848088f5 108cb979f6dca9b05407fe59822ff6fd848088f5 2009-08-18T13:31:13-07:00 2009-08-18T13:31:13-07:00 More JSON fixes. 5fdd876d0bf3c81c4db326a50dd2d42b43ef0b7f James Edward Gray II james@graysoftinc.com