Home | About | Sematext search-lucene.com search-hadoop.com
 Search Hadoop and all its subprojects:

Switch to Plain View
Drill, mail # dev - [12/12] git commit: Correct protocol root pom reference due to merge conflict


Copy link to this message
-
[12/12] git commit: Correct protocol root pom reference due to merge conflict
jacques@... 2013-09-19, 16:45
Correct protocol root pom reference due to merge conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/7af77a2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/7af77a2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/7af77a2f

Branch: refs/heads/master
Commit: 7af77a2f3bbc13f2ca8a5197c488b415971707c2
Parents: 50d3a7e
Author: Jacques Nadeau <[EMAIL PROTECTED]>
Authored: Thu Sep 19 09:27:36 2013 -0700
Committer: Jacques Nadeau <[EMAIL PROTECTED]>
Committed: Thu Sep 19 09:27:36 2013 -0700

----------------------------------------------------------------------
 protocol/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/7af77a2f/protocol/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 61be0aa..ca29ba9 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-root</artifactId>
     <groupId>org.apache.drill</groupId>
-    <version>1.0.0-m1-incubating-SNAPSHOT</version>
+    <version>1.0.0-m2-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>drill-protocol</artifactId>