This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 093e84224918a0cc676f9d5a618c707f1a5ea89a
Merge: 527f141 97e589d
Author: Apache AsterixDB Gerrit <do-not-re...@asterixdb.incubator.apache.org>
AuthorDate: Fri Feb 15 16:22:01 2019 -0800
Merge "Merge commit 'd9850dc' from 'stabilization-f69489' into 'master'"
asterixdb/NOTICE | 2 +-
.../optimizer/rules/am/BTreeAccessMethod.java | 36 ++++++++----
asterixdb/asterix-app/pom.xml | 4 +-
.../asterix/test/runtime/ExecutionTestUtil.java | 11 ++++
.../range-search-open.5.query.sqlpp | 33 +++--------
.../range-search/range-search.5.query.sqlpp | 33 +++--------
.../range-search-open/range-search-open.2.adm | 1 +
.../range-search/range-search.2.adm | 1 +
.../range-search-open/range-search-open.5.ast | 67 ++++++++++++++++++++++
.../range-search/range-search.5.ast | 67 ++++++++++++++++++++++
.../src/main/licenses/templates/asterix-notice.ftl | 2 +-
hyracks-fullstack/NOTICE | 2 +-
.../src/main/licenses/templates/hyracks-notice.ftl | 2 +-
.../common/controllers/ControllerConfig.java | 5 +-
.../control/nc/NCLogConfigurationFactory.java | 26 ++++-----
hyracks-fullstack/hyracks/hyracks-server/pom.xml | 4 ++
.../apache/hyracks/test/server/NCServiceIT.java | 19 +++++-
.../test/server/process/HyracksCCProcess.java | 8 ++-
.../server/process/HyracksNCServiceProcess.java | 9 ++-
.../test/server/process/HyracksServerProcess.java | 5 ++
.../test/server/process/HyracksVirtualCluster.java | 61 ++++++++++++++++----
.../src/test/resources/NCServiceIT/cc.conf | 1 +
.../src/test/resources/NCServiceIT/nc-blue.conf | 2 -
.../src/test/resources/NCServiceIT/nc-red.conf | 2 -
hyracks-fullstack/pom.xml | 2 +
25 files changed, 306 insertions(+), 99 deletions(-)
