cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [40/41] git commit: updated refs/heads/marvin_refactor to 94b18c6
Date Thu, 18 Apr 2013 02:26:28 GMT
Merge branch 'master' into marvin_refactor


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

Branch: refs/heads/marvin_refactor
Commit: e82ba586b10c9d854253545d072d9fd824962c7a
Parents: 5c5a54e b12905b
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Thu Apr 18 07:52:10 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Thu Apr 18 07:52:10 2013 +0530

----------------------------------------------------------------------
 api/src/com/cloud/network/IpAddress.java           |    9 -
 api/src/com/cloud/network/PublicIpAddress.java     |    3 -
 api/src/com/cloud/user/Account.java                |    4 +
 api/src/com/cloud/user/User.java                   |    2 +
 .../cloudstack/affinity/AffinityGroupResponse.java |    5 +-
 .../api/command/user/vm/DeployVMCmd.java           |    5 +-
 .../cloudstack/api/command/user/vm/ListVMsCmd.java |    2 +-
 .../cloudstack/api/response/AccountResponse.java   |    7 +
 .../cloudstack/api/response/UserResponse.java      |    8 +
 core/src/com/cloud/user/AccountVO.java             |    7 +
 core/src/com/cloud/user/UserVO.java                |   11 +-
 docs/en-US/Release_Notes.xml                       |  133 ++----
 .../kvm/resource/LibvirtComputingResource.java     |    3 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |    7 +-
 .../src/com/cloud/api/query/QueryManagerImpl.java  |   11 +-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java    |    8 +-
 .../api/query/dao/AffinityGroupJoinDaoImpl.java    |    1 +
 .../api/query/dao/UserAccountJoinDaoImpl.java      |    1 +
 .../src/com/cloud/api/query/vo/AccountJoinVO.java  |   10 +
 .../cloud/api/query/vo/AffinityGroupJoinVO.java    |   11 +
 .../com/cloud/api/query/vo/UserAccountJoinVO.java  |   16 +-
 server/src/com/cloud/network/addr/PublicIp.java    |   18 +-
 server/src/com/cloud/network/dao/IPAddressVO.java  |    2 -
 .../com/cloud/server/ConfigurationServerImpl.java  |   12 +-
 server/src/com/cloud/user/AccountManagerImpl.java  |   15 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |    5 +
 .../affinity/AffinityGroupServiceImpl.java         |    2 +-
 .../cloudstack/affinity/AffinityGroupVO.java       |    2 +-
 setup/db/db/schema-410to420.sql                    |  337 +++++++++------
 test/integration/smoke/test_public_ip_range.py     |    2 +-
 tools/marvin/marvin/cloudstackConnection.py        |   92 +++--
 31 files changed, 414 insertions(+), 337 deletions(-)
----------------------------------------------------------------------



Mime
View raw message