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 aa0d9b9b08636ff9d5a1d1ab2af117de29745675
Merge: d6f10a8 281218f
Author: Apache AsterixDB Gerrit <[email protected]>
AuthorDate: Tue May 19 13:23:59 2020 +0000

    Merge "Merge commit '594e7eca21' from 'gerrit/mad-hatter'"

 .../asterix/app/translator/QueryTranslator.java    |  8 ++++----
 .../aws/s3/csv-header/query-dataset.001.ddl.sqlpp  |  2 +-
 .../s3/csv-warnings/query-dataset.007.ddl.sqlpp    |  2 +-
 .../s3/csv-warnings/query-dataset.010.ddl.sqlpp    |  2 +-
 .../aws/s3/csv/csv/query-dataset.000.ddl.sqlpp     |  2 +-
 .../aws/s3/csv/gz/query-dataset.000.ddl.sqlpp      |  2 +-
 .../asterix/common/exceptions/ErrorCode.java       |  8 ++++----
 .../src/main/resources/asx_errormsg/en.properties  | 12 ++++++------
 .../asterix/external/util/ExternalDataUtils.java   | 22 ++++++++++++++--------
 asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj  |  4 +++-
 .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj    |  4 +++-
 .../src/main/resources/errormsg/en.properties      |  1 +
 12 files changed, 40 insertions(+), 29 deletions(-)

Reply via email to