tree cef51f31ca29d5dd8d1f79706d1b84e79c5d2906
parent 5a906adf3239f7d2340ae24401c9466d2c7bc53e
parent c449de97c6c04975a4531b1b68575233412833a8
author zheilbron <zheilbron@gmail.com> 1384892253 -0800
committer zheilbron <zheilbron@gmail.com> 1384892253 -0800

Merge branch 'master' into zheilbron/asterix_msr_demo

Conflicts:
	asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java
	asterix-app/src/test/resources/metadata/results/basic/meta17/meta17.1.adm
	asterix-app/src/test/resources/metadata/results/basic/metadata_datatype/metadata_datatype.1.adm
	asterix-common/src/main/java/edu/uci/ics/asterix/common/config/AsterixExternalProperties.java
	asterix-common/src/main/java/edu/uci/ics/asterix/common/transactions/ILockManager.java
	asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/MetadataManager.java
	asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/MetadataNode.java
	asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java