You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@usergrid.apache.org by ayesha12 <gi...@git.apache.org> on 2016/08/01 21:36:29 UTC

[GitHub] usergrid pull request #554: Resolve merge conflicts for George's pull reques...

GitHub user ayesha12 opened a pull request:

    https://github.com/apache/usergrid/pull/554

    Resolve merge conflicts for George's pull request https://github.com/\u2026

    \u2026apache/usergrid/pull/520
    
    Jira :
    https://issues.apache.org/jira/browse/USERGRID-1120
    https://issues.apache.org/jira/browse/USERGRID-1116
    https://issues.apache.org/jira/browse/USERGRID-1118

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/ayesha12/usergrid EventFixes

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/usergrid/pull/554.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 #554
    
----
commit dd13f0b00cdc1a84153a582028b9aac13f98f74b
Author: Ayesha Dastagiri <ay...@gmail.com>
Date:   2016-08-01T21:34:57Z

    Resolve merge conflicts for George's pull request https://github.com/apache/usergrid/pull/520
    Jira :
    https://issues.apache.org/jira/browse/USERGRID-1120
    https://issues.apache.org/jira/browse/USERGRID-1116
    https://issues.apache.org/jira/browse/USERGRID-1118

----


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] usergrid pull request #554: Resolve merge conflicts for George's pull reques...

Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:

    https://github.com/apache/usergrid/pull/554


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---