[Bps-public-commit] r14909 - Prophet/trunk/lib/Prophet

[jesse at bestpractical.com]

Author: jesse
Date: Fri Aug  8 00:34:14 2008
New Revision: 14909

Modified:
   Prophet/trunk/lib/Prophet/Replica.pm

Log:
* remove a yaml dendency in Replica.pm

Modified: Prophet/trunk/lib/Prophet/Replica.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Replica.pm	(original)
+++ Prophet/trunk/lib/Prophet/Replica.pm	Fri Aug  8 00:34:14 2008
@@ -390,8 +390,7 @@
 
     return undef unless $conflict->has_conflicting_changes;
 
-    require YAML;
-    $self->log("Conflicting changeset: ".YAML::Dump($conflict));
+    $self->log("Conflicting changeset: ".JSON::to_json($conflict, {allow_blessed => 1}));
 
     return $conflict;