commit db949d4e9ca6858a3e2da5ca0684f7b6e8d1e8cc
author Praseed Balakrishnan <praseed.balakrishnan@us.fujitsu.com> Tue Dec 02 14:28:20 2014 -0800
committer Praseed Balakrishnan <praseed.balakrishnan@us.fujitsu.com> Tue Dec 02 14:28:20 2014 -0800
tree 5dea1988ab44c5028916d980a69129668d677927
parent 2ed6da0c951f063294bad766161695b3c5b28548

changed order of sigtype and sigid

Conflicts:
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/CircuitSignalID.java

java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java

diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
index ccf56b2..3bf717b 100644
--- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
+++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
@@ -57,9 +57,8 @@
     BSN_UDF7,
     BSN_TCP_FLAGS,
     BSN_VLAN_XLATE_PORT_GROUP_ID,
-    OCH_SIGID,
     OCH_SIGTYPE,
-    OCH_SIGID_BASIC,
     OCH_SIGTYPE_BASIC,
-;
+    OCH_SIGID,
+    OCH_SIGID_BASIC,;
 }