tree cc28d81e0446b17d7608e8d768da2ed6e565b078
parent 7dabc19f75e45f0d1a577b304abd07b1301dab54
author Ian Maxon <imaxon@apache.org> 1455832315 -0800
committer Ian Maxon <imaxon@apache.org> 1458088166 -0700

Merge changes necessary for asterix-experiments pkg

Change-Id: I1256608bbb97d747747325c2050d5a2dc89beeb0
Reviewed-on: https://asterix-gerrit.ics.uci.edu/641
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Ian Maxon <imaxon@apache.org>