Merge pull request #31 from sundeepn/branch-0.8 Resolving package conflicts with hadoop 0.23.9
Hadoop 0.23.9 is having a package conflict with easymock's dependencies. Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/023e3fdf Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/023e3fdf Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/023e3fdf Branch: refs/heads/branch-0.8 Commit: 023e3fdf008b3194a36985a07923df9aaf64e520 Parents: 3cb9040 b33ef98 Author: Reynold Xin <r...@apache.org> Authored: Mon Oct 7 10:47:45 2013 -0700 Committer: Reynold Xin <r...@apache.org> Committed: Mon Oct 7 10:47:45 2013 -0700 ---------------------------------------------------------------------- core/src/test/scala/org/apache/spark/ui/UISuite.scala | 7 ++++++- project/SparkBuild.scala | 13 ++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
