git commit: [SPARK-4211][Build] Fixes hive.version in Maven profile hive-0.13.1

2014-11-03 Thread marmbrus
Repository: spark
Updated Branches:
  refs/heads/branch-1.2 a68321400 - fc782896b


[SPARK-4211][Build] Fixes hive.version in Maven profile hive-0.13.1

instead of `hive.version=0.13.1`.
e.g. mvn -Phive -Phive=0.13.1

Note: `hive.version=0.13.1a` is the default property value. However, when 
explicitly specifying the `hive-0.13.1` maven profile, the wrong one would be 
selected.
References:  PR #2685, which resolved a package incompatibility issue with 
Hive-0.13.1 by introducing a special version Hive-0.13.1a

Author: fi code...@gmail.com

Closes #3072 from coderfi/master and squashes the following commits:

7ca4b1e [fi] Fixes the `hive-0.13.1` maven profile referencing 
`hive.version=0.13.1` instead of the Spark compatible `hive.version=0.13.1a` 
Note: `hive.version=0.13.1a` is the default version. However, when explicitly 
specifying the `hive-0.13.1` maven profile, the wrong one would be selected. 
e.g. mvn -Phive -Phive=0.13.1 See PR #2685

(cherry picked from commit df607da025488d6c924d3d70eddb67f5523080d3)
Signed-off-by: Michael Armbrust mich...@databricks.com


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fc782896
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fc782896
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fc782896

Branch: refs/heads/branch-1.2
Commit: fc782896b5d51161feee950107df2acf17e12422
Parents: a683214
Author: fi code...@gmail.com
Authored: Mon Nov 3 12:56:56 2014 -0800
Committer: Michael Armbrust mich...@databricks.com
Committed: Mon Nov 3 12:57:09 2014 -0800

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/fc782896/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6191cd3..eb61353 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1359,7 +1359,7 @@
 activeByDefaultfalse/activeByDefault
   /activation
   properties
-hive.version0.13.1/hive.version
+hive.version0.13.1a/hive.version
 hive.version.short0.13.1/hive.version.short
 derby.version10.10.1.1/derby.version
   /properties


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org



git commit: [SPARK-4211][Build] Fixes hive.version in Maven profile hive-0.13.1

2014-11-03 Thread marmbrus
Repository: spark
Updated Branches:
  refs/heads/master 3cca19622 - df607da02


[SPARK-4211][Build] Fixes hive.version in Maven profile hive-0.13.1

instead of `hive.version=0.13.1`.
e.g. mvn -Phive -Phive=0.13.1

Note: `hive.version=0.13.1a` is the default property value. However, when 
explicitly specifying the `hive-0.13.1` maven profile, the wrong one would be 
selected.
References:  PR #2685, which resolved a package incompatibility issue with 
Hive-0.13.1 by introducing a special version Hive-0.13.1a

Author: fi code...@gmail.com

Closes #3072 from coderfi/master and squashes the following commits:

7ca4b1e [fi] Fixes the `hive-0.13.1` maven profile referencing 
`hive.version=0.13.1` instead of the Spark compatible `hive.version=0.13.1a` 
Note: `hive.version=0.13.1a` is the default version. However, when explicitly 
specifying the `hive-0.13.1` maven profile, the wrong one would be selected. 
e.g. mvn -Phive -Phive=0.13.1 See PR #2685


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/df607da0
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/df607da0
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/df607da0

Branch: refs/heads/master
Commit: df607da025488d6c924d3d70eddb67f5523080d3
Parents: 3cca196
Author: fi code...@gmail.com
Authored: Mon Nov 3 12:56:56 2014 -0800
Committer: Michael Armbrust mich...@databricks.com
Committed: Mon Nov 3 12:56:56 2014 -0800

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/df607da0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6191cd3..eb61353 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1359,7 +1359,7 @@
 activeByDefaultfalse/activeByDefault
   /activation
   properties
-hive.version0.13.1/hive.version
+hive.version0.13.1a/hive.version
 hive.version.short0.13.1/hive.version.short
 derby.version10.10.1.1/derby.version
   /properties


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org