>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18022 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Change-Id: I9c59ebaf8e915fbae9eefac994339dfd904e675a
---
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
2 files changed, 16 insertions(+), 3 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/22/18022/1
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index f9e261f..e06a899 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -7311,13 +7311,13 @@
</compilation-unit>
</test-case>
<test-case FilePath="misc">
-<<<<<<< HEAD (1f82cd [NO ISSUE][OTH] Improve logging)
<compilation-unit name="query-ASTERIXDB-3316">
<output-dir compare="Text">query-ASTERIXDB-3316</output-dir>
-=======
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="misc">
<compilation-unit name="query-ASTERIXDB-3334">
<output-dir compare="Text">query-ASTERIXDB-3334</output-dir>
->>>>>>> BRANCH (41212d [ASTERIXDB-3334][COMP] Incorrect answer on query)
</compilation-unit>
</test-case>
</test-group>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18022
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: I9c59ebaf8e915fbae9eefac994339dfd904e675a
Gerrit-Change-Number: 18022
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
