zeek/testing/btest/scripts/base/frameworks/control
Robin Sommer 9b83591374 Merge remote-tracking branch 'origin/topic/robin/parallel-btest'
* origin/topic/robin/parallel-btest:
  Updating submodule(s).
  Adding group "comm" to communication tests for parallelizing execution with new btest version.

This is in preparation for the merge with the parallel btest branch.

Conflicts:
	cmake
	testing/btest/istate/pybroccoli.py
	testing/btest/scripts/base/frameworks/control/configuration_update.bro
	testing/btest/scripts/base/frameworks/control/id_value.bro
	testing/btest/scripts/base/frameworks/control/shutdown.bro
	testing/btest/scripts/base/frameworks/metrics/basic-cluster.bro
2012-02-29 17:17:25 -08:00
..
configuration_update.bro Merge remote-tracking branch 'origin/topic/robin/parallel-btest' 2012-02-29 17:17:25 -08:00
id_value.bro Merge remote-tracking branch 'origin/topic/robin/parallel-btest' 2012-02-29 17:17:25 -08:00
shutdown.bro Merge remote-tracking branch 'origin/topic/robin/parallel-btest' 2012-02-29 17:17:25 -08:00