diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2013-01-15 12:08:51 -0800 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2013-01-15 12:08:51 -0800 |
| commit | cd1521cfdb3c9dd2bf8ced8907afbbbf33893804 (patch) | |
| tree | 76fce28a2fca3fcfbbc3a7f4c7b0fe82cfc695c7 /bagel | |
| parent | 1638fcb0dce296da22ffc90127d5148a8fab745e (diff) | |
| parent | cb867e9ffb2c5e3d65d50c222fcce3631b94e4dd (diff) | |
| download | spark-cd1521cfdb3c9dd2bf8ced8907afbbbf33893804.tar.gz spark-cd1521cfdb3c9dd2bf8ced8907afbbbf33893804.tar.bz2 spark-cd1521cfdb3c9dd2bf8ced8907afbbbf33893804.zip | |
Merge branch 'master' into streaming
Conflicts:
core/src/main/scala/spark/rdd/CoGroupedRDD.scala
core/src/main/scala/spark/rdd/FilteredRDD.scala
docs/_layouts/global.html
docs/index.md
run
Diffstat (limited to 'bagel')
| -rw-r--r-- | bagel/pom.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/bagel/pom.xml b/bagel/pom.xml index a8256a6e8b..5f58347204 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -45,6 +45,11 @@ <profiles> <profile> <id>hadoop1</id> + <activation> + <property> + <name>!hadoopVersion</name> + </property> + </activation> <dependencies> <dependency> <groupId>org.spark-project</groupId> @@ -72,6 +77,12 @@ </profile> <profile> <id>hadoop2</id> + <activation> + <property> + <name>hadoopVersion</name> + <value>2</value> + </property> + </activation> <dependencies> <dependency> <groupId>org.spark-project</groupId> |