You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/12/11 00:52:30 UTC
[50/50] [abbrv] git commit: updated refs/heads/ui-restyle to 326b3a6
Merge branch 'master' into ui-restyle
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/326b3a60
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/326b3a60
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/326b3a60
Branch: refs/heads/ui-restyle
Commit: 326b3a607fe383d02b2c98d749baae5a24034e01
Parents: 0fb6698 9ea949e
Author: Brian Federle <br...@citrix.com>
Authored: Tue Dec 10 15:51:24 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Dec 10 15:51:24 2013 -0800
----------------------------------------------------------------------
api/src/com/cloud/network/NetworkModel.java | 2 +
api/src/com/cloud/network/OvsProvider.java | 16 +
.../com/cloud/network/as/AutoScaleCounter.java | 2 +
.../com/cloud/network/as/AutoScalePolicy.java | 4 +
.../com/cloud/network/as/AutoScaleVmGroup.java | 4 +
api/src/com/cloud/network/as/Counter.java | 6 +-
.../cloud/region/ha/GlobalLoadBalancerRule.java | 6 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../admin/router/ConfigureOvsElementCmd.java | 16 +
.../admin/router/ListOvsElementsCmd.java | 16 +
.../gslb/CreateGlobalLoadBalancerRuleCmd.java | 2 +-
.../api/response/OvsProviderResponse.java | 16 +
client/tomcatconf/commands.properties.in | 4 -
.../agent/api/PerformanceMonitorAnswer.java | 27 ++
.../agent/api/PerformanceMonitorCommand.java | 46 ++
.../src/com/cloud/capacity/CapacityManager.java | 11 +
.../cloud/network/rules/FirewallManager.java | 2 +-
.../orchestration/NetworkOrchestrator.java | 39 +-
.../spring-engine-schema-core-daos-context.xml | 1 +
.../src/com/cloud/capacity/dao/CapacityDao.java | 15 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 56 ++-
.../com/cloud/network/as/AutoScalePolicyVO.java | 19 +-
.../cloud/network/as/AutoScaleVmGroupVO.java | 22 +-
.../network/as/AutoScaleVmGroupVmMapVO.java | 62 +++
.../as/dao/AutoScalePolicyConditionMapDao.java | 4 +-
.../dao/AutoScalePolicyConditionMapDaoImpl.java | 12 +-
.../as/dao/AutoScaleVmGroupVmMapDao.java | 31 ++
.../as/dao/AutoScaleVmGroupVmMapDaoImpl.java | 56 +++
.../dao/ExternalLoadBalancerDeviceDaoImpl.java | 2 +
.../dao/ExternalLoadBalancerDeviceVO.java | 11 +
.../com/cloud/network/dao/OvsProviderDao.java | 16 +
.../cloud/network/dao/OvsProviderDaoImpl.java | 16 +
.../cloud/network/element/OvsProviderVO.java | 16 +
.../xen/resource/CitrixResourceBase.java | 83 +++-
.../element/F5ExternalLoadBalancerElement.java | 6 +-
.../JuniperSRXExternalFirewallElement.java | 8 +
.../network/resource/JuniperSrxResource.java | 54 ++-
.../commands/AddNetscalerLoadBalancerCmd.java | 22 +-
.../response/NetscalerLoadBalancerResponse.java | 8 +
.../cloud/network/element/NetscalerElement.java | 8 +-
.../network/element/OvsElementService.java | 16 +
.../api/commands/AddExternalFirewallCmd.java | 115 -----
.../api/commands/DeleteExternalFirewallCmd.java | 89 ----
.../api/commands/ListExternalFirewallsCmd.java | 89 ----
.../PaloAltoExternalFirewallElement.java | 76 ---
.../element/PaloAltoFirewallElementService.java | 23 -
.../network/resource/PaloAltoResource.java | 165 ++++++-
.../resource/MockablePaloAltoResource.java | 17 +-
scripts/vm/hypervisor/xenserver/cloudlog | 12 +
scripts/vm/hypervisor/xenserver/ovs-pvlan | 6 +-
scripts/vm/hypervisor/xenserver/ovstunnel | 6 +-
scripts/vm/hypervisor/xenserver/perfmon.py | 261 +++++++++++
scripts/vm/hypervisor/xenserver/s3xen | 6 +-
scripts/vm/hypervisor/xenserver/storagePlugin | 10 +-
scripts/vm/hypervisor/xenserver/swiftxen | 12 +-
scripts/vm/hypervisor/xenserver/vmops | 236 +++++-----
scripts/vm/hypervisor/xenserver/vmopsSnapshot | 108 ++---
scripts/vm/hypervisor/xenserver/vmopspremium | 16 +-
scripts/vm/hypervisor/xenserver/xcposs/patch | 1 +
scripts/vm/hypervisor/xenserver/xcpserver/patch | 1 +
.../vm/hypervisor/xenserver/xenserver56/patch | 1 +
.../hypervisor/xenserver/xenserver56fp1/patch | 2 +-
.../vm/hypervisor/xenserver/xenserver60/patch | 1 +
.../com/cloud/capacity/CapacityManagerImpl.java | 48 ++
server/src/com/cloud/configuration/Config.java | 2 +
.../configuration/ConfigurationManagerImpl.java | 4 +-
.../deploy/DeploymentPlanningManagerImpl.java | 22 +-
.../ExternalLoadBalancerDeviceManager.java | 2 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 6 +-
.../src/com/cloud/network/NetworkModelImpl.java | 13 +
.../com/cloud/network/as/AutoScaleManager.java | 4 +
.../cloud/network/as/AutoScaleManagerImpl.java | 312 ++++++++++++-
.../network/element/VirtualRouterElement.java | 29 +-
.../network/firewall/FirewallManagerImpl.java | 8 +-
.../lb/LoadBalancingRulesManagerImpl.java | 3 +-
server/src/com/cloud/server/StatsCollector.java | 459 ++++++++++++++++---
server/src/com/cloud/vm/UserVmManagerImpl.java | 45 +-
.../cloud/network/MockFirewallManagerImpl.java | 2 +-
.../com/cloud/network/MockNetworkModelImpl.java | 5 +
.../com/cloud/vpc/MockNetworkModelImpl.java | 5 +
setup/db/create-schema.sql | 1 +
setup/db/db/schema-40to410.sql | 14 +
setup/db/db/schema-421to430.sql | 9 +
.../debian/vpn/opt/cloud/bin/vpn_l2tp.sh | 28 +-
test/integration/component/test_vpc_network.py | 5 -
tools/marvin/marvin/TestCaseExecuteEngine.py | 102 -----
tools/marvin/marvin/configGenerator.py | 5 -
tools/marvin/marvin/deployAndRun.py | 191 +++++---
tools/marvin/marvin/integration/lib/base.py | 6 +-
tools/marvin/marvin/marvinInit.py | 22 +-
tools/marvin/marvin/marvinPlugin.py | 6 +-
tools/marvin/marvin/tcExecuteEngine.py | 71 +++
ui/scripts/cloudStack.js | 10 +-
ui/scripts/instances.js | 4 +-
ui/scripts/sharedFunctions.js | 2 +-
ui/scripts/storage.js | 9 +-
ui/scripts/system.js | 70 +--
ui/scripts/ui/widgets/listView.js | 2 +-
ui/scripts/zoneWizard.js | 4 +-
99 files changed, 2531 insertions(+), 1016 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/326b3a60/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/326b3a60/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------