You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@usergrid.apache.org by to...@apache.org on 2015/04/13 19:45:30 UTC

[05/50] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev

Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/29f231b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/29f231b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/29f231b7

Branch: refs/heads/USERGRID-536
Commit: 29f231b731514fd38d4cf0a8bbe4a045c9c8f06f
Parents: 4cd2e94 09734fa
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Apr 3 08:26:04 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Apr 3 08:26:04 2015 -0400

----------------------------------------------------------------------
 .../corepersistence/CpEntityManagerFactory.java |  8 +++--
 .../org/apache/usergrid/CoreITSetupImpl.java    |  9 +++++-
 .../cassandra/ApplicationCreatorImpl.java       | 12 ++++----
 .../apns/FailedConnectionListener.java          | 31 ++++++++++----------
 .../org/apache/usergrid/ServiceITSetup.java     |  2 ++
 .../org/apache/usergrid/ServiceITSetupImpl.java | 11 +++++--
 .../migration/AppInfoMigrationPluginTest.java   |  7 +++--
 .../apache/usergrid/management/EmailFlowIT.java |  3 +-
 .../cassandra/ApplicationCreatorIT.java         | 10 +++++--
 9 files changed, 61 insertions(+), 32 deletions(-)
----------------------------------------------------------------------