Merge branch 'master' into topic/tunnels

This commit is contained in:
Jon Siwek 2012-05-22 16:05:06 -05:00
commit 0d7d74e11b
155 changed files with 3502 additions and 1040 deletions

View file

@ -36,6 +36,7 @@ rest_target(${psd} base/frameworks/logging/main.bro)
rest_target(${psd} base/frameworks/logging/postprocessors/scp.bro)
rest_target(${psd} base/frameworks/logging/postprocessors/sftp.bro)
rest_target(${psd} base/frameworks/logging/writers/ascii.bro)
rest_target(${psd} base/frameworks/logging/writers/dataseries.bro)
rest_target(${psd} base/frameworks/metrics/cluster.bro)
rest_target(${psd} base/frameworks/metrics/main.bro)
rest_target(${psd} base/frameworks/metrics/non-cluster.bro)