Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c5f5cbf4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c5f5cbf4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c5f5cbf4 Branch: refs/heads/master Commit: c5f5cbf478dae8ecd1d6d15a137fcdabdb1e2e8e Parents: 6cb59f6 0529464 Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Thu Jan 9 15:10:00 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Thu Jan 9 15:10:00 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 9 ++ .../config/CartridgeAgentConfiguration.java | 2 +- .../instance/notifier/InstanceCleanupEvent.java | 7 +- tools/stratos-installer/resources/userstore.sql | 108 ++++++++++++++++--- 4 files changed, 106 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
