hpcc-systems/HPCC-Platform — pull request #6006 by AttilaVamos (2014-06-05 10:59:43+00:00)
Title: HPCC-11606 ecl-test no longer starting

Resolve merge problems

Signed-off-by: Attila Vamos