asterixdb-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Till Westmann (Code Review)" <do-not-re...@asterixdb.incubator.apache.org>
Subject Change in hyracks[master]: merge release-0.2.17
Date Fri, 04 Dec 2015 02:16:23 GMT
Till Westmann has uploaded a new change for review.

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

Change subject: merge release-0.2.17
......................................................................

merge release-0.2.17

Change-Id: I342dfcefd1f92f8f6832cb6ac08bcd5d668688a9
---
M pom.xml
1 file changed, 0 insertions(+), 11 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/hyracks refs/changes/35/535/1

diff --git a/pom.xml b/pom.xml
index 20c1075..f627937 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,16 +18,6 @@
  !-->
 
 
-<<<<<<< HEAD   (45af08 ASTERIXDB-1198: make ISerializerDeserializer
implementations)
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.hyracks</groupId>
-    <artifactId>fullstack</artifactId>
-    <version>0.2.17-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>hyracks-ecosystem-full-stack</name>
-=======
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hyracks</groupId>
@@ -35,7 +25,6 @@
   <version>0.2.17-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>hyracks-ecosystem-full-stack</name>
->>>>>>> BRANCH (4a6923 Fix ASTERIXDB-1108)
 
     <parent>
         <groupId>org.apache</groupId>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I342dfcefd1f92f8f6832cb6ac08bcd5d668688a9
Gerrit-PatchSet: 1
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <tillw@apache.org>

Mime
View raw message