Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Same dev #659

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Same dev #659

wants to merge 10 commits into from

Commits on Aug 20, 2015

  1. Merge branch 'master' of https://github.com/ossec/ossec-hids

    @doke2
    doke2 committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    cb4c5ff View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2015

  1. Revert "more mingw32 can't find glob.h" 

    This reverts commit c14f21a.
    @doke2
    doke2 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    1abb4fb View commit details
    Browse the repository at this point in the history

  2. Revert "mingw32 compiler used by travis ci can't find glob.h" 

    This reverts commit d0c1a4b.
    @doke2
    doke2 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    fd81cb3 View commit details
    Browse the repository at this point in the history

  3. Revert "tring to figure out glob.h errors" 

    This reverts commit 9039302.
    @doke2
    doke2 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    92d9960 View commit details
    Browse the repository at this point in the history

  4. Revert "preload libc6-dev package so travis ci can find glob.h" 

    This reverts commit ad8514b.
    @doke2
    doke2 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    0df0d9a View commit details
    Browse the repository at this point in the history

  5. Revert "include glob.h on unix" 

    This reverts commit b7e9ebe.
    @doke2
    doke2 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    9a6934d View commit details
    Browse the repository at this point in the history

  6. Revert "Let unix use glob patterns in syscheck directory entries. As … 

    …a side effect"

This reverts commit e8ed521.
    @doke2
    doke2 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    1465244 View commit details
    Browse the repository at this point in the history

  7. Add directories option to keep scan on same device, ie mountpoint. 

    Similar to -mount flag to unix find(1) command.
    @doke2
    doke2 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    ec81e55 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2017

  1. Merge branch 'master' of https://github.com/ossec/ossec-hids into sam… 

    …e_dev

Conflicts:
	src/syscheckd/create_db.c
    @doke2
    doke2 committed Apr 5, 2017
    Configuration menu
    Copy the full SHA
    2546199 View commit details
    Browse the repository at this point in the history

  2. merge cleanup

    @doke2
    doke2 committed Apr 5, 2017
    Configuration menu
    Copy the full SHA
    dbf8d11 View commit details
    Browse the repository at this point in the history