Clone
pouria.pirzadeh <pouria@Pourias-MacBook-Pro.local>
committed
on 04 Dec 13
Merge branch 'master' into pouria/fix-memory
Conflicts:
hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/context/IHyracksCommonCon… Show more
Merge branch 'master' into pouria/fix-memory

Conflicts:

        hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/context/IHyracksCommonContext.java

        hyracks/hyracks-client/src/main/java/edu/uci/ics/hyracks/client/dataset/DatasetClientContext.java

        hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java

        hyracks/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/test/support/TestTaskContext.java

Show less

master + 7 more