Github user imesh commented on the pull request: https://github.com/apache/stratos/pull/373#issuecomment-113876446 Hi Pubudu, the merge process failed with the following error, can you please try to update your local branch with the remote and update this pull request? Auto-merging components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java CONFLICT (content): Merge conflict in components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java Failed to merge in the changes. Patch failed at 0005 Fix Exception handling in addCartridgeGroup method Thanks
--- 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. ---