cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject [2/2] git commit: updated refs/heads/master to 81d2a70
Date Wed, 05 Jun 2013 18:26:39 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack


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

Branch: refs/heads/master
Commit: 81d2a70bf30be285bd2ba82d3f1c375b21f95faf
Parents: 53fd2ee 54481d0
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Wed Jun 5 23:56:06 2013 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
Committed: Wed Jun 5 23:56:06 2013 +0530

----------------------------------------------------------------------
 client/tomcatconf/classpath.conf.in                |    8 -
 docs/en-US/CloudStack_GSoC_Guide.ent               |   22 +
 docs/en-US/CloudStack_GSoC_Guide.xml               |   52 +++
 docs/en-US/gsoc-tuna.xml                           |   28 ++
 docs/en-US/multiple-ip-range.xml                   |    3 +-
 docs/en-US/pvlan.xml                               |   57 +++
 docs/publican-gsoc-2013.cfg                        |   27 ++
 engine/schema/src/com/cloud/vm/dao/UserVmDao.java  |    3 +-
 .../schema/src/com/cloud/vm/dao/UserVmDaoImpl.java |    3 +-
 packaging/centos63/cloud.spec                      |    3 +
 .../network/lb/LoadBalancingRulesManagerImpl.java  |    5 +-
 .../src/com/cloud/server/ManagementServerImpl.java |   15 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   10 +-
 test/integration/smoke/test_internal_lb.py         |  351 ++++++---------
 test/integration/smoke/test_iso.py                 |    2 +-
 test/integration/smoke/test_network_acl.py         |  224 ++++++----
 test/integration/smoke/test_service_offerings.py   |    9 +
 test/integration/smoke/test_templates.py           |    2 +-
 tools/marvin/marvin/integration/lib/base.py        |  194 ++++++++-
 ui/scripts/projects.js                             |    3 +
 ui/scripts/ui-custom/projects.js                   |   25 +
 21 files changed, 704 insertions(+), 342 deletions(-)
----------------------------------------------------------------------



Mime
View raw message