Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SPARK-5805 Fixed the type error in documentation. #4596

Closed
wants to merge 1 commit into from

Conversation

emres
Copy link
Contributor

@emres emres commented Feb 13, 2015

Fixes SPARK-5805 : Fix the type error in the final example given in MLlib - Clustering documentation.

@AmplabJenkins
Copy link

Can one of the admins verify this patch?

@mengxr
Copy link
Contributor

mengxr commented Feb 13, 2015

LGTM.

asfgit pushed a commit that referenced this pull request Feb 13, 2015
Fixes SPARK-5805 : Fix the type error in the final example given in MLlib - Clustering documentation.

Author: Emre Sevinç <[email protected]>

Closes #4596 from emres/SPARK-5805 and squashes the following commits:

1029f66 [Emre Sevinç] SPARK-5805 Fixed the type error in documentation.

(cherry picked from commit 9f31db0)
Signed-off-by: Xiangrui Meng <[email protected]>
@asfgit asfgit closed this in 9f31db0 Feb 13, 2015
@mengxr
Copy link
Contributor

mengxr commented Feb 13, 2015

Merged into master and branch-1.3 (skipped Jenkins because this only contains doc changes.)

@emres This PR contains changes to GMM. It won't be able to merge into branch-1.2. Could you send a patch to branch-1.2? Thanks!

@emres
Copy link
Contributor Author

emres commented Feb 13, 2015

I would gladly do that, but I'm not sure exactly how to send a patch to a
particular branch, e.g. branch-1.2

What I have done was simply to fork the original Spark repository, create a
new branch in my forked repository with the same name as JIRA issue number,
commit my change and just send a pull request via Github.

How can I send a patch to branch-1.2 after having done what I described
above?

Emre

On Fri, Feb 13, 2015 at 9:40 PM, Xiangrui Meng [email protected]
wrote:

Merged into master and branch-1.3 (skipped Jenkins because this only
contains doc changes.)

@emres https://github.com/emres This PR contains changes to GMM. It
won't be able to merge into branch-1.2. Could you send a patch to
branch-1.2? Thanks!


Reply to this email directly or view it on GitHub
#4596 (comment).

Emre Sevinc

@srowen
Copy link
Member

srowen commented Feb 14, 2015

@emres basically you would check out branch-1.2, make a new branch from there, make your change again (minus the change to GMM which won't exist), and then simply submit that PR like this one. You can note it's a backport.

@srowen
Copy link
Member

srowen commented Feb 14, 2015

Ah, BTW, the reason you had these merge conflicts is because your change actually modified a lot of lines trailing whitespace. Ideally we would have undone those and just committed your one-liner. Anyway, I can merge the new PR.

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