Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a4fa0941 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a4fa0941 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a4fa0941 Branch: refs/heads/usergrid-1007-shiro-cache Commit: a4fa0941aa9d2a3878a7f8d47535018af0ee6655 Parents: 5acb42b 61dd559 Author: Dave Johnson <[email protected]> Authored: Thu Sep 17 17:48:22 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Thu Sep 17 17:48:22 2015 -0400 ---------------------------------------------------------------------- .../EsIndexMappingMigrationPlugin.java | 2 +- .../persistence/index/usergrid-mappings.json | 5 - .../management/AppInfoMigrationPlugin.java | 234 +++++++++---------- 3 files changed, 117 insertions(+), 124 deletions(-) ----------------------------------------------------------------------
