Prashant Sharma 7be75682b9 Merge branch 'master' into wip-merge-master ... Conflicts: bagel/pom.xml core/pom.xml core/src/test/scala/org/apache/spark/ui/UISuite.scala examples/pom.xml mllib/pom.xml pom.xml project/SparkBuild.scala repl/pom.xml streaming/pom.xml tools/pom.xml In scala 2.10, a shorter representation is used for naming artifacts so changed to shorter scala version for artifacts and made it a property in pom.		2013-10-08 11:29:40 +05:30
..
src	Merge branch 'master' into scala-2.10	2013-10-01 11:57:24 +05:30
pom.xml	Merge branch 'master' into wip-merge-master	2013-10-08 11:29:40 +05:30