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

Next/20170328/v3 #2627

Merged
merged 5 commits into from Mar 28, 2017
Merged

Next/20170328/v3 #2627

merged 5 commits into from Mar 28, 2017

Conversation

inliniac
Copy link
Contributor

thus and others added 5 commits March 28, 2017 13:07
@thus
logging: support custom file permissions
005a700 
Support setting file permissions per logger using 'filemode', e.g.:

  outputs:
    - eve-log:
        enabled: yes
        filetype: regular
        filename: eve.json
        filemode: 660
@thus
doc: add documentation for eve-log file permissions
3b23387
@thus @victorjulien
lua: add SCFlowTimestamps function
365aa1f 
Add SCFlowTimestamps() to return startts and lastts as seconds and
microseconds from flow.

Examples:

  startts, lastts = SCFlowTimestamps()
  startts_s, lastts_s, startts_us, lastts_us = SCFlowTimestamps()
@thus @victorjulien
doc: add documentation for Lua SCFlowTimestamps
7b1dae6
@jasonish @victorjulien
defrag: fix argument used in macro to match signature
3ca1a29 
"p" was being used in the macro but was not an argument to
the macro, but it worked due to the context of the macro.

Use the actual macro argument, d2, instead of p.

Results in no change to generated code.
@inliniac inliniac merged commit 3ca1a29 into master Mar 28, 2017
This was referenced Mar 28, 2017
Closed
Closed
@inliniac inliniac deleted the next/20170328/v3 branch March 29, 2017 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
3 participants
@inliniac @thus @jasonish