Merge branch 'master' into zheilbron/hyracks_asterix_issue470
tree: 5c53a391dbbae32d3fbf14b4d757086e84d5b05d
  1. .gitignore
  2. algebricks/
  3. hivesterix/
  4. hyracks/
  5. pom.xml
  6. pregelix/