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

Implement feature request #1414 - Allow specifying crontrolport #278

Merged
merged 1 commit into from
May 3, 2013

Conversation

kasunchathuranga
Copy link
Contributor

No description provided.

@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================

4.1.0.0 (not yet released)
+ rfe #1414 Allow specifying crontrolport
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo : crontrolport -> controlport

@kasunchathuranga
Copy link
Contributor Author

@ruleant Thanks for the input. I have incorporated the suggested changes.

@ruleant
Copy link
Contributor

ruleant commented May 2, 2013

Sorry for the late reply.
Your code works correctly, I was a bit confused by the 'host' because I was expecting to check for 'controlhost', but the controlhost value is added in the first section (where host is set).

In the mean time, your branch his diverged too much to do the pull request automatically. Can you rebase your branch with phpmyadmin:master again, and push it to github, so that your pull request can be merged?

…port

Set the value of controlport based on the value of controlhost
@kasunchathuranga
Copy link
Contributor Author

@ruleant
I have rebased my feature branch. I guess it does not have conflict anymore.

ruleant added a commit that referenced this pull request May 3, 2013
Implement feature request #1414 - Allow specifying controlport
@ruleant ruleant merged commit 22c98b6 into phpmyadmin:master May 3, 2013
@ruleant
Copy link
Contributor

ruleant commented May 3, 2013

merged, thanks for submitting

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.

2 participants