merging heads

This commit is contained in:
Maria Emerson 2008-06-27 16:05:40 -07:00
commit 749eabb8f0
2 changed files with 3 additions and 3 deletions

View File

@ -344,7 +344,7 @@ Engine.prototype = {
let diff = yield;
if (diff.length != 0) {
this._log.warn("Commands did not apply correctly");
this._log.debug("Diff from snapshot+commands -> " +
this._log.trace("Diff from snapshot+commands -> " +
"new snapshot after commands:\n" +
this._serializeCommands(diff));
// FIXME: do we really want to revert the snapshot here?
@ -371,7 +371,7 @@ Engine.prototype = {
"actual server->client diff (can be ignored in many cases)");
this._log.info("Actual changes for server: " + serverDelta.length);
this._log.debug("Actual changes for server: " +
this._log.trace("Actual changes for server: " +
this._serializeCommands(serverDelta));
if (serverDelta.length) {

View File

@ -19,7 +19,7 @@ pref("extensions.weave.engine.bookmarks", true);
pref("extensions.weave.engine.history", true);
pref("extensions.weave.engine.cookies", true );
pref("extensions.weave.engine.passwords", false);
pref("extensions.weave.engine.forms", true );
pref("extensions.weave.engine.forms", false);
pref("extensions.weave.engine.tabs", true);
pref("extensions.weave.log.appender.console", "Warn");