tree de12101a02c86b85a30b65d040791f87125be342
parent 9d0a1bfa1961b00005fe02e8f7a295b56b7df239
parent a835a40ae1ce2075a318f715498b6d8b553115e5
author zheilbron <zheilbron@gmail.com> 1370110617 -0700
committer zheilbron <zheilbron@gmail.com> 1370110617 -0700

Merge branch 'master' into zheilbron/asterix_issue470

Conflicts:
	asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixAppRuntimeContext.java
	asterix-app/src/main/java/edu/uci/ics/asterix/file/DatasetOperations.java
	asterix-app/src/main/java/edu/uci/ics/asterix/file/SecondaryBTreeCreator.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-common/src/main/java/edu/uci/ics/asterix/common/config/AsterixStorageProperties.java
	asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/bootstrap/MetadataBootstrap.java
	asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java
	asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java
	asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/LSMRTreeLocalResourceMetadata.java