| commit | 3d94fc5c0ae842df3dd7c1ab8e7974aaaa956164 | [log] [tgz] |
|---|---|---|
| author | pouria.pirzadeh <pouria@Pourias-MacBook-Pro.local> | Tue Dec 03 23:51:24 2013 -0800 |
| committer | pouria.pirzadeh <pouria@Pourias-MacBook-Pro.local> | Tue Dec 03 23:51:24 2013 -0800 |
| tree | 672cb9c9bd48dad440d95f03f56f3953e113c68a | |
| parent | 8178fc0e6920576b8efa028d147cea3b287926b9 [diff] | |
| parent | 8736768df4087265d2cfd182cec44a55249cd163 [diff] |
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