| commit | f50ea7825a71e4f4a693eeaf900a082c1e387c89 | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Thu Nov 07 14:45:19 2013 -0800 |
| committer | zheilbron <zheilbron@gmail.com> | Thu Nov 07 14:45:19 2013 -0800 |
| tree | 2c604acb8e10c04c6634b48d7076d2a18f48ad96 | |
| parent | 1fea4c9d9745378e77dcbe90a6a6ae5395220e0b [diff] | |
| parent | b5d5b18665557f0a7beb8a0e641b1de0fcf8d1c3 [diff] |
Merge branch 'master' into zheilbron/asterix_msr_demo Conflicts: asterix-app/src/test/resources/runtimets/testsuite.xml asterix-external-data/src/main/java/edu/uci/ics/asterix/external/dataset/adapter/FileSystemBasedAdapter.java asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/MetadataNode.java