You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2012/10/27 12:02:26 UTC
[1/49] git commit: Merge branch 'master' into marvin-parallel
Updated Branches:
refs/heads/marvin-parallel 59ac4136b -> d0689e64c
Merge branch 'master' into marvin-parallel
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d0689e64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d0689e64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d0689e64
Branch: refs/heads/marvin-parallel
Commit: d0689e64c75e4db4bf59c196f9c5bdf366837063
Parents: 59ac413 5b43d24
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Sat Oct 27 14:43:38 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Oct 27 14:43:38 2012 +0530
----------------------------------------------------------------------
.../debian/config/etc/init.d/cloud-passwd-srvr | 36 ++-
.../debian/config/etc/iptables/iptables-router | 1 -
server/src/com/cloud/api/ApiServlet.java | 10 +
.../src/com/cloud/cluster/ClusterManagerImpl.java | 20 ++-
setup/bindir/cloud-setup-databases.in | 12 +-
tools/apidoc/pom.xml | 125 +++++----
tools/marvin/pom.xml | 141 +++++----
ui/css/cloudstack3.css | 52 +++-
ui/images/infrastructure-icons.png | Bin 0 -> 40266 bytes
ui/index.jsp | 24 +-
ui/scripts/accounts.js | 245 ++++++++++-----
ui/scripts/configuration.js | 19 +-
ui/scripts/events.js | 18 +-
ui/scripts/network.js | 134 ++-------
ui/scripts/sharedFunctions.js | 14 +-
ui/scripts/templates.js | 166 +++++++---
ui/scripts/ui-custom/enableStaticNAT.js | 2 +
ui/scripts/ui/widgets/detailView.js | 25 ++-
utils/src/com/cloud/utils/db/Transaction.java | 19 +-
utils/src/com/cloud/utils/script/Script.java | 27 ++-
utils/test/com/cloud/utils/db/DbTestDao.java | 66 ++++
utils/test/com/cloud/utils/db/DbTestVO.java | 56 ++++
utils/test/com/cloud/utils/db/TransactionTest.java | 218 +++++++++++++
vmware-base/pom.xml | 4 +-
24 files changed, 1007 insertions(+), 427 deletions(-)
----------------------------------------------------------------------