Clone
zheilbron <zheilbron@gmail.com>
committed
on 24 Oct 13
Merge remote-tracking branch 'origin/raman/master_feeds' into zheilbron/hyracks_msr_demo
Conflicts:
hyracks/hyracks-control/hyracks-control… Show more
Merge remote-tracking branch 'origin/raman/master_feeds' into zheilbron/hyracks_msr_demo

Conflicts:

        hyracks/hyracks-control/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/job/JobRun.java

        hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/impls/AbstractTreeIndex.java

Show less

master + 7 more