Skip to content

Conversation

@aarondav
Copy link
Contributor

@aarondav aarondav commented Jun 1, 2014

The change was previously committed only to branch-1.0 as part of a34e6fd

The change was previously committed only to branch-1.0 as part of
apache@a34e6fd
@AmplabJenkins
Copy link

Merged build triggered.

@AmplabJenkins
Copy link

Merged build started.

@pwendell
Copy link
Contributor

pwendell commented Jun 1, 2014

LGTM !

@AmplabJenkins
Copy link

Merged build finished. All automated tests passed.

@AmplabJenkins
Copy link

All automated tests passed.
Refer to this link for build results: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/15331/

@rxin
Copy link
Contributor

rxin commented Jun 2, 2014

Do you mind updating this? I just ruined your day with my pep8 change.

@pwendell
Copy link
Contributor

pwendell commented Jun 4, 2014

I went ahead and merged this and manually resolved the conflict.

@asfgit asfgit closed this in ab7c62d Jun 4, 2014
pdeyhim pushed a commit to pdeyhim/spark-1 that referenced this pull request Jun 25, 2014
The change was previously committed only to branch-1.0 as part of apache@a34e6fd

Author: Aaron Davidson <[email protected]>

This patch had conflicts when merged, resolved by
Committer: Patrick Wendell <[email protected]>

Closes apache#938 from aarondav/sparkec2 and squashes the following commits:

067cc31 [Aaron Davidson] Update spark-ec2 scripts for 1.0.0 on master
xiliu82 pushed a commit to xiliu82/spark that referenced this pull request Sep 4, 2014
The change was previously committed only to branch-1.0 as part of apache@a34e6fd

Author: Aaron Davidson <[email protected]>

This patch had conflicts when merged, resolved by
Committer: Patrick Wendell <[email protected]>

Closes apache#938 from aarondav/sparkec2 and squashes the following commits:

067cc31 [Aaron Davidson] Update spark-ec2 scripts for 1.0.0 on master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants