Merge remote-tracking branch 'origin/master' into ceej/tiered-tests

Conflicts:
	hyracks/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/common/IndexMultiThreadTestDriver.java
tree: 55b54bee02ca8e4ebebc51aff1e5625163ccebe5
  1. .gitignore
  2. algebricks/
  3. hivesterix/
  4. hyracks/
  5. pom.xml
  6. pregelix/