Merge branch 'master' into gslb-wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/dc25e9f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/dc25e9f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/dc25e9f2 Branch: refs/heads/gslb-wip Commit: dc25e9f2bb79111c3df71e7220a88b7eb8b1485f Parents: 45110b6 217ebf2 Author: Murali Reddy <[email protected]> Authored: Tue Mar 19 17:21:59 2013 +0530 Committer: Murali Reddy <[email protected]> Committed: Tue Mar 19 17:21:59 2013 +0530 ---------------------------------------------------------------------- .../api/command/admin/region/RemoveRegionCmd.java | 2 +- client/pom.xml | 5 + client/tomcatconf/log4j-cloud.xml.in | 25 ++ core/src/com/cloud/alert/AlertManager.java | 41 ++-- plugins/alert-handlers/snmp-alerts/pom.xml | 45 +++ .../cloudstack/alert/snmp/CsSnmpConstants.java | 45 +++ .../alert/snmp/SnmpEnhancedPatternLayout.java | 107 ++++++++ .../apache/cloudstack/alert/snmp/SnmpHelper.java | 106 ++++++++ .../cloudstack/alert/snmp/SnmpTrapAppender.java | 207 +++++++++++++++ .../apache/cloudstack/alert/snmp/SnmpTrapInfo.java | 90 +++++++ .../alert/snmp/SnmpEnhancedPatternLayoutTest.java | 90 +++++++ .../alert/snmp/SnmpTrapAppenderTest.java | 86 ++++++ plugins/pom.xml | 1 + server/src/com/cloud/alert/AlertManagerImpl.java | 6 + .../cloud/deploy/HypervisorVmPlannerSelector.java | 8 + .../com/cloud/event/ActionEventInterceptor.java | 15 +- .../com/cloud/server/ConfigurationServerImpl.java | 30 +-- .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 4 + .../ConsoleProxyHttpHandlerHelper.java | 14 +- setup/db/db/schema-40to410.sql | 2 +- tools/cli/cloudmonkey/__init__.py | 4 +- tools/cli/cloudmonkey/cachemaker.py | 3 +- tools/cli/cloudmonkey/cloudmonkey.py | 45 +++- tools/cli/cloudmonkey/config.py | 20 +- tools/cli/setup.py | 34 ++-- ui/scripts/sharedFunctions.js | 36 ++- ui/scripts/system.js | 4 +- ui/scripts/ui-custom/healthCheck.js | 2 +- ui/scripts/zoneWizard.js | 8 +- .../src/com/cloud/usage/UsageAlertManagerImpl.java | 13 +- .../src/com/cloud/utils/component/AdapterBase.java | 4 +- .../utils/component/ComponentMethodProxyCache.java | 90 +++++++ .../utils/component/SpringComponentScanUtils.java | 1 - .../cloud/utils/db/TransactionContextBuilder.java | 14 +- 34 files changed, 1090 insertions(+), 117 deletions(-) ----------------------------------------------------------------------
