You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/30 21:20:34 UTC
[12/22] git commit: updated refs/heads/master to c7143be
Merge branch 'master' into ui-add-remove-nics
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c45fd05f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c45fd05f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c45fd05f
Branch: refs/heads/master
Commit: c45fd05f6b7f1d986ea8eeb5d14db23fed34c89a
Parents: e6d9e81 3e2eb59
Author: Brian Federle <br...@citrix.com>
Authored: Fri Apr 26 11:37:52 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Apr 26 11:37:52 2013 -0700
----------------------------------------------------------------------
agent/conf/agent.properties | 2 +-
.../api/command/admin/router/ListRoutersCmd.java | 7 +
.../command/user/snapshot/ListSnapshotsCmd.java | 7 +
client/pom.xml | 11 +-
client/tomcatconf/applicationContext.xml.in | 4 +
core/src/com/cloud/async/AsyncJobVO.java | 1 +
docs/en-US/added-API-commands-4.2.xml | 24 +
docs/en-US/delete-event-alerts.xml | 12 +
docs/en-US/events.xml | 2 +-
docs/en-US/images/eip-ns-basiczone.png | Bin 0 -> 55568 bytes
packaging/centos63/package.sh | 4 +-
.../debian/config/etc/init.d/cloud-early-config | 8 +
.../src/com/cloud/api/query/QueryManagerImpl.java | 12 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 6 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 6 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 6 +-
.../api/query/dao/SecurityGroupJoinDaoImpl.java | 6 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 6 +-
.../api/query/dao/UserAccountJoinDaoImpl.java | 6 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 6 +-
.../src/com/cloud/api/query/vo/AccountJoinVO.java | 6 +-
.../com/cloud/api/query/vo/DomainRouterJoinVO.java | 6 +-
server/src/com/cloud/api/query/vo/HostJoinVO.java | 6 +-
.../cloud/api/query/vo/SecurityGroupJoinVO.java | 6 +-
.../com/cloud/api/query/vo/StoragePoolJoinVO.java | 6 +-
.../com/cloud/api/query/vo/UserAccountJoinVO.java | 6 +-
.../src/com/cloud/api/query/vo/UserVmJoinVO.java | 6 +-
.../src/com/cloud/api/query/vo/VolumeJoinVO.java | 6 +-
.../network/firewall/FirewallManagerImpl.java | 12 +-
.../storage/snapshot/SnapshotManagerImpl.java | 32 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 11 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +
tools/marvin/marvin/asyncJobMgr.py | 70 +-
tools/marvin/marvin/cloudstackConnection.py | 17 +-
tools/marvin/marvin/cloudstackTestClient.py | 53 +-
tools/marvin/marvin/dbConnection.py | 6 +-
tools/marvin/marvin/deployDataCenter.py | 7 +
tools/marvin/marvin/integration/lib/base.py | 600 +++++++++++++--
tools/marvin/marvin/integration/lib/utils.py | 17 +-
tools/marvin/marvin/remoteSSHClient.py | 18 +-
ui/images/icons.png | Bin 50708 -> 50052 bytes
ui/scripts/domains.js | 2 +-
ui/scripts/regions.js | 27 +-
ui/scripts/sharedFunctions.js | 4 +
ui/scripts/system.js | 128 ++-
46 files changed, 953 insertions(+), 243 deletions(-)
----------------------------------------------------------------------