Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for Issue #40 #41

Closed
wants to merge 8 commits into from
Closed

Fix for Issue #40 #41

wants to merge 8 commits into from

Conversation

rahul-mr
Copy link
Contributor

Change the way variable 'bound' is calculated (details in Issue #40)

@lukego
Copy link
Member

lukego commented Jan 16, 2013

This also uncomments the write RXDCTL by including commit 1286653. Intended?

@rahul-mr
Copy link
Contributor Author

Well, that was the fix for issue #1 which was merged in the master branch.

If you look at the other commits, those were merged from the master branch.

The only change from the current master is the line 42 in intel.lua (as shown in 'Files Changed' tab)

Let me know if it doesn't work - If you want, I can send a new pull request (without all the commit history)

@lukego
Copy link
Member

lukego commented Jan 16, 2013

Fun :-). I'm not such an expert with Git so I am clicking and playing around a bit to try and understand how the master history looks after taking in such a pull request.

@lukego
Copy link
Member

lukego commented Jan 16, 2013

OK I'm working on understanding the git/github workflow.

The pull request contains:
1 fix that is already merged.
6 merge commits
1 fix that is not yet merged.

If I git merge this branch onto my master I see this new history:

commit 86fbae001bfcdcce8a5effc15dd668e1ab4dcdf7
Author: Rahul <rahul@serverstack.info>
Date:   Wed Jan 16 16:59:18 2013 +0000

    Fix for issue#40: change how bound is calculated

commit a1ceae1842f24764a2c625fdeeaf829d10fceb71
Merge: f1065ec 6417d5c
Author: Rahul <rahul@serverstack.info>
Date:   Wed Jan 16 16:52:22 2013 +0000

    Merge branch 'master' of https://github.com/SnabbCo/snabbswitch

Is this as it should be or does it make sense to eliminate the merge commit somehow? (would you do that or would I?)

@rahul-mr
Copy link
Contributor Author

On 01/16/2013 11:58 PM, Luke Gorrie wrote:

Is this as it should be or does it make sense to eliminate the merge commit somehow? (would you do that or would I?)

I think polluting the master history with unrelated merge commits is not
beneficial. Will send a new pull request :-)

@rahul-mr rahul-mr closed this Jan 16, 2013
dpino added a commit to dpino/snabb that referenced this pull request Oct 1, 2015
dpino pushed a commit to dpino/snabb that referenced this pull request Jul 27, 2016
Extract the lookup queue code from BindingTable into its own BTLookupQueue object, and instantiate it outside of BindingTable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants