You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2015/04/20 13:59:35 UTC
[2/6] git commit: updated refs/heads/master to 4df55f1
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6db212d4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6db212d4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6db212d4
Branch: refs/heads/master
Commit: 6db212d4138a297a716ac3f2a438018e571bcf74
Parents: 9d0cc12 9593221
Author: sailajamada <sa...@citrix.com>
Authored: Fri Apr 17 17:24:37 2015 +0530
Committer: sailajamada <sa...@citrix.com>
Committed: Fri Apr 17 17:24:37 2015 +0530
----------------------------------------------------------------------
.travis.yml | 2 +-
.../user/vmsnapshot/CreateVMSnapshotCmd.java | 2 +-
.../src/com/cloud/agent/api/PlugNicCommand.java | 14 +
core/src/com/cloud/resource/CommandWrapper.java | 3 +-
.../manager/ClusteredAgentManagerImpl.java | 13 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 3 +-
.../com/cloud/upgrade/dao/Upgrade450to451.java | 51 +-
.../allocator/StorageCacheRandomAllocator.java | 20 +-
.../manager/ImageStoreProviderManagerImpl.java | 22 +
.../storage/datastore/DataStoreManagerImpl.java | 7 +-
.../datastore/ImageStoreProviderManager.java | 2 +
plugins/hypervisors/kvm/pom.xml | 2 +-
.../kvm/resource/BridgeVifDriver.java | 4 +-
.../hypervisor/kvm/resource/IvsVifDriver.java | 4 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 4 +-
.../com/cloud/hypervisor/guru/VMwareGuru.java | 12 +-
.../vmware/manager/VmwareManagerImpl.java | 2 +-
.../vmware/resource/VmwareResource.java | 11 +-
.../xenserver/resource/CitrixResourceBase.java | 59 +-
.../xenserver/resource/XenServer56Resource.java | 44 +-
.../XenServer56NetworkUsageCommandWrapper.java | 7 +-
.../src/com/cloud/agent/api/BcfAnswer.java | 6 +-
.../src/com/cloud/agent/api/BcfCommand.java | 14 +-
.../agent/api/CacheBcfTopologyCommand.java | 8 +-
.../agent/api/CreateBcfAttachmentCommand.java | 22 +-
.../cloud/agent/api/CreateBcfRouterCommand.java | 4 +-
.../api/CreateBcfRouterInterfaceCommand.java | 14 +-
.../agent/api/CreateBcfSegmentCommand.java | 16 +-
.../agent/api/CreateBcfStaticNatCommand.java | 14 +-
.../agent/api/DeleteBcfAttachmentCommand.java | 10 +-
.../agent/api/DeleteBcfSegmentCommand.java | 10 +-
.../agent/api/DeleteBcfStaticNatCommand.java | 8 +-
.../agent/api/GetControllerDataAnswer.java | 25 +-
.../agent/api/GetControllerDataCommand.java | 2 -
.../agent/api/GetControllerHostsAnswer.java | 4 +-
.../agent/api/GetControllerHostsCommand.java | 4 +-
.../cloud/agent/api/SyncBcfTopologyCommand.java | 14 +-
.../agent/api/UpdateBcfAttachmentCommand.java | 11 +-
.../cloud/agent/api/UpdateBcfRouterCommand.java | 10 +-
.../api/commands/AddBigSwitchBcfDeviceCmd.java | 25 +-
.../com/cloud/api/commands/BcfConstants.java | 8 +-
.../commands/DeleteBigSwitchBcfDeviceCmd.java | 16 +-
.../commands/ListBigSwitchBcfDevicesCmd.java | 22 +-
.../response/BigSwitchBcfDeviceResponse.java | 16 +-
.../com/cloud/network/BigSwitchBcfDeviceVO.java | 10 +-
.../com/cloud/network/bigswitch/AclData.java | 28 +-
.../cloud/network/bigswitch/AttachmentData.java | 31 +-
.../network/bigswitch/BigSwitchBcfApi.java | 170 +-
.../network/bigswitch/BigSwitchBcfUtils.java | 14 +-
.../network/element/BigSwitchBcfElement.java | 9 +-
.../network/resource/BigSwitchBcfResource.java | 64 +-
.../bigswitch/BigSwitchBcfUtilsTest.java | 93 +
plugins/pom.xml | 27 +-
pom.xml | 1 +
scripts/util/qemu-ivs-ifup | 8 +-
scripts/vm/hypervisor/kvm/kvmheartbeat.sh | 3 +-
.../dispatch/ParamGenericValidationWorker.java | 2 +-
.../deploy/DeploymentPlanningManagerImpl.java | 2 +-
.../cloud/ha/HighAvailabilityManagerImpl.java | 14 +-
.../cloud/server/ConfigurationServerImpl.java | 11 +-
server/src/com/cloud/server/StatsCollector.java | 9 +
.../ConsoleProxyPasswordBasedEncryptor.java | 30 -
.../com/cloud/storage/StorageManagerImpl.java | 13 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 4 +-
.../template/HypervisorTemplateAdapter.java | 13 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 16 +
.../ConsoleProxyPasswordBasedEncryptor.java | 30 -
setup/db/db/schema-442to450.sql | 2 +
setup/dev/advanced.cfg | 6 +
.../debian/config/etc/logrotate.d/apache2 | 2 +-
.../patches/debian/config/etc/logrotate.d/cloud | 1 +
.../debian/config/etc/logrotate.d/conntrackd | 1 +
.../debian/config/etc/logrotate.d/dnsmasq | 1 +
.../patches/debian/config/etc/logrotate.d/ppp | 1 +
systemvm/patches/debian/config/etc/rc.local | 13 +
.../debian/config/opt/cloud/bin/configure.py | 6 +-
.../debian/config/opt/cloud/bin/cs/CsHelper.py | 16 +-
.../component/test_VirtualRouter_alerts.py | 15 +-
test/integration/component/test_accounts.py | 1743 +++++++++---------
.../component/test_shared_networks.py | 79 +-
.../component/test_vpc_vm_life_cycle.py | 15 +-
test/integration/smoke/test_network.py | 18 +-
.../testpaths/testpath_stopped_vm.py | 20 +-
.../testpaths/testpath_storage_migration.py | 3 +-
test/integration/testpaths/testpath_vmlc.py | 22 +-
.../testpaths/testpath_volumelifecycle.py | 7 +-
.../install_systemvm_packages.sh | 24 +-
tools/devcloud4/.gitignore | 4 +
tools/devcloud4/README.md | 101 +
tools/devcloud4/advanced/Berksfile | 27 +
tools/devcloud4/advanced/README.md | 95 +
tools/devcloud4/advanced/Vagrantfile | 115 ++
.../devcloud4/advanced/chef_configuration.json | 24 +
tools/devcloud4/advanced/marvin.cfg | 124 ++
tools/devcloud4/basic/Berksfile | 27 +
tools/devcloud4/basic/README.md | 83 +
tools/devcloud4/basic/Vagrantfile | 81 +
tools/devcloud4/basic/chef_configuration.json | 22 +
tools/devcloud4/basic/marvin.cfg | 110 ++
.../binary-installation-advanced/Berksfile | 26 +
.../binary-installation-advanced/Vagrantfile | 119 ++
.../chef_configuration.json | 37 +
.../binary-installation-advanced/marvin.cfg.erb | 123 ++
.../binary-installation-basic/Berksfile | 26 +
.../binary-installation-basic/Vagrantfile | 83 +
.../chef_configuration.json | 34 +
.../binary-installation-basic/marvin.cfg.erb | 109 ++
.../common/binary-installation/README.md | 0
.../attributes/database_server.rb | 22 +
.../binary-installation/attributes/default.rb | 38 +
.../common/binary-installation/metadata.rb | 42 +
.../recipes/database_server.rb | 24 +
.../binary-installation/recipes/default.rb | 27 +
.../recipes/management_server.rb | 57 +
.../binary-installation/recipes/nfsshares.rb | 48 +
tools/devcloud4/common/configure-network.sh | 37 +
.../common/development-installation/README.md | 0
.../attributes/database_server.rb | 22 +
.../attributes/default.rb | 29 +
.../files/default/cloud-install-sys-tmplt | 288 +++
.../files/default/createtmplt.sh | 239 +++
.../common/development-installation/metadata.rb | 42 +
.../recipes/database_server.rb | 24 +
.../development-installation/recipes/default.rb | 27 +
.../recipes/nfsshares.rb | 48 +
.../recipes/system_templates.rb | 38 +
tools/devcloud4/pom.xml | 112 ++
tools/devcloud4/prefill.sql | 34 +
tools/marvin/marvin/codes.py | 13 +
tools/marvin/marvin/lib/common.py | 144 +-
tools/marvin/marvin/testSetupSuccess.py | 46 +-
tools/pom.xml | 3 +-
ui/scripts/accounts.js | 3 +
ui/scripts/accountsWizard.js | 3 +
ui/scripts/configuration.js | 9 +
ui/scripts/events.js | 3 +
ui/scripts/instances.js | 6 +
ui/scripts/network.js | 9 +
ui/scripts/projects.js | 3 +
ui/scripts/regions.js | 3 +
ui/scripts/sharedFunctions.js | 3 +
ui/scripts/storage.js | 6 +
ui/scripts/system.js | 27 +-
utils/src/com/cloud/utils/nio/Link.java | 2 +-
.../cloudstack/utils/security/SSLUtils.java | 2 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 18 +-
147 files changed, 4592 insertions(+), 1451 deletions(-)
----------------------------------------------------------------------