tree 571dc67e31eb51072729ecf577d91f42c6ef44c0
parent e8bcc45c832b70a966d158b86a3106e9a622536b
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> 1423387540 -0800
committer Brian O'Connor <bocon@onlab.us> 1426788324 -0700

Instruction related fixes

- Fixed PushHeaderInstructions bug, where half-baked Ethernet instace was used
  only to hold ethernetType. (ONOS-987)

Conflicts:
	core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
	providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupModBuilder.java
	web/api/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
	web/api/src/test/java/org/onosproject/codec/impl/InstructionJsonMatcher.java
	web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java

Change-Id: I330a862c8a18206250befbd4e22ee6d189beed83