Changeset 353 for box/trunk/lib/backupclient/BackupDaemonConfigVerify.cpp

Timestamp:

30/01/2006 20:04:53 (6 years ago)

Author:

ben

Message:

Merge chris/bb-save-state, resolving conflicts

File:

• box/trunk/lib/backupclient/BackupDaemonConfigVerify.cpp (modified) (2 diffs)

box/trunk/lib/backupclient/BackupDaemonConfigVerify.cpp

@@ -86 +86 @@
         {"CommandSocket", 0, 0, 0},                             // not compulsory to have this
         {"KeepAliveTime", 0, ConfigTest_IsInt, 0},                              // optional
+        {"StoreObjectInfoFile", 0, 0, 0},                               // optional
 
         {"NotifyScript", 0, 0, 0},                              // optional script to run when backup needs attention, eg store full
@@ -104 +105 @@
         0
 };
-