diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-30 12:30:38 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-30 12:30:38 +0100 |
| commit | 8850dcbfd7664fab86ab49d9c27b6fa700d71618 (patch) | |
| tree | e136d333731c3427e8a47eba4f4c470f3db39687 /tests/.gitignore | |
| parent | 553934db664ecee676650fac0330dceff3531736 (diff) | |
| parent | 8e0f7dd25152385711b0224e2d3c65ede0239cd9 (diff) | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Wed 30 Mar 2016 02:07:15 BST using RSA key ID 398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
Revert "e1000: fix hang of win2k12 shutdown with flood ping"
e1000: Fixing interrupts pace.
tests/test-filter-redirector: Add unit test for filter-redirector
net/filter-mirror: implement filter-redirector
net/filter-mirror: Change filter_mirror_send interface
tests/test-filter-mirror:add filter-mirror unit test
net/filter-mirror:Add filter-mirror
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/.gitignore')
| -rw-r--r-- | tests/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/.gitignore b/tests/.gitignore index 5f30cbea07..b7bf13ed27 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -68,5 +68,7 @@ test-write-threshold test-x86-cpuid test-xbzrle test-netfilter +test-filter-mirror +test-filter-redirector *-test qapi-schema/*.test.* |