incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [1/44] git commit: Merge branch 'master' into vpc
Date Thu, 02 Aug 2012 02:08:32 GMT
Updated Branches:
  refs/heads/master 10cf9c2f2 -> 116874712
  refs/heads/vpc d49776938 -> ce9f1afa7


Merge branch 'master' into vpc

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.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/ce9f1afa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ce9f1afa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ce9f1afa

Branch: refs/heads/vpc
Commit: ce9f1afa786d208bf470115152a15bdd47afc55d
Parents: 21e8fb3 1168747
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Wed Aug 1 19:04:28 2012 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Wed Aug 1 19:04:28 2012 -0700

----------------------------------------------------------------------
 README.md                                          |    4 +-
 agent-simulator/.classpath                         |   18 ++
 agent-simulator/.project                           |   18 ++
 agent-simulator/db/create-schema-simulator.sql     |   32 ++--
 agent-simulator/scripts/run.bat                    |   17 ++
 .../scripts/zucchini/zucchini.configuration.sql    |   33 ++--
 .../tomcatconf/commands-simulator.properties.in    |   18 ++
 .../tomcatconf/components-simulator.xml.in         |   18 ++
 agent/src/com/cloud/agent/Agent.java               |   30 ++--
 api/.classpath                                     |   18 ++
 api/.project                                       |   18 ++
 api/src/com/cloud/api/commands/.gitignore          |   17 ++
 api/src/com/cloud/api/commands/CreateTagsCmd.java  |    4 +-
 api/src/com/cloud/api/commands/DeleteTagsCmd.java  |    4 +-
 api/src/com/cloud/api/commands/ListTagsCmd.java    |    4 +-
 .../cloud/hypervisor/HypervisorCapabilities.java   |    5 +-
 awsapi-setup/db/mysql/init_db.bat                  |   17 ++
 awsapi/.classpath                                  |   18 ++
 awsapi/.project                                    |   18 ++
 awsapi/.pydevproject                               |   18 ++
 awsapi/conf/CloudStack.cfg.xml                     |   18 ++
 awsapi/conf/cloud-bridge.properties                |   17 ++
 awsapi/conf/ec2-service.properties                 |   17 ++
 awsapi/conf/hibernate.cfg.xml                      |   18 ++
 awsapi/docs/AmazonEC2/EC2-API-tool-setup.txt       |   20 ++
 .../docs/AmazonEC2/EC2-implementation-guide.html   |   18 ++
 .../docs/AmazonEC2/EC2-local-deploy-using-ant.html |   18 ++
 awsapi/docs/AmazonEC2/EC2-users-guide.html         |   18 ++
 awsapi/docs/AmazonEC2/wsdl2java-command-line.txt   |   21 ++-
 awsapi/docs/AmazonS3/S3-users-guide.html           |   20 ++-
 awsapi/docs/AmazonS3/notes.txt                     |   21 ++-
 awsapi/docs/AmazonS3/wsdl2java-command-line.txt    |   19 ++
 awsapi/packages/config/debian/cloud-bridge.install |   17 ++
 .../packages/config/debian/cloud-bridge.postinst   |   17 ++
 awsapi/packages/config/rpm/cloudbridge.spec        |   17 ++
 awsapi/resource/AmazonEC2/crypto.properties        |   18 ++
 awsapi/scripts/run.bat                             |   17 ++
 awsapi/src/com/cloud/bridge/auth/ec2/module.xml    |   18 ++
 awsapi/src/com/cloud/bridge/auth/s3/module.xml     |   18 ++
 awsapi/src/com/cloud/bridge/model/MHost.hbm.xml    |   18 ++
 .../src/com/cloud/bridge/model/MHostMount.hbm.xml  |   18 ++
 awsapi/src/com/cloud/bridge/model/SAcl.hbm.xml     |   18 ++
 awsapi/src/com/cloud/bridge/model/SBucket.hbm.xml  |   18 ++
 awsapi/src/com/cloud/bridge/model/SHost.hbm.xml    |   18 ++
 awsapi/src/com/cloud/bridge/model/SMeta.hbm.xml    |   18 ++
 awsapi/src/com/cloud/bridge/model/SObject.hbm.xml  |   18 ++
 .../src/com/cloud/bridge/model/SObjectItem.hbm.xml |   18 ++
 .../com/cloud/bridge/model/UserCredentials.hbm.xml |   18 ++
 .../cloud/stack/models/CloudStackAccount.hbm.xml   |   18 ++
 .../stack/models/CloudStackConfiguration.hbm.xml   |   18 ++
 .../stack/models/CloudStackServiceOffering.hbm.xml |   18 ++
 .../test/com/cloud/gate/util/Xml2JavaTestData.xml  |   18 ++
 awsapi/test/html/certSubmit.html                   |   18 ++
 awsapi/test/html/testRestURL.txt                   |   21 ++-
 awsapi/wscript                                     |   17 ++
 awsapi/wscript_build                               |   16 ++
 awsapi/wscript_configure                           |   17 ++
 build.xml                                          |   18 ++-
 build/.gitignore                                   |   17 ++
 build/.project                                     |   18 ++
 build/build-aws-api.properties                     |   17 ++
 build/build-cloud.properties                       |   17 ++
 build/cloud.properties                             |   17 ++
 build/deploy/db/log4j.properties                   |   17 ++
 .../agent/storagehdpatch/etc/default/init          |   38 ----
 .../agent/storagehdpatch/etc/inet/ntp.conf         |    6 -
 .../agent/storagehdpatch/etc/nsswitch.conf         |   70 -------
 .../agent/storagehdpatch/etc/ssh/sshd_config       |  154 ---------------
 .../production/agent/storagehdpatch/etc/system     |  101 ----------
 .../storagehdpatch/etc/vmops/disks.properties      |    6 -
 .../storagehdpatch/etc/vmops/network.properties    |   34 ----
 .../agent/storagehdpatch/lib/svc/method/vmops      |  121 -----------
 .../agent/storagehdpatch/usr/sbin/vsetup           |   59 ------
 .../var/svc/manifest/application/cloud.xml         |   60 ------
 .../consoleproxy/conf/consoleproxy.properties      |   17 ++
 .../production/server/conf/agent-update.properties |   17 ++
 build/developer.xml                                |    7 +-
 build/overview.html                                |   19 ++-
 build/replace.properties                           |   17 ++
 build/simulator.properties                         |   17 ++
 client/.classpath                                  |   18 ++
 client/.project                                    |   18 ++
 .../WEB-INF/classes/resources/messages.properties  |   20 ++-
 .../classes/resources/messages_es.properties       |   19 ++-
 .../classes/resources/messages_ja.properties       |   17 ++
 .../classes/resources/messages_zh_CN.properties    |   17 ++
 client/bindir/cloud-setup-management.in            |   17 ++
 client/bindir/cloud-update-xenserver-licenses.in   |   17 ++
 .../SYSCONFDIR/rc.d/init.d/cloud-management.in     |   16 ++
 .../SYSCONFDIR/sysconfig/cloud-management.in       |   17 ++
 .../SYSCONFDIR/rc.d/init.d/cloud-management.in     |   16 ++
 .../SYSCONFDIR/sysconfig/cloud-management.in       |   17 ++
 .../SYSCONFDIR/sysconfig/cloud-management.in       |   17 ++
 .../SYSCONFDIR/rc.d/init.d/cloud-management.in     |   16 ++
 .../rhel/SYSCONFDIR/sysconfig/cloud-management.in  |   17 ++
 .../sles/SYSCONFDIR/sysconfig/cloud-management.in  |   17 ++
 .../cisconexusvsm_commands.properties.in           |   17 ++
 client/tomcatconf/classpath.conf.in                |   16 ++
 client/tomcatconf/commands-ext.properties.in       |   17 ++
 client/tomcatconf/commands.properties.in           |   17 ++
 client/tomcatconf/components-cloudzones.xml.in     |   18 ++
 client/tomcatconf/components.xml.in                |   18 ++
 client/tomcatconf/db-enc.properties.in             |   17 ++
 client/tomcatconf/db.properties.in                 |   17 ++
 client/tomcatconf/ehcache.xml.in                   |   18 ++
 client/tomcatconf/environment.properties.in        |   17 ++
 client/tomcatconf/f5bigip_commands.properties.in   |   17 ++
 .../tomcatconf/junipersrx_commands.properties.in   |   17 ++
 client/tomcatconf/log4j-cloud.xml.in               |   18 ++
 .../netscalerloadbalancer_commands.properties.in   |   17 ++
 .../tomcatconf/nicira-nvp_commands.properties.in   |   19 ++-
 client/tomcatconf/simulator.properties.in          |   19 ++-
 client/tomcatconf/tomcat6-nonssl.conf.in           |   17 ++
 client/tomcatconf/tomcat6-ssl.conf.in              |   16 ++
 .../virtualrouter_commands.properties.in           |   17 ++
 .../cloud/hypervisor/HypervisorCapabilitiesVO.java |   12 ++
 .../cloud/hypervisor/kvm/resource/KVMHABase.java   |   30 ---
 .../kvm/resource/LibvirtCapXMLParser.java          |   64 ------
 .../kvm/resource/LibvirtComputingResource.java     |   22 +-
 .../kvm/resource/LibvirtDomainXMLParser.java       |   65 ------
 .../hypervisor/kvm/resource/LibvirtNetworkDef.java |   21 --
 .../kvm/resource/LibvirtStoragePoolXMLParser.java  |   20 --
 .../resource/LibvirtStorageVolumeXMLParser.java    |   20 --
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   84 +-------
 .../kvm/storage/LibvirtStorageAdaptor.java         |   37 +---
 .../hypervisor/kvm/resource/LibvirtVMDefTest.java  |   38 ++++
 .../cloud/network/nicira/ControlClusterStatus.java |   66 ++++++
 .../src/com/cloud/network/nicira/NiciraNvpApi.java |   17 ++-
 .../cloud/network/resource/NiciraNvpResource.java  |   77 ++++++--
 server/src/com/cloud/configuration/Config.java     |    2 +-
 .../hypervisor/dao/HypervisorCapabilitiesDao.java  |    5 +-
 .../dao/HypervisorCapabilitiesDaoImpl.java         |   41 ++++-
 .../src/com/cloud/network/NetworkManagerImpl.java  |   89 ++++++---
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   25 ++-
 setup/db/create-schema.sql                         |    5 +-
 setup/db/db/schema-303to40.sql                     |   10 +-
 ui/index.jsp                                       |    1 +
 ui/scripts/storage.js                              |    2 +-
 ui/scripts/zoneWizard.js                           |    4 +-
 wscript_configure                                  |    2 +-
 140 files changed, 2108 insertions(+), 1119 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ce9f1afa/api/src/com/cloud/api/commands/CreateTagsCmd.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ce9f1afa/api/src/com/cloud/api/commands/DeleteTagsCmd.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ce9f1afa/api/src/com/cloud/api/commands/ListTagsCmd.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ce9f1afa/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ce9f1afa/client/tomcatconf/components.xml.in
----------------------------------------------------------------------


Mime
View raw message