Fix type of of_flow_stats_entry.flags, smaller fixes to Java #289
Conversation
This file contains 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
The flow stats entry was still using uint16, while the flod_add etc. messages were using enum ofp_flow_mod_flags.
For the API change in 078fcfd
|
SELF-ACK |
|
ABAT: START_MERGE: Log file at http://vss1/abat/2014.06.25.2350-m.loxigen.master/abat.log |
bsn-abat
pushed a commit
to floodlight/loxigen-artifacts
that referenced
this pull request
Jun 25, 2014
Loxigen Head commit floodlight/loxigen@eeaa000 commit eeaa0005c4ee22087bffacc60b7dff420d3fc2cc Merge: cc956a9 02e52ec Author: abat <abat@bigswitch.com> Date: Wed Jun 25 16:50:33 2014 -0700 Merge into master from pull request #289: Fix type of of_flow_stats_entry.flags, smaller fixes to Java (floodlight/loxigen#289) commit 02e52ec3c46f48a01167e0dbb24d2238b77601a1 Author: Andreas Wundsam <andreas.wundsam@bigswitch.com> Date: Wed Jun 25 15:50:20 2014 -0700 java_gen/pom.xml: Bounce artifact version to 0.3.7-SNAPSHOT For the API change in 078fcfd97 commit ec1f661b1e0d8ffc5a1fc6dba218ba34ee4a01fc Author: Andreas Wundsam <andreas.wundsam@bigswitch.com> Date: Wed Jun 25 15:48:12 2014 -0700 java_gen: make of_bsn_table_set_buckets_size use table_id type commit e7fc61f7065d121293bf860032fe364d576711bd Author: Andreas Wundsam <andreas.wundsam@bigswitch.com> Date: Wed Jun 25 15:50:06 2014 -0700 java_gen: U128: add unit test for readBytes commit 078fcfd97ee19cfab76ef74b8f9807947cc72e06 Author: Andreas Wundsam <andreas.wundsam@bigswitch.com> Date: Wed Jun 25 15:49:01 2014 -0700 openflow_input: make of_flow_stats_entry.flags use enum type The flow stats entry was still using uint16, while the flod_add etc. messages were using enum ofp_flow_mod_flags.
|
ABAT: ACCEPT: Successfully merged In case you want to see the build log, check out : |
bsn-abat
pushed a commit
that referenced
this pull request
Jun 25, 2014
Fix type of of_flow_stats_entry.flags, smaller fixes to Java (#289)
| @@ -1378,7 +1378,7 @@ struct of_flow_stats_entry { | |||
| uint16_t priority; | |||
| uint16_t idle_timeout; | |||
| uint16_t hard_timeout; | |||
| uint16_t flags; | |||
| enum ofp_flow_mod_flags flags; | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Reviewer: @Sovietaced @rlane
@rlane - have a look at 078fcfd (should not impact other languages than java tho).