tree 8f19661bb5172165e259da34a0ce2b940dff411c
parent c9747ba774f07c0c4b3a38e1735b718864a37e55
parent 41eb26f1221bd4d3f38b0e09f3f025076c3b3f77
author zheilbron <zheilbron@gmail.com> 1369857892 -0700
committer zheilbron <zheilbron@gmail.com> 1369857892 -0700

Merge branch 'master' into zheilbron/asterix_issue470

Conflicts:
	asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/InvertedIndexPOperator.java
	asterix-app/src/main/java/edu/uci/ics/asterix/file/DatasetOperations.java
	asterix-app/src/main/java/edu/uci/ics/asterix/file/IndexOperations.java
	asterix-app/src/main/java/edu/uci/ics/asterix/file/SecondaryBTreeCreator.java
	asterix-app/src/main/java/edu/uci/ics/asterix/file/SecondaryIndexCreator.java
	asterix-app/src/main/java/edu/uci/ics/asterix/file/SecondaryInvertedIndexCreator.java
	asterix-app/src/main/java/edu/uci/ics/asterix/file/SecondaryRTreeCreator.java
	asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlMetadataProvider.java