diff options
| author | Charles Reiss <charles@eecs.berkeley.edu> | 2013-02-02 00:33:30 -0800 |
|---|---|---|
| committer | Charles Reiss <charles@eecs.berkeley.edu> | 2013-02-02 00:33:30 -0800 |
| commit | 610795796257ff63e6a5ac0473b183de461a72d4 (patch) | |
| tree | 75d3ea27bae9d4a72461cdd651c7acb1cfe364c6 /core/pom.xml | |
| parent | 1fd5ee323d127499bb3f173d4142c37532ec29b2 (diff) | |
| parent | ae26911ec0d768dcdae8b7d706ca4544e36535e6 (diff) | |
| download | spark-610795796257ff63e6a5ac0473b183de461a72d4.tar.gz spark-610795796257ff63e6a5ac0473b183de461a72d4.tar.bz2 spark-610795796257ff63e6a5ac0473b183de461a72d4.zip | |
Merge remote-tracking branch 'base/master' into dag-sched-tests
Conflicts:
core/src/main/scala/spark/scheduler/DAGScheduler.scala
Diffstat (limited to 'core/pom.xml')
| -rw-r--r-- | core/pom.xml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/core/pom.xml b/core/pom.xml index a2b9b726a6..66c62151fe 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -168,11 +168,6 @@ <profiles> <profile> <id>hadoop1</id> - <activation> - <property> - <name>!hadoopVersion</name> - </property> - </activation> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -225,12 +220,6 @@ </profile> <profile> <id>hadoop2</id> - <activation> - <property> - <name>hadoopVersion</name> - <value>2</value> - </property> - </activation> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> |