You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@asterixdb.apache.org by mb...@apache.org on 2021/02/13 02:02:27 UTC

[asterixdb] 24/25: Merge "Merge branch 'gerrit/mad-hatter'" into cheshire-cat

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 56759ec7abd98ec9f1670dfe1b3dc61a396fff3d
Merge: d337bb7 f72e4cf
Author: Apache AsterixDB Gerrit <de...@asterixdb.apache.org>
AuthorDate: Fri Feb 12 23:37:48 2021 +0000

    Merge "Merge branch 'gerrit/mad-hatter'" into cheshire-cat

 .../asterix/common/config/ExternalProperties.java  |   3 +-
 .../hyracks/control/common/config/OptionTypes.java | 258 +++++++++++++--------
 2 files changed, 159 insertions(+), 102 deletions(-)