Clone
zheilbron <zheilbron@gmail.com>
committed
on 22 Nov 13
Merge branch 'master' into zheilbron/asterix_msr_demo
Conflicts:
asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/RemoveUn… Show more
Merge branch 'master' into zheilbron/asterix_msr_demo

Conflicts:

        asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/RemoveUnusedOneToOneEquiJoinRule.java

        asterix-app/src/test/resources/metadata/results/basic/meta17.adm

        asterix-app/src/test/resources/metadata/results/basic/meta17/meta17.1.adm

        asterix-app/src/test/resources/metadata/results/basic/metadata_datatype.adm

        asterix-app/src/test/resources/metadata/results/basic/metadata_datatype/metadata_datatype.1.adm

        asterix-app/src/test/resources/runtimets/testsuite.xml

        asterix-common/src/main/java/edu/uci/ics/asterix/common/config/AsterixExternalProperties.java

        asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/MetadataManager.java

        asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/ConcurrentLockManager.java

Show less

master + 10 more