Clone
zheilbron <zheilbron@gmail.com>
committed
on 24 Oct 13
Merge remote-tracking branch 'origin/raman/master_feeds_merge' into zheilbron/asterix_msr_demo
Conflicts:
.gitignore
asterix-algebra/src/m… Show more
Merge remote-tracking branch 'origin/raman/master_feeds_merge' into zheilbron/asterix_msr_demo

Conflicts:

        .gitignore

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

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

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

        asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixAppRuntimeContext.java

        asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixAppRuntimeContextProdiverForRecovery.java

        asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java

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

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

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

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

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

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

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

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

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

        asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv02/cross-dv02.1.adm

        asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv04/cross-dv04.1.adm

        asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv19/cross-dv19.1.adm

        asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf23/udf23.1.adm

        asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/FeedDetailsDecl.java

        asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/InternalDetailsDecl.java

        asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/visitor/AQLPrintVisitor.java

        asterix-aql/src/main/javacc/AQL.jj

        asterix-common/src/main/java/edu/uci/ics/asterix/common/transactions/IAsterixAppRuntimeContextProvider.java

        asterix-external-data/src/main/java/edu/uci/ics/asterix/external/dataset/adapter/FileSystemBasedAdapter.java

        asterix-installer/src/main/java/edu/uci/ics/asterix/installer/driver/InstallerUtil.java

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

        asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/bootstrap/MetadataBootstrap.java

        asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/bootstrap/MetadataRecordTypes.java

        asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/DatasetDataSource.java

        asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entities/InternalDatasetDetails.java

        asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java

        asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/feeds/FeedMetaOperatorDescriptor.java

        asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/feeds/FeedUtil.java

        asterix-om/src/main/java/edu/uci/ics/asterix/om/functions/AsterixExternalFunctionInfo.java

        asterix-om/src/main/java/edu/uci/ics/asterix/om/util/AsterixAppContextInfo.java

        asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/opcallbacks/SecondaryIndexModificationOperationCallbackFactory.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/service/logging/LogManager.java

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

Show less

master + 10 more