GitHub user dinithis opened a pull request: https://github.com/apache/stratos/pull/209
Resolving merge conflicts in Network Partition management commands Resolving merge conflicts in Network Partition management commands You can merge this pull request into a Git repository by running: $ git pull https://github.com/dinithis/stratos master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/stratos/pull/209.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 #209 ---- commit 69a86ba6a253be4d7e04f71eec2c451ef3591e8f Author: Dinithi <dinit...@wso2.com> Date: 2015-02-06T04:18:26Z Resolving merge conflicts in Network Partition management commands ---- --- 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. ---