<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -317,6 +317,7 @@ Mongrel/Passenger's signal traps
        end
      end
 
+=======
 Where to put the mapper initialization code depends on the framework and our preference. 
 For Rails the canonical place to start our mapper is within nanite.rb (or any other filename you prefer) in config/initalizers.
 In Merb we can use init.rb in config.</diff>
      <filename>README.rdoc</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>70d9814727f84c7f20c39f22f61da4a762747eb0</id>
    </parent>
    <parent>
      <id>2341c0a35d7ef66bad6b4227d798b0876a82a1b6</id>
    </parent>
  </parents>
  <author>
    <name>Ezra Zygmuntowicz</name>
    <email>ez@engineyard.com</email>
  </author>
  <url>http://github.com/ezmobius/nanite/commit/67e42970aaf04b70a4d9664c07cb4cdb79f6071e</url>
  <id>67e42970aaf04b70a4d9664c07cb4cdb79f6071e</id>
  <committed-date>2009-03-07T17:35:24-08:00</committed-date>
  <authored-date>2009-03-07T17:35:24-08:00</authored-date>
  <message>Merge branch 'master' of git@github.com:ezmobius/nanite

* 'master' of git@github.com:ezmobius/nanite: (226 commits)
  [central_logger] updated everything for central logging.  thin still chatty, though.
  [central_logger] updated log.rb for being central
  [central_logger] added log/formatter
  Added the missed spec for least_loaded selector on Nanite::Cluster.targets_for.
  Made (parameter) names consistent. Added specs for Nanite::Cluster.targets_for.
  Added specs for Nanite::Cluster.route(..).
  Added specs for Nanite::Cluster.publish.
  Added specs for nanite registration. Updated comments to reflect code.
  Formated spec for Nanite::Cluster.
  Added specs for Nanite::Cluster.
  Updated documentation for debian package as well to latest RabbitMQ (v1.5.3).
  Updated documentation to use latest RabbitMQ (v1.5.3).
  Added :yaml as :format option for Nanite::Agent.start.
  Updated documentation for debian package as well to latest RabbitMQ (v1.5.3).
  Updated documentation to use latest RabbitMQ (v1.5.3).
  Added :yaml as :format option for Nanite::Agent.start.
  Added specs for additional String (util) methods.
  Multiple changes to Nanite::Serializer, specs, and gitignore.
  Fixed Nanite::Agent to not override passed in file_root option.
  Started Nanite::Agent spec.
  ...

Conflicts:
	README.rdoc
	lib/nanite/config.rb
	lib/nanite/reaper.rb</message>
  <tree>a1b740c47d5e027fdd2ff3ef9073ac7a8a9e6412</tree>
  <committer>
    <name>Ezra Zygmuntowicz</name>
    <email>ez@engineyard.com</email>
  </committer>
</commit>
