tree d4d234c6c4c904b2a73026bdcaf0812a60d1dd79
parent 28e026fd39196b4292cc8345f15a38b4c1c0a197
parent 0a1f22410a623d628d9d0c887aff9a5cdd67cdb5
author zheilbron <zheilbron@gmail.com> 1385145573 -0800
committer zheilbron <zheilbron@gmail.com> 1385145573 -0800

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