Github user pwendell commented on the pull request: https://github.com/apache/spark/pull/270#issuecomment-46804399 This was actually a pretty tough merge since we changed the spacing around a lot in `spark_ec2` recently. I went ahead and manually dealt with the merge. I also made two minor changes on merge.
--- 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. ---