GitHub user wangmiao1981 opened a pull request: https://github.com/apache/spark/pull/11380
merge code ## What changes were proposed in this pull request? (Please fill in changes proposed in this fix) ## How was this patch tested? (Please explain how this patch was tested. E.g. unit tests, integration tests, manual tests) (If this patch involves UI changes, please attach a screenshot; otherwise, remove this) You can merge this pull request into a Git repository by running: $ git pull https://github.com/wangmiao1981/spark master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/spark/pull/11380.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 #11380 ---- commit bb04f6fb11f605daff9f7971f70b477d7f490af9 Author: Miao Wang <wangmiao1...@users.noreply.github.com> Date: 2015-10-09T22:28:33Z Merge pull request #1 from apache/master Update commit df949c50b2d0a771690ecbc23c5a2691ea155233 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2015-10-16T17:19:40Z Merge remote-tracking branch 'upstream/master' Get new spark commit 7fc01ac3047062d6d3a0db5d1ba63045f8fec3fa Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2015-10-21T18:07:19Z Merge https://github.com/apache/spark commit 7fd0842050383a57148e3953bd38e204d1d28c5d Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2015-10-21T18:09:00Z fix the merge issue commit f8260b3fe1497d0ced2c8c8390cf3ca1344fed12 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2015-10-22T21:18:14Z Merge remote-tracking branch 'upstream/master' commit f797fb6a262878cbe7cdcf821a4f05444a9cc617 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2015-10-29T18:07:09Z Merge remote-tracking branch 'upstream/master' commit 319a8801ad946929403f22a3814376f9e4631668 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2015-11-10T19:17:59Z Merge remote-tracking branch 'upstream/master' commit 0cde5199113873681937ce797e25b43eae7c0cca Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2015-11-19T19:49:34Z Merge remote-tracking branch 'upstream/master' commit 3db1e259a2621d47d23c21ef4a8a6e8d2aaafbdc Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2015-11-30T18:16:17Z Merge remote-tracking branch 'upstream/master' commit 2b2e455aea12601dc68e5bbe7d88ec87dfe74b7a Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2015-12-07T22:05:19Z Merge remote-tracking branch 'upstream/master' commit 233bc48e6c5b855c42fd5598234f0b2f5f92eea3 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2015-12-14T19:47:18Z Merge remote-tracking branch 'upstream/master' commit 5dc0ab2e84fbd39021e65ca8d0cffbf71251243c Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2015-12-16T19:00:59Z Merge remote-tracking branch 'upstream/master' commit f94698f5feef14bff933681d53848cc42f56a4b6 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2015-12-18T18:42:13Z Merge remote-tracking branch 'upstream/master' commit 2efb49afb7f4d154d4511f604e643f34335c1c78 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2016-01-04T19:29:15Z Merge remote-tracking branch 'upstream/master' commit 8bba263ad3e750bc37186cd8665a4f5ff0028a03 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2016-01-06T19:42:44Z Merge remote-tracking branch 'upstream/master' commit 67089d17c247dc3b6612d55bbaa01c3ac6ac5cd5 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2016-01-06T22:01:44Z Merge remote-tracking branch 'upstream/master' commit e88ee81a41e6d50af130785936c0017c3c401e36 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2016-01-19T18:22:53Z Merge remote-tracking branch 'upstream/master' commit 4359e34dc69b2b8e2d5714fe1c7894a70ad5cb21 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2016-01-26T20:05:25Z Merge remote-tracking branch 'upstream/master' commit ac90a3c4c1233e3c03ad527a9b6ccde3e2636350 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2016-01-29T18:06:52Z Merge remote-tracking branch 'upstream/master' commit 585c63324efc060b9abac7ba8a668840a756b4d2 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2016-02-05T18:38:01Z Merge remote-tracking branch 'upstream/master' commit 7adabdaec46fa39fc61ff3c966a06a36a1350fbc Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2016-02-08T23:20:01Z Merge remote-tracking branch 'upstream/master' commit 388fa5ec8de340fdcb480c60773b9d2d1121e39c Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2016-02-09T18:57:20Z Merge remote-tracking branch 'upstream/master' commit 248b513ee8b31ad45be030eac4fa105f483ea54c Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2016-02-09T19:44:33Z Merge remote-tracking branch 'upstream/master' commit ff193f2d6f7dae6b56e1950839675171d6e46c57 Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2016-02-09T22:06:38Z Merge remote-tracking branch 'upstream/master' commit 2a9af156020f200e4dfbb384d5032060863f468a Author: wm...@hotmail.com <wm...@hotmail.com> Date: 2016-02-25T00:41:39Z Merge remote-tracking branch 'upstream/master' ---- --- 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. --- --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org