| commit | a419c4dcf1f21e42396914065b289a2c7f174664 | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Wed Aug 14 20:10:50 2013 -0700 |
| committer | zheilbron <zheilbron@gmail.com> | Wed Aug 14 20:10:50 2013 -0700 |
| tree | 7aa993b554ca7ea1bee65cdfdc0aec9ca52536ed | |
| parent | 555dc9d1bb1cc9343df07a78de01be5426cc9bdb [diff] | |
| parent | e67365ced5ded29a0c8616f14d6a97de4499b2c7 [diff] |
Merge branch 'dev/asterix_msr' of https://code.google.com/p/asterixdb into dev/asterix_msr Conflicts: asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlMetadataProvider.java