tree 7aa993b554ca7ea1bee65cdfdc0aec9ca52536ed
parent 555dc9d1bb1cc9343df07a78de01be5426cc9bdb
parent e67365ced5ded29a0c8616f14d6a97de4499b2c7
author zheilbron <zheilbron@gmail.com> 1376536250 -0700
committer zheilbron <zheilbron@gmail.com> 1376536250 -0700

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