[
https://issues.apache.org/jira/browse/USERGRID-1120?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15402870#comment-15402870
]
ASF GitHub Bot commented on USERGRID-1120:
------------------------------------------
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/…
…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
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 <[email protected]>
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
----
> Fix CounterIT.testIncrementAndDecrement() test
> ----------------------------------------------
>
> Key: USERGRID-1120
> URL: https://issues.apache.org/jira/browse/USERGRID-1120
> Project: Usergrid
> Issue Type: Story
> Components: Stack
> Affects Versions: 2.1.1, 2.1.0
> Reporter: David Johnson
> Assignee: George Reyes
> Fix For: 2.2.0
>
>
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
