>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18350 )
Change subject: Merge branch 'gerrit/stabilization-40cfb8705b' into 'gerrit/neo'
......................................................................
Merge branch 'gerrit/stabilization-40cfb8705b' into 'gerrit/neo'
Change-Id: Id982c1f25f98cd2b1a61f321214e5a9c953a5a2e
---
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
2 files changed, 18 insertions(+), 5 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/50/18350/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 23e10c6..66e47ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -7296,13 +7296,13 @@
</compilation-unit>
</test-case>
<test-case FilePath="misc">
-<<<<<<< HEAD (e0d0c9 [NO ISSUE][OTH] Logging enhancements + query job
logging)
- <compilation-unit name="query-ASTERIXDB-3403">
- <output-dir compare="Text">query-ASTERIXDB-3403</output-dir>
-=======
<compilation-unit name="query-ASTERIXDB-3418">
<output-dir compare="Text">query-ASTERIXDB-3418</output-dir>
->>>>>>> BRANCH (fee1bf [ASTERIXDB-3418][*DB] Predicate 0.0=-0.0 returns false)
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="misc">
+ <compilation-unit name="query-ASTERIXDB-3403">
+ <output-dir compare="Text">query-ASTERIXDB-3403</output-dir>
</compilation-unit>
</test-case>
</test-group>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18350
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: Id982c1f25f98cd2b1a61f321214e5a9c953a5a2e
Gerrit-Change-Number: 18350
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
