| commit | 555dc9d1bb1cc9343df07a78de01be5426cc9bdb | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Wed Aug 14 19:58:00 2013 -0700 |
| committer | zheilbron <zheilbron@gmail.com> | Wed Aug 14 19:58:00 2013 -0700 |
| tree | 24a093c67345b8ccba1b80da84360a72cd43c1e2 | |
| parent | cb9838805079bf7b9dbd2a0c26807841effd37ab [diff] | |
| parent | ee7e1b2428abfe0d496cd63b9c81d7eb0c990ec5 [diff] |
Merge branch 'master' into dev/asterix_msr Conflicts: asterix-aql/src/main/javacc/AQL.jj asterix-external-data/src/main/java/edu/uci/ics/asterix/external/dataset/adapter/FileSystemBasedAdapter.java