summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2006-06-30 16:55:41 +0000
committerPaul Jakma <paul.jakma@sun.com>2006-06-30 16:55:41 +0000
commitadf6221437073f4d427c9c973e4c95381b13fc73 (patch)
treebd51d5f5bc649068c9082e5569421995a3984ab1
parent1c066bfe62951fa1e2f90f02b528342d60fcd6f9 (diff)
[lib] Fix merge error in ChangeLog
- entry was left in wrong order, according to date.
-rw-r--r--lib/ChangeLog10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5f215d62..b52370f7 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -33,11 +33,6 @@
(zlog_backtrace_sigsafe) Ditto. Add printstack() version of the
the DUMP macro in this function.
-2006-05-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
-
- * if.h: (struct connected) Document the meaning of the
- ZEBRA_IFC_REAL and ZEBRA_IFC_CONFIGURED flags.
-
2006-05-23 Paul Jakma <paul.jakma@sun.com>
* route_types.txt: New file, table of ZEBRA_ROUTE definitions.
@@ -47,6 +42,11 @@
memtypes.h, include the script and table file in EXTRA_DIST.
* command.h: pull in route_types.h, add a REDIST_STR define.
+2006-05-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+ * if.h: (struct connected) Document the meaning of the
+ ZEBRA_IFC_REAL and ZEBRA_IFC_CONFIGURED flags.
+
2006-05-15 Paul Jakma <paul.jakma@sun.com>
* log.c: (general) Generalise struct zebra_route_desc into