incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [49/50] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Date Thu, 26 Jul 2012 21:05:07 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack


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

Branch: refs/heads/rbd
Commit: 5ba20b328da73b563f089fb93d1e77081767830a
Parents: dade14a a1d53f2
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Wed Jul 25 00:06:39 2012 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
Committed: Wed Jul 25 00:06:39 2012 +0530

----------------------------------------------------------------------
 agent/conf/environment.properties.in               |    1 +
 .../distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in |   46 +-
 agent/libexec/agent-runner.in                      |   88 ---
 agent/src/com/cloud/agent/AgentShell.java          |   39 +-
 .../cloud/bridge/service/EC2SoapServiceImpl.java   |  431 +++++++++++----
 .../service/core/ec2/EC2DescribeInstances.java     |    9 +
 .../service/core/ec2/EC2DescribeSnapshots.java     |    9 +
 .../bridge/service/core/ec2/EC2DescribeTags.java   |   34 ++
 .../service/core/ec2/EC2DescribeTagsResponse.java  |   37 ++
 .../service/core/ec2/EC2DescribeVolumes.java       |    9 +
 .../cloud/bridge/service/core/ec2/EC2Engine.java   |  217 +++++++-
 .../cloud/bridge/service/core/ec2/EC2Image.java    |   15 +-
 .../cloud/bridge/service/core/ec2/EC2Instance.java |   12 +-
 .../service/core/ec2/EC2InstanceFilterSet.java     |   45 ++-
 .../bridge/service/core/ec2/EC2RegisterImage.java  |   24 +-
 .../bridge/service/core/ec2/EC2ResourceTag.java    |   64 +++
 .../cloud/bridge/service/core/ec2/EC2Snapshot.java |   12 +
 .../service/core/ec2/EC2SnapshotFilterSet.java     |   45 ++-
 .../bridge/service/core/ec2/EC2TagKeyValue.java    |   44 ++
 .../bridge/service/core/ec2/EC2TagTypeId.java      |   47 ++
 .../com/cloud/bridge/service/core/ec2/EC2Tags.java |   44 ++
 .../bridge/service/core/ec2/EC2TagsFilterSet.java  |  107 ++++
 .../cloud/bridge/service/core/ec2/EC2Volume.java   |   15 +-
 .../service/core/ec2/EC2VolumeFilterSet.java       |   43 ++-
 awsapi/src/com/cloud/stack/CloudStackApi.java      |   90 +++-
 .../src/com/cloud/stack/models/ApiConstants.java   |   10 +
 .../cloud/stack/models/CloudStackResourceTag.java  |   50 ++
 .../com/cloud/stack/models/CloudStackSnapshot.java |    9 +
 .../com/cloud/stack/models/CloudStackTemplate.java |   10 +
 .../com/cloud/stack/models/CloudStackUserVm.java   |    9 +
 .../com/cloud/stack/models/CloudStackVolume.java   |   10 +
 build/package.xml                                  |    2 +-
 daemonize/daemonize.c                              |  351 ------------
 debian/cloud-agent-deps.install                    |    2 +-
 debian/control                                     |    4 +-
 deps/.classpath                                    |    2 +-
 deps/cloud-libvirt-0.4.5.jar                       |  Bin 68899 -> 0 bytes
 deps/libvirt-0.4.8.jar                             |  Bin 0 -> 70122 bytes
 .../api/commands/AddExternalLoadBalancerCmd.java   |   31 +-
 .../cloud/api/commands/AddF5LoadBalancerCmd.java   |   31 +-
 .../api/commands/ConfigureF5LoadBalancerCmd.java   |   29 +-
 .../commands/DeleteExternalLoadBalancerCmd.java    |   29 +-
 .../api/commands/DeleteF5LoadBalancerCmd.java      |   29 +-
 .../api/commands/ListExternalLoadBalancersCmd.java |   29 +-
 .../commands/ListF5LoadBalancerNetworksCmd.java    |   29 +-
 .../cloud/api/commands/ListF5LoadBalancersCmd.java |   29 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  |   21 +-
 .../com/cloud/user/MockAccountManagerImpl.java     |    9 +
 ui/css/cloudstack3.css                             |  198 +++++++
 ui/index.jsp                                       |    3 +-
 ui/scripts/sharedFunctions.js                      |   78 +++
 ui/scripts/ui/widgets/detailView.js                |   48 ++-
 ui/scripts/ui/widgets/multiEdit.js                 |   12 +-
 ui/scripts/ui/widgets/tagger.js                    |  201 +++++++
 .../distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in |   28 +-
 usage/libexec/usage-runner.in                      |   37 --
 usage/src/com/cloud/usage/UsageServer.java         |   19 +-
 57 files changed, 2055 insertions(+), 821 deletions(-)
----------------------------------------------------------------------



Mime
View raw message