Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into 2.1-release
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/61dd5595 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/61dd5595 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/61dd5595 Branch: refs/heads/USERGRID-933 Commit: 61dd5595a820ad5120e99523414050673e3d2cc4 Parents: fad32aa 9294af7 Author: Shawn Feldman <sfeld...@apache.org> Authored: Thu Sep 17 11:54:17 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Thu Sep 17 11:54:17 2015 -0600 ---------------------------------------------------------------------- .../management/AppInfoMigrationPlugin.java | 234 +++++++++---------- 1 file changed, 116 insertions(+), 118 deletions(-) ----------------------------------------------------------------------
