[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0.2-9-g2646edc

[OISF Git]

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 "OISF".

The branch, master has been updated
       via  2646edc129c7e6a6f9c820c9ecc01ce450e09a58 (commit)
       via  f232fdc0c986c01d020ab15d2c663e384a6ec0d0 (commit)
       via  f06e5f3c73d1d9ca9477749edfdfee7cb80f8c7f (commit)
       via  405baa3cb2e7864171e1568584d560e99521935c (commit)
      from  546ae9737b710ccb712b70c80b5f14cc22563550 (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 2646edc129c7e6a6f9c820c9ecc01ce450e09a58
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Jul 14 15:25:50 2014 +0200

    Profiling: fix compilation on CentOS5
    
    Bug #1207

commit f232fdc0c986c01d020ab15d2c663e384a6ec0d0
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Jul 14 14:46:07 2014 +0200

    htp: init memuse atomics
    
    In case of the spinlocked fallback code the lock was uninitialized.

commit f06e5f3c73d1d9ca9477749edfdfee7cb80f8c7f
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Jul 14 14:42:54 2014 +0200

    ethtool: add missing include necessary for CentOS5

commit 405baa3cb2e7864171e1568584d560e99521935c
Author: Alexander Gozman <goal81 at gmail.com>
Date:   Fri Jun 13 20:36:54 2014 +0400

    Fix compile-time error on old kernels and ethtool.h

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

Summary of changes:
 src/app-layer-htp-mem.c |    3 +++
 src/util-ioctl.c        |    3 ++-
 src/util-profiling.c    |    4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
OISF