Merge branch 'master' into dan_stateless

author Dan Klein <[email protected]>

Mon, 24 Aug 2015 15:44:56 +0000 (18:44 +0300)

committer Dan Klein <[email protected]>

Mon, 24 Aug 2015 15:44:56 +0000 (18:44 +0300)
author Dan Klein <[email protected]>
Mon, 24 Aug 2015 15:44:56 +0000 (18:44 +0300)
committer Dan Klein <[email protected]>
Mon, 24 Aug 2015 15:44:56 +0000 (18:44 +0300)
diff --cc scripts/automation/trex_control_plane/examples/client_interactive_example.py
Simple merge
diff --cc scripts/automation/trex_control_plane/server/extended_daemon_runner.py
Simple merge
author	Dan Klein <[email protected]>
	Mon, 24 Aug 2015 15:44:56 +0000 (18:44 +0300)
committer	Dan Klein <[email protected]>
	Mon, 24 Aug 2015 15:44:56 +0000 (18:44 +0300)
		1	2
scripts/automation/trex_control_plane/examples/client_interactive_example.py	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/automation/trex_control_plane/server/extended_daemon_runner.py	patch \|	diff1 \|	diff2 \|	blob \| history