Fix merge and build issue.

git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_hyracks_result_distribution@3172 123451ca-8445-de46-9d55-352943316053
7 files changed
tree: 935417afae7b166429d9a64a6fccb81f4415465d
  1. algebricks/
  2. hivesterix/
  3. hyracks/
  4. pom.xml
  5. pregelix/