tree 0b2f8af14820845156415f1ca44e515d08787d03
parent bf664f45285d9bb18bee6a701901ebca9d03c915
author salsubaiee <salsubaiee@gmail.com> 1405642779 -0700
committer Ian Maxon <imaxon@uci.edu> 1405647223 -0800

Changes to allow having the no-merge policy as an option in asterix.

Change-Id: I573b6a09185d51df1ec115edc38a89bd029574d5
Reviewed-on: http://fulliautomatix.ics.uci.edu:8443/107
Reviewed-by: abdullah alamoudi <bamousaa@gmail.com>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>