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

2018-08-15 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7185/ 
: SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Murtadha Hubail 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

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

2018-08-15 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/4720/
 (13/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Murtadha Hubail 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

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

2018-08-15 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/4751/ 
(12/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Murtadha Hubail 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

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

2018-08-15 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-java10/572/ 
(11/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Murtadha Hubail 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7185/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Murtadha Hubail 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

BAD Compatibility Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3606/ : SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Murtadha Hubail 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

BAD Compatibility Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3606/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Murtadha Hubail 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

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

2018-08-14 Thread Michael Blow (Code Review) 
Michael Blow has submitted this change and it was merged.

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(-)

Approvals:
  Jenkins: No violations found
  Michael Blow: Verified
  Ian Maxon: Looks good to me, approved



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 @@
   org.apache.logging.log4j
   log4j-api
 
-<<< HEAD   (6de331 [NO ISSUE][HTTP] Fix buffer leak in HttpServer)
-   
- com.esri.geometry
- esri-geometry-api
- 2.0.0
-   
-===
 
   com.sun.xml.bind
   jaxb-core
@@ -427,6 +420,10 @@
   com.sun.activation
   javax.activation
 
->>> BRANCH (722e85 [NO ISSUE][OTH] Fix sample cluster version check for 
latest )
+   
+ com.esri.geometry
+ esri-geometry-api
+ 2.0.0
+   
   
 
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: merged
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Murtadha Hubail 
Gerrit-Reviewer: Till Westmann

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

2018-08-14 Thread Michael Blow (Code Review) 
Michael Blow has posted comments on this change.

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


Patch Set 1: Verified+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Murtadha Hubail 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

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

2018-08-14 Thread Ian Maxon (Code Review) 
Ian Maxon has posted comments on this change.

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


Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Murtadha Hubail 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

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

2018-08-14 Thread Anon. E. Moose (Code Review) 
Anon. E. Moose #1000171 has posted comments on this change.

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


Patch Set 1:

Analytics Compatibility Compilation Successful
https://goo.gl/rzYwSn : SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/4577/ 
(2/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/2370/ 
(5/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/4356/ 
(3/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage-jre10/643/ (7/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/4358/
 (9/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/4915/ (1/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/4270/ 
(4/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/8294/ (10/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/4324/ 
(8/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2018-08-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/9834/ (6/13)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2018-08-14 Thread 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 @@
   org.apache.logging.log4j
   log4j-api
 
-<<< HEAD   (6de331 [NO ISSUE][HTTP] Fix buffer leak in HttpServer)
-   
- com.esri.geometry
- esri-geometry-api
- 2.0.0
-   
-===
 
   com.sun.xml.bind
   jaxb-core
@@ -427,6 +420,10 @@
   com.sun.activation
   javax.activation
 
->>> BRANCH (722e85 [NO ISSUE][OTH] Fix sample cluster version check for 
latest )
+   
+ com.esri.geometry
+ esri-geometry-api
+ 2.0.0
+   
   
 
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