Merge new mask instruction

author Hanoh Haim <[email protected]>

Thu, 18 Feb 2016 14:51:54 +0000 (16:51 +0200)

committer Hanoh Haim <[email protected]>

Thu, 18 Feb 2016 14:51:54 +0000 (16:51 +0200)
author Hanoh Haim <[email protected]>
Thu, 18 Feb 2016 14:51:54 +0000 (16:51 +0200)
committer Hanoh Haim <[email protected]>
Thu, 18 Feb 2016 14:51:54 +0000 (16:51 +0200)
diff --cc scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py
Simple merge
diff --cc scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_packet_builder_scapy.py
Simple merge
author	Hanoh Haim <[email protected]>
	Thu, 18 Feb 2016 14:51:54 +0000 (16:51 +0200)
committer	Hanoh Haim <[email protected]>
	Thu, 18 Feb 2016 14:51:54 +0000 (16:51 +0200)
		1	2
scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_packet_builder_scapy.py	patch \|	diff1 \|	diff2 \|	blob \| history