cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [10/50] [abbrv] git commit: updated refs/heads/object_store to 18aeef3
Date Wed, 12 Jun 2013 18:22:19 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/89fa121a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/89fa121a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/89fa121a

Branch: refs/heads/object_store
Commit: 89fa121a0cfb2bca978d4c72a91c1ba33326af68
Parents: 3ec7f8b 4c397da
Author: Sateesh Chodapuneedi <sateesh@apache.org>
Authored: Thu Jun 6 14:34:50 2013 +0530
Committer: Sateesh Chodapuneedi <sateesh@apache.org>
Committed: Thu Jun 6 14:34:50 2013 +0530

----------------------------------------------------------------------
 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 +++
 .../schema/src/com/cloud/vm/dao/UserVmDao.java  |   3 +-
 .../src/com/cloud/vm/dao/UserVmDaoImpl.java     |   3 +-
 .../lb/LoadBalancingRulesManagerImpl.java       |   5 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |   2 +-
 test/integration/smoke/test_internal_lb.py      |   4 +-
 test/integration/smoke/test_iso.py              |   2 +-
 test/integration/smoke/test_network_acl.py      | 224 ++++++++++++-------
 .../integration/smoke/test_service_offerings.py |   9 +
 test/integration/smoke/test_templates.py        |   2 +-
 .../definitions/systemvmtemplate/postinstall.sh |   2 +-
 .../systemvmtemplate64/postinstall.sh           |   2 +-
 tools/devcloud-kvm/devcloud-kvm.cfg             |   2 +-
 tools/devcloud/devcloud.cfg                     |   2 +-
 tools/devcloud/devcloud_internal-mgt.cfg        |   2 +-
 tools/devcloud/quickcloud.cfg                   |   2 +-
 tools/marvin/marvin/configGenerator.py          |   8 +-
 tools/marvin/marvin/integration/lib/base.py     |  96 +++++++-
 tools/marvin/marvin/jsonHelper.py               |   4 +-
 ui/modules/vpc/vpc.css                          |  11 +
 ui/modules/vpc/vpc.js                           |   8 +
 ui/scripts/ui/widgets/listView.js               |  27 ++-
 ui/scripts/vpc.js                               | 209 +++++++++++++++--
 28 files changed, 680 insertions(+), 138 deletions(-)
----------------------------------------------------------------------



Mime
View raw message