GitHub user GERey opened a pull request:

    https://github.com/apache/incubator-usergrid/pull/94

    Two dot o events

    Removed task executor 

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

    $ git pull https://github.com/GERey/incubator-usergrid two-dot-o-events

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

    https://github.com/apache/incubator-usergrid/pull/94.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 #94
    
----
commit a49b444961c0fc498b2bee0f396c8ca56b199a31
Author: grey <[email protected]>
Date:   2014-11-04T20:12:24Z

    Removed queue from NamedTask Executor and made it do one event at a time. 
Added Rejected tests to Entity Events.

commit e759a7980c0b75cca2b4bcc31fa6d920da97db81
Author: grey <[email protected]>
Date:   2014-11-04T23:33:38Z

    Merge branch 'two-dot-o' of 
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-events
    
    # By Dave Johnson
    # Via Dave Johnson
    * 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
      Add new ignore_error argument to /status end-point, which defaults to 
true and, also added Index health check to the /org/app/status end-point.
      There is now a new option on the /status end-point. If you specify 
"ignore_errors=false" the the /status end-point will return an HTTP 500 error 
if there is a problem connecting to Cassandra or of the query index is status 
RED for the management app.
      Oops
      Set shard and replica size at Index creation time and not client creation 
time.
    
    Conflicts:
        
stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
        
stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java

commit 3294f00928c5b066caa5bd84dd1aec2d563c3468
Author: grey <[email protected]>
Date:   2014-11-04T23:35:25Z

    Removed task executor from tests to separate concerns.

commit 216e0505b0b3d1b52c18043554f8b365ae2c38ee
Author: grey <[email protected]>
Date:   2014-11-04T23:52:43Z

    Merge branch 'two-dot-o-events' of 
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-events
    
    # By Dave Johnson
    # Via Dave Johnson
    * 'two-dot-o-events' of 
https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
      Fixes to StaleEntityCleapupTest, which is looking good now, also some 
import cleanups.
      test fixes
    
    Conflicts:
        
stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
        
stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java

----


---
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 [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to