GitHub user salexln opened a pull request: https://github.com/apache/spark/pull/1287
Branch 0.8 You can merge this pull request into a Git repository by running: $ git pull https://github.com/apache/spark branch-0.8 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/spark/pull/1287.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1287 ---- commit 75bd03e4d9a6605e96c6dd405ef09b4975495f61 Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-16T00:08:25Z [maven-release-plugin] prepare release v0.8.0-incubating commit 387892353f1f8abcce25f762bcd438ffb39a4f0d Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-16T00:08:31Z [maven-release-plugin] prepare for next development iteration commit d5f0ec1add357d960835dd54ee35f268f1c2aaf0 Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-16T02:28:56Z Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 387892353f1f8abcce25f762bcd438ffb39a4f0d. commit 4ed1921a7b5c15eba5fab96dd2cb774fc2ea4a03 Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-16T02:29:05Z Revert "[maven-release-plugin] prepare release v0.8.0-incubating" This reverts commit 75bd03e4d9a6605e96c6dd405ef09b4975495f61. commit ce6b881db90f6cec76789f6f9d0e66480327dde4 Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-16T02:29:15Z Revert "Hard code scala version in pom files." This reverts commit a1e7e519653beae47cafccbb9e335bc74986c0dc. commit 487205f3a16b2bf4a0db7cd70b70a5fd4a047c74 Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-16T02:59:32Z Revert "Revert "Hard code scala version in pom files."" This reverts commit ce6b881db90f6cec76789f6f9d0e66480327dde4. commit d9e80d53f6535f022ca59e11ffd1d164c17548d9 Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-16T03:11:34Z [maven-release-plugin] prepare release v0.8.0-incubating commit 34aa342138a06913787ab1cec7ee7b57a14f7cba Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-16T03:11:50Z [maven-release-plugin] prepare for next development iteration commit b4fef78d95e19e4ea13483b7c93a38fd291c6592 Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-17T05:58:28Z Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 34aa342138a06913787ab1cec7ee7b57a14f7cba. commit fc48d482a6d878c1b9358a382cc0f68ca86a3dda Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-17T05:58:32Z Revert "[maven-release-plugin] prepare release v0.8.0-incubating" This reverts commit d9e80d53f6535f022ca59e11ffd1d164c17548d9. commit 721ea8cf2080ab77f50c148a5c5aa5bab8d1b429 Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-17T05:30:54Z Make spark-kafka a "provided" dependency. Otherwise any third-party build that links against spark-streaming will break (even if they aren't using kafka). This also defines the local repository inside of the examples pom so that the examples build continues to work. commit 72f8dcd9ddbe2fff8c64ec4a56892cd2a7593867 Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-17T06:17:05Z [maven-release-plugin] prepare release v0.8.0-incubating commit fc9626d1448adc3d41855f9254fd9919a4157ad3 Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-17T06:17:35Z Revert "[maven-release-plugin] prepare release v0.8.0-incubating" This reverts commit 72f8dcd9ddbe2fff8c64ec4a56892cd2a7593867. commit 3b85a8558da2c87873c85f227a189e45bf16b65d Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-17T06:27:03Z [maven-release-plugin] prepare release v0.8.0-incubating commit c71efa1a99fe6ba29e70afe59a2c08061e3fadab Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-17T06:27:10Z [maven-release-plugin] prepare for next development iteration commit df0a40ccfe4b18d5ad25b21fbcf0d2355aa37379 Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-24T18:34:25Z Bumping versions in branch-0.8 commit d5a8dbfb2495c42f609960c28915c30fbe5541a6 Author: Reynold Xin <reyno...@gmail.com> Date: 2013-09-22T22:06:48Z Merge pull request #928 from jerryshao/fairscheduler-refactor Refactor FairSchedulableBuilder (cherry picked from commit 834686b108ce31cbee531d89de6c6e80913448f4) Signed-off-by: Reynold Xin <r...@apache.org> commit f3c60c9c0ce1f0c94174ecb903519b5fc4c696cd Author: Reynold Xin <reyno...@gmail.com> Date: 2013-09-22T05:43:34Z Merge pull request #941 from ilikerps/master Add "org.apache." prefix to packages in spark-class (cherry picked from commit f06f2da2cb2fd6bd25b57e5f5fd6f8e5d37ab1a3) Signed-off-by: Reynold Xin <r...@apache.org> commit a186792af072064bdaa65b94d80e394ec911302c Author: Reynold Xin <reyno...@gmail.com> Date: 2013-09-22T06:04:42Z Merge pull request #937 from jerryshao/localProperties-fix Fix PR926 local properties issues in Spark Streaming like scenarios (cherry picked from commit a2ea069a5f2ed83268109deade456dc0fc9b79ee) Signed-off-by: Reynold Xin <r...@apache.org> commit b1d0832278a39ad4612385f96bf5e05021b84778 Author: Reynold Xin <reyno...@gmail.com> Date: 2013-09-23T21:02:21Z Merge remote-tracking branch 'pr/12' Fix spacing so java.io.tmpdir doesn't run on with SPARK_JAVA_OPTS (cherry picked from commit 7220e8f90b7d0bf5d5e3e4ad906a6b257ca75c53) Signed-off-by: Reynold Xin <r...@apache.org> commit 240ca93539b015cb2556ec80e3cc21afd8ed368f Author: Patrick Wendell <pwend...@gmail.com> Date: 2013-09-26T15:01:04Z Merge pull request #9 from rxin/limit Smarter take/limit implementation. (cherry picked from commit 6566a19b38204d754c5e8f821b4276616e90abc6) Signed-off-by: Reynold Xin <r...@apache.org> commit 8cbc96bd49af07953ab921546e56b4e04b8b760e Author: Reynold Xin <reyno...@gmail.com> Date: 2013-09-26T18:27:34Z Merge pull request #7 from wannabeast/memorystore-fixes some minor fixes to MemoryStore This is a repeat of #5, moved to its own branch in my repo. This makes all updates to on ; it skips on synchronizing the reads where it can get away with it. (cherry picked from commit 560ee5c9bba3f9fde380c831d0c6701343b2fecf) Signed-off-by: Reynold Xin <r...@apache.org> commit 5a628449bdf54827781764a79eb3a9d442445671 Author: Reynold Xin <reyno...@gmail.com> Date: 2013-09-23T18:55:02Z Merge branch 'master' of github.com:markhamstra/incubator-spark (cherry picked from commit ff540a015b970f722ae6aeba7dece481f9ad863e) Signed-off-by: Reynold Xin <r...@apache.org> commit 976fe60f7609d7b905a34f18743efabd966407f0 Author: Reynold Xin <r...@apache.org> Date: 2013-09-26T21:11:54Z Merge pull request #14 from kayousterhout/untangle_scheduler Improved organization of scheduling packages. This commit does not change any code -- only file organization. Please let me know if there was some masterminded strategy behind the existing organization that I failed to understand! There are two components of this change: (1) Moving files out of the cluster package, and down a level to the scheduling package. These files are all used by the local scheduler in addition to the cluster scheduler(s), so should not be in the cluster package. As a result of this change, none of the files in the local package reference files in the cluster package. (2) Moving the mesos package to within the cluster package. The mesos scheduling code is for a cluster, and represents a specific case of cluster scheduling (the Mesos-related classes often subclass cluster scheduling classes). Thus, the most logical place for it seems to be within the cluster package. The one thing about the scheduling code that seems a little funny to me is the naming of the SchedulerBackends. The StandaloneSchedulerBackend is not just for Standalone mode, but instead is used by Mesos coarse grained mode and Yarn, and the backend that *is* just for Standalone mode is instead called SparkDeploySchedulerBackend. I didn't change this because I wasn't sure if there was a reason for this naming that I'm just not aware of. (cherry picked from commit 70a0b993d4f1a72a1b38f9a17fcf269acc1b394f) Signed-off-by: Reynold Xin <r...@apache.org> commit 35bcf3250186de71a4f051cc30c71e0b45f464c5 Author: Reynold Xin <r...@apache.org> Date: 2013-09-26T20:48:20Z Merge pull request #930 from holdenk/master Add mapPartitionsWithIndex (cherry picked from commit c514cd15879d510406712b1cebdaf0c0db9151c9) Signed-off-by: Reynold Xin <r...@apache.org> commit 3cb9040f96fc5516892b9fb76db505491afc3091 Author: Reynold Xin <r...@apache.org> Date: 2013-09-26T21:28:55Z Merge pull request #17 from rxin/optimize Remove -optimize flag (cherry picked from commit 714fdabd99bbff3a0cdec5dcf06b021a3a3f2da8) Signed-off-by: Reynold Xin <r...@apache.org> commit 22660f63709d760f0e5637c0230a974350ce891b Author: Sundeep Narravula <sunde...@yahoo-inc.com> Date: 2013-10-04T00:41:59Z Resolving package conflicts with hadoop 0.23.9 commit 16caecec8cd8a8ef178bc32ef352e9ccd818c45b Author: Sundeep Narravula <sunde...@yahoo-inc.com> Date: 2013-10-04T05:31:11Z Fix UISuite test to handle situations where DEFAULT_PORT is busy on the test machine commit b33ef987e8fc558d5fb7ad8e7960616301230bf9 Author: Sundeep Narravula <sunde...@yahoo-inc.com> Date: 2013-10-04T21:23:46Z Indentation fix commit 023e3fdf008b3194a36985a07923df9aaf64e520 Author: Reynold Xin <r...@apache.org> Date: 2013-10-07T17:47:45Z 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. ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---