You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/27 23:01:31 UTC
[9/50] [abbrv] git commit: Merge branch 'master' into vpc
Merge branch 'master' into vpc
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineGuru.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a39fd612
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a39fd612
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a39fd612
Branch: refs/heads/vpc
Commit: a39fd61249e44b9f247e1821ddcc5e6479ed526a
Parents: 00af517 468f272
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Fri Jul 27 13:47:46 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jul 27 13:47:46 2012 -0700
----------------------------------------------------------------------
.../com/cloud/agent/manager/MockVmManagerImpl.java | 4 +-
.../com/cloud/resource/AgentRoutingResource.java | 4 +-
.../distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in | 157 +++++-----
.../ubuntu/SYSCONFDIR/init/cloud-cleanup.conf | 32 --
.../resource/computing/FakeComputingResource.java | 11 +-
.../agent/resource/computing/KVMHAChecker.java | 2 +-
.../computing/LibvirtComputingResource.java | 83 ++++--
.../agent/resource/computing/LibvirtSecretDef.java | 106 ++++++
.../resource/computing/LibvirtStoragePoolDef.java | 80 +++++-
.../computing/LibvirtStoragePoolXMLParser.java | 35 ++-
.../agent/resource/computing/LibvirtVMDef.java | 66 ++++-
.../com/cloud/agent/storage/KVMPhysicalDisk.java | 16 +
.../com/cloud/agent/storage/KVMStoragePool.java | 10 +
.../cloud/agent/storage/KVMStoragePoolManager.java | 21 +-
.../cloud/agent/storage/LibvirtStorageAdaptor.java | 254 +++++++++++++--
.../cloud/agent/storage/LibvirtStoragePool.java | 50 +++
.../com/cloud/agent/storage/StorageAdaptor.java | 4 +-
api/src/com/cloud/agent/api/RebootAnswer.java | 33 +--
api/src/com/cloud/agent/api/StopAnswer.java | 8 +-
api/src/com/cloud/agent/api/StopCommand.java | 10 -
api/src/com/cloud/agent/api/to/StorageFilerTO.java | 6 +
.../cloud/api/commands/CreateFirewallRuleCmd.java | 2 +-
api/src/com/cloud/storage/Storage.java | 1 +
api/src/com/cloud/storage/StoragePool.java | 5 +
client/tomcatconf/components.xml.in | 2 +-
.../com/cloud/network/resource/XTrustProvider.java | 16 -
core/src/com/cloud/storage/StoragePoolVO.java | 22 ++
debian/changelog | 6 +
debian/cloud-agent.install | 1 -
debian/cloud-usage.install | 1 -
debian/control | 28 +-
.../user-concentrated-pod/build.xml | 2 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 10 +-
.../hypervisor/vmware/resource/VmwareResource.java | 52 ++--
.../xen/resource/CitrixResourceBase.java | 44 +--
.../network/lb/ElasticLoadBalancerManagerImpl.java | 5 +
project_admin/templates/committerAnnounce.txt | 5 +
scripts/vm/hypervisor/kvm/kvmheartbeat.sh | 12 +-
.../com/cloud/baremetal/BareMetalResourceBase.java | 6 +-
.../AgentBasedConsoleProxyManager.java | 4 +
.../consoleproxy/ConsoleProxyManagerImpl.java | 4 +
server/src/com/cloud/deploy/FirstFitPlanner.java | 43 +++-
.../src/com/cloud/network/NetworkManagerImpl.java | 1 +
.../router/VirtualNetworkApplianceManagerImpl.java | 126 ++++++--
.../com/cloud/network/rules/RulesManagerImpl.java | 4 +-
server/src/com/cloud/storage/StorageManager.java | 4 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 108 ++++++-
.../allocator/AbstractStoragePoolAllocator.java | 77 +----
.../allocator/FirstFitStoragePoolAllocator.java | 13 +
.../src/com/cloud/storage/dao/VMTemplateDao.java | 1 +
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 74 +++-
.../secondary/SecondaryStorageManagerImpl.java | 5 +
.../storage/snapshot/SnapshotManagerImpl.java | 8 +
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 13 +-
.../src/com/cloud/upgrade/dao/Upgrade302to303.java | 11 -
.../src/com/cloud/upgrade/dao/Upgrade303to40.java | 67 ++++
server/src/com/cloud/vm/UserVmManagerImpl.java | 4 +
server/src/com/cloud/vm/VirtualMachineGuru.java | 8 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 9 +-
setup/db/create-schema.sql | 1 +
setup/db/db/schema-303to40.sql | 63 ++++
tools/devcloud/README | 6 +
tools/devcloud/puppet/README | 12 +
.../puppet/puppet-devcloudinitial/Modulefile | 8 +
.../puppet/puppet-devcloudinitial/files/grub | 34 ++
.../puppet/puppet-devcloudinitial/files/interfaces | 16 +
.../puppet-devcloudinitial/files/network.conf | 1 +
.../puppet-devcloudinitial/files/xen-defaults | 1 +
.../puppet/puppet-devcloudinitial/files/xend | 171 ++++++++++
.../devcloud/puppet/puppet-devcloudinitial/init.pp | 1 +
.../puppet-devcloudinitial/manifests/init.pp | 101 ++++++
tools/devcloud/ubuntu_install/README | 1 +
tools/devcloud/vagrant/Vagrantfile | 72 ++++
tools/devcloud/vagrant/vagrant.pp | 43 +++
ui/css/cloudstack3.css | 6 +
ui/index.jsp | 20 +-
ui/scripts/projects.js | 57 +++-
ui/scripts/sharedFunctions.js | 25 ++
ui/scripts/system.js | 66 ++++-
ui/scripts/templates.js | 70 ++++-
ui/scripts/ui-custom/instanceWizard.js | 39 ++-
ui/scripts/ui-custom/login.js | 30 ++-
ui/scripts/ui-custom/projects.js | 9 +-
ui/scripts/ui-custom/zoneWizard.js | 5 +
ui/scripts/ui/core.js | 37 ++-
ui/scripts/ui/dialog.js | 124 ++++----
ui/scripts/ui/widgets/cloudBrowser.js | 3 +
ui/scripts/ui/widgets/detailView.js | 55 +++-
ui/scripts/ui/widgets/multiEdit.js | 6 +
wscript_build | 57 +++-
90 files changed, 2312 insertions(+), 624 deletions(-)
----------------------------------------------------------------------