>From Ian Maxon <ima...@apache.org>:
Ian Maxon has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20414?usp=email )
Change subject: Merge branch 'morpheus' into phoenix
......................................................................
Merge branch 'morpheus' into phoenix
Ext-ref: MB-64900
Change-Id: I068f9caa9d9ea810d62954a19632919b374a21ae
---
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/JSONDataParserFactory.java
2 files changed, 20 insertions(+), 6 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/14/20414/1
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/JSONDataParserFactory.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/JSONDataParserFactory.java
index 24154df..152d857 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/JSONDataParserFactory.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/JSONDataParserFactory.java
@@ -37,12 +37,6 @@
private static final long serialVersionUID = 2L;
private static final List<String> PARSER_FORMAT =
Collections.unmodifiableList(
Arrays.asList(ExternalDataConstants.FORMAT_JSON_LOWER_CASE,
ExternalDataConstants.FORMAT_JSON_UPPER_CASE));
-<<<<<<< HEAD (6991ae [ASTERIXDB-3643][EXT]: make path-style addressing
configurab)
-=======
- private static final List<ATypeTag> UNSUPPORTED_TYPES = Collections
- .unmodifiableList(Arrays.asList(ATypeTag.MULTISET,
ATypeTag.POINT3D, ATypeTag.CIRCLE, ATypeTag.RECTANGLE,
- ATypeTag.INTERVAL, ATypeTag.DAYTIMEDURATION,
ATypeTag.DURATION, ATypeTag.BINARY));
->>>>>>> BRANCH (21cf7e Merge branch 'trinity' into morpheus)
private static final JsonFactory jsonFactory;
static {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20414?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: phoenix
Gerrit-Change-Id: I068f9caa9d9ea810d62954a19632919b374a21ae
Gerrit-Change-Number: 20414
Gerrit-PatchSet: 1
Gerrit-Owner: Ian Maxon <ima...@apache.org>
