Merge branch 'two-dot-o' into USERGRID-509
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/535003c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/535003c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/535003c0 Branch: refs/heads/two-dot-o-dev Commit: 535003c0945295a045d72f17d75bf4236a5f9820 Parents: 72da01d d20267b Author: Todd Nine <[email protected]> Authored: Tue Mar 31 16:14:20 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Tue Mar 31 16:14:20 2015 -0600 ---------------------------------------------------------------------- .../corepersistence/results/ElasticSearchQueryExecutor.java | 5 +++++ .../rest/management/organizations/AdminEmailEncodingIT.java | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/535003c0/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/ElasticSearchQueryExecutor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/535003c0/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java ----------------------------------------------------------------------
