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.

Sign up for GitHub

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

Jump to bottom

openflow_input: add bsn_dhcp_offload #192

Merged
merged 2 commits into from
Feb 5, 2014
Merged

openflow_input: add bsn_dhcp_offload #192

merged 2 commits into from
Feb 5, 2014

Conversation

rlane
Copy link
Contributor

@rlane rlane commented Feb 5, 2014

Reviewer: trivial

@bsn-abat
Copy link

bsn-abat commented Feb 5, 2014

ABAT: START_MERGE: Log file at http://sbs2/abat/2014.02.05.0145-m.loxigen.master/abat.log

@bsn-abat
Copy link

bsn-abat commented Feb 5, 2014

ABAT: AUTO-REJECT: Your change failed pre-merge validation defined in loxigen/.abat-automerge. See log for details.

INSTRUCTIONS: Please fix your problem by

  1. Reviewing the logs below and git commiting a fix.

  2. Use git push to add new commits to this same remote branch/pull request.

  3. Get another code review approval from your co-worker indicated by a line of "ACK" in comment, or add another comment yourself with a line of "RETRY". That will cause abat to try to merge your code again.

Log file at http://sbs2/abat/2014.02.05.0145-m.loxigen.master/abat.log
/cc

@rlane
Copy link
Contributor Author

rlane commented Feb 5, 2014

RETRY

@bsn-abat
Copy link

bsn-abat commented Feb 5, 2014

ABAT: START_MERGE: Log file at http://sbs2/abat/2014.02.05.0202-m.loxigen.master/abat.log

bsn-abat pushed a commit to floodlight/loxigen-artifacts that referenced this pull request Feb 5, 2014
Artifacts from floodlight/loxigen@30da69d...51cdfba
0b4fb63 
Loxigen Head commit floodlight/loxigen@51cdfba
commit 51cdfba106a98177ff7e816fe9ecd335a3c68121
Merge: 30da69d e411343
Author: abat <abat@bigswitch.com>
Date:   Tue Feb 4 18:02:20 2014 -0800

    Merge into master from pull request #192:
    openflow_input: add bsn_dhcp_offload (floodlight/loxigen#192)

commit e411343d53855c2deebd354892f7563ec02736cd
Author: Rich Lane <rlane@bigswitch.com>
Date:   Tue Feb 4 18:00:03 2014 -0800

    loci: support OF_INSTRUCTION_BSN_DHCP_OFFLOAD

commit b5a61fee18c0a6c39b5955f6f209137137e8fc21
Author: Rich Lane <rlane@bigswitch.com>
Date:   Tue Feb 4 17:43:57 2014 -0800

    openflow_input: add bsn_dhcp_offload
bsn-abat pushed a commit that referenced this pull request Feb 5, 2014
Merge into master from pull request #192:
51cdfba 
openflow_input: add bsn_dhcp_offload (#192)
@bsn-abat bsn-abat merged commit e411343 into floodlight:master Feb 5, 2014
@bsn-abat
Copy link

bsn-abat commented Feb 5, 2014

ABAT: ACCEPT: Successfully merged

In case you want to see the build log, check out :
Log file at http://sbs2/abat/2014.02.05.0202-m.loxigen.master/abat.log
/cc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@rlane @bsn-abat