Change in asterixdb[master]: Merge commit '722e85d0347e628da99b5e479f3a9a993e549b03' from...

[Michael Blow (Code Review)]

Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/2907

Change subject: Merge commit '722e85d0347e628da99b5e479f3a9a993e549b03' from 
release-0.9.4-pre-rc
......................................................................

Merge commit '722e85d0347e628da99b5e479f3a9a993e549b03' from 
release-0.9.4-pre-rc

Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
---
M asterixdb/asterix-external-data/pom.xml
M asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
2 files changed, 5 insertions(+), 12 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/07/2907/1

diff --git a/asterixdb/asterix-external-data/pom.xml 
b/asterixdb/asterix-external-data/pom.xml
index 99770ab..a73ac92 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -408,13 +408,6 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
     </dependency>
-<<<<<<< HEAD   (6de331 [NO ISSUE][HTTP] Fix buffer leak in HttpServer)
-       <dependency>
-         <groupId>com.esri.geometry</groupId>
-         <artifactId>esri-geometry-api</artifactId>
-         <version>2.0.0</version>
-       </dependency>
-=======
     <dependency>
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-core</artifactId>
@@ -427,6 +420,10 @@
       <groupId>com.sun.activation</groupId>
       <artifactId>javax.activation</artifactId>
     </dependency>
->>>>>>> BRANCH (722e85 [NO ISSUE][OTH] Fix sample cluster version check for 
latest )
+       <dependency>
+         <groupId>com.esri.geometry</groupId>
+         <artifactId>esri-geometry-api</artifactId>
+         <version>2.0.0</version>
+       </dependency>
   </dependencies>
 </project>
diff --git 
a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh 
b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
index 0d5df13..e337cb0 100755
--- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
@@ -39,7 +39,6 @@
   export JAVA_HOME
 fi
 
-<<<<<<< HEAD   (6de331 [NO ISSUE][HTTP] Fix buffer leak in HttpServer)
 # OS specific support.  $var _must_ be set to either true or false.
 cygwin=false;
 darwin=false;
@@ -87,10 +86,7 @@
   fi
 fi
 
-export JAVA_VERSION=$(java -version 2>&1 | head -1 | awk '{ print $NF }' | tr 
-d '"')
-=======
 export JAVA_VERSION=$(java -version 2>&1 | head -1 | awk '{ print $3 }' | tr 
-d '"')
->>>>>>> BRANCH (722e85 [NO ISSUE][OTH] Fix sample cluster version check for 
latest )
 case $JAVA_VERSION in
   1.8*|1.9*|10*|11*)
     ;;

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2907
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>