cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [25/25] git commit: updated refs/heads/ui-vpc-redesign to 7ac0141
Date Wed, 22 May 2013 18:46:09 GMT
Merge branch 'master' into ui-vpc-redesign


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

Branch: refs/heads/ui-vpc-redesign
Commit: 7ac0141f7e5d7a949cffb162461b5c917002fd6b
Parents: a0e75c1 c7976b6
Author: Brian Federle <bfederle@gmail.com>
Authored: Wed May 22 11:45:50 2013 -0700
Committer: Brian Federle <bfederle@gmail.com>
Committed: Wed May 22 11:45:50 2013 -0700

----------------------------------------------------------------------
 .../com/cloud/bridge/service/EC2MainServlet.java   |    2 +-
 .../com/cloud/bridge/service/EC2RestServlet.java   |  338 +++++---
 .../cloud/bridge/service/EC2SoapServiceImpl.java   |   87 +-
 .../service/core/ec2/EC2AddressFilterSet.java      |   16 +-
 .../core/ec2/EC2AvailabilityZonesFilterSet.java    |    9 +-
 .../cloud/bridge/service/core/ec2/EC2Engine.java   |  717 ++++++++++-----
 .../bridge/service/core/ec2/EC2GroupFilterSet.java |    9 +-
 .../bridge/service/core/ec2/EC2ImageFilterSet.java |    8 +-
 .../service/core/ec2/EC2InstanceFilterSet.java     |    8 +-
 .../service/core/ec2/EC2KeyPairFilterSet.java      |   16 +-
 .../core/ec2/EC2ModifyInstanceAttribute.java       |   64 ++
 .../bridge/service/core/ec2/EC2RegisterImage.java  |    5 +-
 .../service/core/ec2/EC2SnapshotFilterSet.java     |   10 +-
 .../bridge/service/core/ec2/EC2TagsFilterSet.java  |    9 +-
 .../service/core/ec2/EC2VolumeFilterSet.java       |    9 +-
 .../service/exception/EC2ServiceException.java     |  120 ++--
 awsapi/src/com/cloud/stack/CloudStackClient.java   |    5 +-
 docs/en-US/Release_Notes.xml                       |   53 +-
 docs/en-US/added-API-commands-4.2.xml              |   16 +
 docs/en-US/elastic-ip.xml                          |  161 ++--
 docs/en-US/portable-ip.xml                         |   30 +
 .../cloud/entity/api/db/VolumeReservationVO.java   |   22 +-
 .../api/db/dao/VolumeReservationDaoImpl.java       |    2 +-
 .../debian/config/etc/init.d/cloud-early-config    |    5 +-
 .../xen/resource/CitrixResourceBase.java           |    4 +-
 .../xen/resource/XenServer56FP1Resource.java       |    5 +-
 .../motion/XenServerStorageMotionStrategy.java     |   10 +-
 .../cloud/network/cisco/CiscoVnmcConnection.java   |   22 +-
 .../network/cisco/CiscoVnmcConnectionImpl.java     |  112 +--
 .../cloud/network/resource/CiscoVnmcResource.java  |   20 +-
 .../network/resource/CiscoVnmcResourceTest.java    |   22 +-
 .../response/NetscalerLoadBalancerResponse.java    |   21 +
 .../cloud/network/element/NetscalerElement.java    |    4 +
 .../cloud/network/nicira/DestinationNatRule.java   |  105 +++
 .../src/com/cloud/network/nicira/Match.java        |  146 +---
 .../src/com/cloud/network/nicira/NatRule.java      |  363 +++------
 .../src/com/cloud/network/nicira/NiciraNvpApi.java |   67 ++-
 .../com/cloud/network/nicira/SourceNatRule.java    |  123 +++
 .../cloud/network/resource/NiciraNvpResource.java  |   57 +-
 .../test/com/cloud/network/nicira/NatRuleTest.java |   43 +-
 .../network/resource/NiciraNvpResourceTest.java    |  113 ++-
 server/src/com/cloud/network/NetworkModelImpl.java |    8 +-
 services/secondary-storage/scripts/ssvm-check.sh   |    4 +-
 test/integration/smoke/test_deploy_vm.py           |    3 +
 ...st_deploy_vms_with_varied_deploymentplanners.py |  414 +++++----
 test/integration/smoke/test_network.py             |   69 +-
 test/integration/smoke/test_pvlan.py               |    1 +
 test/integration/smoke/test_vm_snapshots.py        |  618 +++++++-------
 ui/scripts/configuration.js                        |   45 +-
 ui/scripts/docs.js                                 |    9 +
 ui/scripts/system.js                               |    4 +-
 ui/scripts/zoneWizard.js                           |    2 +-
 .../com/cloud/utils/db/GenericSearchBuilder.java   |   18 +-
 53 files changed, 2404 insertions(+), 1749 deletions(-)
----------------------------------------------------------------------



Mime
View raw message