summaryrefslogtreecommitdiffstats
path: root/runtime/stpd/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/stpd/ChangeLog')
-rw-r--r--runtime/stpd/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/runtime/stpd/ChangeLog b/runtime/stpd/ChangeLog
index 370d7671..dfc22682 100644
--- a/runtime/stpd/ChangeLog
+++ b/runtime/stpd/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-18 Martin Hunt <hunt@redhat.com>
+
+ * stpd.c (usage): Remove "-m" option.
+ (main): Print warning if "-m" is used.
+ * librelay.c (merge_output): Rewrite to handle
+ new format that support binary.
+ (stp_main_loop): Read merge option from the
+ transport info message.
+
2006-09-13 Martin Hunt <hunt@redhat.com>
* librelay.c (init_relayfs): Exec stp_check and find