[Olsr-commit] OLSR.org main repository branch, olsrv2, updated. 07339e9f895668db57826898b1dc284d3a62aed8

[root]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OLSR.org main repository".

        See http://olsr.org/git/?p=olsrd.git;a=commit;h=07339e9f895668db57826898b1dc284d3a62aed8
        for a web version of the last commit.

The branch, olsrv2 has been updated
       via  07339e9f895668db57826898b1dc284d3a62aed8 (commit)
       via  531a44750fc3077df148a1511db61469eaf7e3f7 (commit)
       via  6cf589d087a6bdc7e7ad2458537087a2591f2032 (commit)
       via  6a3c1721f0cc6c02723ca426201ceed4f75b61d5 (commit)
      from  7038053a3ca7b6130e25c8668a00f2d632cd7efa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 07339e9f895668db57826898b1dc284d3a62aed8
Merge: 7038053a3ca7b6130e25c8668a00f2d632cd7efa 531a44750fc3077df148a1511db61469eaf7e3f7
Author: Henning Rogge <(spam-protected)>
Date:   Sun Feb 13 13:54:20 2011 +0100

    Merge branch 'nhdp' into olsrv2

-----------------------------------------------------------------------

Summary of changes:
 lib/bmf/src/olsrd_plugin.c                |    2 +-
 lib/cl_roam/src/cl_roam.c                 |    4 +-
 lib/debuginfo/src/olsrd_debuginfo.c       |   18 +-
 lib/dyn_gw/src/olsrd_dyn_gw.c             |    2 +-
 lib/dyn_gw_plain/src/olsrd_dyn_gw_plain.c |    2 +-
 lib/mdns/src/olsrd_plugin.c               |    6 +-
 lib/nameservice/src/nameservice.h         |    2 +-
 lib/obamp/src/olsrd_plugin.c              |    2 +-
 lib/watchdog/src/olsrd_plugin.c           |    2 +-
 src/duplicate_set.c                       |   10 +-
 src/hna_set.c                             |    8 +-
 src/interfaces.c                          |   18 +-
 src/linux/kernel_tunnel.c                 |   12 +-
 src/lq_plugin.c                           |   26 ++--
 src/main.c                                |    4 +-
 src/mid_set.c                             |   10 +-
 src/neighbor_table.c                      |   24 ++--
 src/olsr_comport.c                        |   10 +-
 src/olsr_comport_http.c                   |   12 +-
 src/olsr_comport_txt.c                    |   14 +-
 src/{olsr_cookie.c => olsr_memcookie.c}   |  270 ++++++++++++++++++-----------
 src/{olsr_cookie.h => olsr_memcookie.h}   |   80 ++++++---
 src/parser.c                              |    3 +
 src/plugin_loader.c                       |   10 +-
 src/routing_table.c                       |   14 +-
 src/routing_table.h                       |    4 +-
 src/scheduler.c                           |   22 ++--
 src/tc_set.c                              |    8 +-
 src/tc_set.h                              |    4 +-
 29 files changed, 354 insertions(+), 249 deletions(-)
 rename src/{olsr_cookie.c => olsr_memcookie.c} (60%)
 rename src/{olsr_cookie.h => olsr_memcookie.h} (64%)


hooks/post-receive
-- 
OLSR.org main repository