Update from upstream#2
Open
sempervictus wants to merge 55 commits into
Open
Conversation
Added check for pcap dumper.
added .so Version bump to 0.0.0 Used bundler to get rid of jeweler.
…into fix-rake-issues
Fixed each_packet issues - Header is now a struct instead of of struct p...
re-work ext to be more truthful of c-extension
changed to shoulda-context
…l/pcaprub@4eb486d
No checks for tick count > 0, instead of a specific range.
Windows each
Fix building on mingw32
gemnasium link updated.
Signed-off-by: Dario Lombardo <lomato@gmail.com>
Signed-off-by: Dario Lombardo <lomato@gmail.com>
Conflicts: Rakefile
Add a Gitter chat badge to README.rdoc
d05e7a9 Conflicts: ext/pcaprub_c/pcaprub.c test/test_pcaprub_unit.rb
Conflicts: ext/pcaprub_c/pcaprub.c pcaprub.gemspec
Conflicts: Gemfile.lock README.rdoc Rakefile lib/pcaprub/version.rb pcaprub.gemspec
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Do not merge - this is a rough draft of a merge conflict resolution between us and upstream. Suggest taking a look to determine if its of use. Looks like the windows code was updated, haven't tested on mingw to see if it conflicts with the CPU usage fix. I can perform a cleaner merge resolution between the branches if this is useful.