]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #114 in SNORT/snort3 from dnsstats to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 3 Nov 2015 14:49:47 +0000 (09:49 -0500)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 3 Nov 2015 14:49:47 +0000 (09:49 -0500)
commit811fc9451555cd6739cc56658a10fa64b8307133
tree88697d1f094ad475211f26b0edd651d2ea5db904
parent1b5e4011663c19ac09defe5b22087fe688862b0a
Merge pull request #114 in SNORT/snort3 from dnsstats to master

Squashed commit of the following:

commit 1b1feefb1888411a32344ceb4d73173d9b5138ef
Author: Bhagyashree Bantwal <bbantwal@cisco.com>
Date:   Tue Nov 3 09:43:05 2015 -0500

    Add DNS shutdown stats

commit 3fa2887834c652df99c6bcf04a80905385b20303
Merge: 80b5183 1b5e401
Author: Bhagyashree Bantwal <bbantwal@cisco.com>
Date:   Mon Nov 2 16:02:26 2015 -0500

    Merge branch 'master' of ssh://stash-eng-rtp1.cisco.com:7999/snort/snort3

commit 80b5183135af600acd08616f512579405f8cefa2
Author: Bhagyashree Bantwal <bbantwal@cisco.com>
Date:   Mon Nov 2 16:02:15 2015 -0500

    Add DNS shutdown stats

commit bb7c5f178487029534107ec4c689e7e09d2c3554
Merge: b167456 52a9ccf
Author: Bhagyashree Bantwal <bbantwal@cisco.com>
Date:   Wed Oct 21 22:30:01 2015 -0400

    Merge branch 'master' of ssh://stash-eng-rtp1.cisco.com:7999/snort/snort3

commit b16745640b5214d4bbdc7a20e642e074df90de3a
Merge: 6b9e324 08e3998
Author: Bhagyashree Bantwal <bbantwal@cisco.com>
Date:   Wed Oct 21 10:39:09 2015 -0400

    Merge branch 'master' of ssh://stash-eng-rtp1.cisco.com:7999/snort/snort3

commit 6b9e3240b7ae3dd805be2d325223d19dc90d622c
Author: Bhagyashree Bantwal <bbantwal@cisco.com>
Date:   Fri Oct 9 14:26:23 2015 -0400

    Remove global stats init function

commit 2c5cdb4d749e5ed6c34e931400c8ff52820f430e
Merge: b7c468e f05d70a
Author: Bhagyashree Bantwal <bbantwal@cisco.com>
Date:   Fri Oct 9 13:21:07 2015 -0400

    Merge branch 'master' of ssh://stash-eng-rtp1.cisco.com:7999/snort/snort3

commit b7c468e8692ea68cda91f5278a7209a3b0d2f48b
Author: Bhagyashree Bantwal <bbantwal@cisco.com>
Date:   Wed Sep 30 16:57:36 2015 -0400

    Check for bool value before setting fastpath config option in PPM

commit 803dc5453c703ee48697cb24d7de886b1b01b79b
Author: Bhagyashree Bantwal <bbantwal@cisco.com>
Date:   Wed Sep 30 08:10:48 2015 -0400

    SSL stats changes
src/service_inspectors/dns/dns.cc
src/service_inspectors/dns/dns_module.cc
src/service_inspectors/dns/dns_module.h