Merge branch 'release' into integration/master

Conflicts: pom.xml zanata-common-api/pom.xml
zanata · Feb 25, 2015 · 95a1387 · 95a1387
2 parents 20e900b + 3fcc75e
commit 95a1387
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,15 +8,15 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>21-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
+    <version>21</version>
+    <relativePath>../zanata-parent</relativePath>
   </parent>
 
   <scm>
     <connection>scm:git:git://github.com/zanata/zanata-api.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata-api.git</developerConnection>
     <url>https://github.com/zanata/zanata-api</url>
-    <tag>HEAD</tag>
+    <tag>api-3.6.0</tag>
   </scm>
 
   <!-- This is needed for bootstrapping with a zanata-parent SNAPSHOT  -->

diff --git a/zanata-common-api/pom.xml b/zanata-common-api/pom.xml
@@ -15,7 +15,7 @@
     <connection>scm:git:git://github.com/zanata/zanata-api.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata-api.git</developerConnection>
     <url>https://github.com/zanata/zanata-api</url>
-    <tag>HEAD</tag>
+    <tag>api-3.6.0</tag>
   </scm>
 
   <build>