]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1524 in SNORT/snort3 from ~PSHINDE2/snort3:memory_tracker_simplif...
authorMike Stepanek (mstepane) <mstepane@cisco.com>
Fri, 22 Feb 2019 15:48:35 +0000 (10:48 -0500)
committerMike Stepanek (mstepane) <mstepane@cisco.com>
Fri, 22 Feb 2019 15:48:35 +0000 (10:48 -0500)
commit0bb8323f6aae61501aaaaa6a9e904448ddf35ceb
tree38ad4ab9397f8f739f624645a6f27d766fd83dd8
parenta3afcbecd92bea9dc3329050eb5b7bccdebcb9f4
Merge pull request #1524 in SNORT/snort3 from ~PSHINDE2/snort3:memory_tracker_simplified to master

Squashed commit of the following:

commit 81eeda054e60e4dd3b56a90f1eba947f1d8816da
Author: Pratik Shinde <pshinde2@cisco.com>
Date:   Tue Feb 19 13:16:05 2019 -0500

    memory: Use only one variable to keep track of allocated and deallocated memory
src/memory/memory_cap.cc