cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [35/39] git commit: updated refs/heads/bvt to f428608
Date Wed, 27 Mar 2013 13:32:45 GMT
Merge branch 'master' into bvt


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9b3a8d5b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9b3a8d5b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9b3a8d5b

Branch: refs/heads/bvt
Commit: 9b3a8d5bedb374ab12cb264407911b366f872f6e
Parents: 374c857 359b931
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Wed Mar 27 15:43:55 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Wed Mar 27 15:43:55 2013 +0530

----------------------------------------------------------------------
 CHANGES                                            |    2 +-
 INSTALL.md                                         |    4 +-
 LICENSE                                            |    2 +-
 README.md                                          |   10 +-
 README.tools.md                                    |    2 +-
 api/src/com/cloud/network/NetworkModel.java        |    2 +
 .../util/EncryptionSecretKeyCheckerUtil.java       |    2 +-
 client/tomcatconf/nonossComponentContext.xml.in    |    3 +
 debian/cloudstack-agent.install                    |    4 +-
 debian/cloudstack-management.install               |    2 +
 debian/cloudstack-management.postinst              |   19 +-
 debian/rules                                       |    9 +-
 docs/en-US/api-reference.xml                       |    2 +-
 docs/en-US/aws-ec2-user-setup.xml                  |    2 +-
 docs/en-US/building-with-maven-steps.xml           |    2 +-
 docs/en-US/castor-with-cs.xml                      |    3 +-
 docs/en-US/cloudmonkey.xml                         |    4 +-
 docs/en-US/configure-package-repository.xml        |    2 +-
 docs/en-US/extracting-source.xml                   |    4 +-
 docs/en-US/feature-overview.xml                    |    4 +-
 docs/en-US/getting-release.xml                     |    3 +-
 .../en-US/guest-nw-usage-with-traffic-sentinel.xml |    7 +-
 .../en-US/management-server-install-multi-node.xml |    3 +-
 docs/en-US/management-server-lb.xml                |    7 +-
 docs/en-US/sys-reliability-and-ha.xml              |    1 +
 packaging/centos63/cloud.spec                      |   12 +-
 packaging/debian/init/cloud-management             |    8 +-
 packaging/debian/replace.properties                |    2 +-
 .../debian/config/etc/init.d/cloud-early-config    |   23 +-
 .../resources/security_group_agent/setup.py        |    2 +-
 .../CloudStackPrimaryDataStoreLifeCycleImpl.java   |    2 +-
 pom.xml                                            |   13 +-
 python/lib/cloudutils/utilities.py                 |    2 +-
 .../network/ExternalFirewallDeviceManagerImpl.java |   48 +--
 .../ExternalLoadBalancerDeviceManagerImpl.java     |   42 +--
 server/src/com/cloud/network/NetworkManager.java   |    3 +
 .../src/com/cloud/network/NetworkManagerImpl.java  |  104 ++++-
 server/src/com/cloud/network/NetworkModelImpl.java |   23 +-
 .../network/element/VpcVirtualRouterElement.java   |    4 +-
 .../com/cloud/network/guru/DirectNetworkGuru.java  |   92 +++-
 .../network/guru/DirectPodBasedNetworkGuru.java    |   37 ++-
 .../router/VirtualNetworkApplianceManagerImpl.java |   35 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |    2 +-
 .../src/com/cloud/upgrade/dao/Upgrade410to420.java |   38 ++
 server/src/com/cloud/vm/dao/NicDao.java            |    3 +
 server/src/com/cloud/vm/dao/NicDaoImpl.java        |    8 +
 .../com/cloud/network/MockNetworkManagerImpl.java  |    7 +
 .../com/cloud/network/MockNetworkModelImpl.java    |    9 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |   13 +
 .../test/com/cloud/vpc/MockNetworkModelImpl.java   |    9 +-
 tools/appliance/definitions/devcloud/base.sh       |   12 +
 tools/appliance/definitions/devcloud/cleanup.sh    |   21 +
 tools/appliance/definitions/devcloud/definition.rb |   45 ++
 .../appliance/definitions/devcloud/postinstall.sh  |   60 +++
 tools/appliance/definitions/devcloud/preseed.cfg   |  357 +++++++++++++++
 tools/appliance/definitions/devcloud/zerodisk.sh   |   11 +
 .../definitions/systemvmtemplate/postinstall.sh    |    4 +-
 .../definitions/systemvmtemplate64/postinstall.sh  |    4 +-
 tools/cli/cloudmonkey/config.py                    |    4 +-
 ui/scripts/cloud.core.callbacks.js                 |    2 +-
 ui/scripts/system.js                               |   61 +--
 ui/scripts/ui-custom/instanceWizard.js             |    8 +-
 ui/scripts/ui-custom/login.js                      |    2 +-
 ui/scripts/ui/widgets/listView.js                  |    8 +-
 ui/scripts/zoneWizard.js                           |   28 +-
 .../utils/crypt/EncryptionSecretKeyChanger.java    |    2 +-
 .../utils/crypt/EncryptionSecretKeyChecker.java    |    2 +-
 67 files changed, 1029 insertions(+), 248 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b3a8d5b/pom.xml
----------------------------------------------------------------------


Mime
View raw message