Merge branch 'release-2.1.1' into usergrid-1268-akka-211
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/639b421c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/639b421c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/639b421c Branch: refs/heads/datastax-cass-driver Commit: 639b421cdaa585f877ad1c50e62fa36c52384762 Parents: ca9383b 37c482c Author: Dave Johnson <snoopd...@apache.org> Authored: Wed Jun 29 08:45:45 2016 -0400 Committer: Dave Johnson <snoopd...@apache.org> Committed: Wed Jun 29 08:45:45 2016 -0400 ---------------------------------------------------------------------- .../corepersistence/CpRelationManager.java | 40 ++++++++--------- .../asyncevents/EventBuilderImpl.java | 7 ++- .../UniqueValueSerializationStrategyImpl.java | 11 ++--- .../index/impl/EsEntityIndexImpl.java | 47 +++++++------------- 4 files changed, 43 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/639b421c/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java ----------------------------------------------------------------------
