Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/usergrid into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/37c482c5 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/37c482c5 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/37c482c5 Branch: refs/heads/master Commit: 37c482c5ee4175706a05034e8e3252d03f0b24f7 Parents: c4f72ef 9c4b524 Author: Dave Johnson <[email protected]> Authored: Wed Jun 29 08:45:25 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Wed Jun 29 08:45:25 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(-) ----------------------------------------------------------------------
