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/19 00:19:28 UTC
[31/31] git commit: updated refs/heads/ui-mixed-zone-management to
e044303
Merge branch 'master' into ui-mixed-zone-management
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e0443030
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e0443030
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e0443030
Branch: refs/heads/ui-mixed-zone-management
Commit: e04430302dff167d70d741a93b3219bc9f6aec3e
Parents: c3009e3 977162b
Author: Brian Federle <br...@citrix.com>
Authored: Thu Apr 18 15:18:43 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Apr 18 15:18:43 2013 -0700
----------------------------------------------------------------------
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 | 389 ++++++++++-----
packaging/debian/init/cloud-management | 2 +-
packaging/debian/replace.properties | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 3 +-
pom.xml | 16 +
server/src/com/cloud/api/ApiResponseHelper.java | 9 +-
.../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 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 6 +-
server/src/com/cloud/network/addr/PublicIp.java | 18 +-
server/src/com/cloud/network/dao/IPAddressVO.java | 2 -
.../network/element/VirtualRouterElement.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/build/build_asf.sh | 2 +-
tools/marvin/marvin/cloudstackConnection.py | 92 +++--
ui/css/cloudstack3.css | 11 +
ui/index.jsp | 5 +-
ui/modules/modules.js | 20 +
ui/scripts/plugins.js | 95 +++--
ui/scripts/ui-custom/pluginListing.js | 109 ++++
ui/scripts/ui-custom/plugins.js | 109 ----
ui/scripts/zoneWizard.js | 2 +-
44 files changed, 851 insertions(+), 539 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e0443030/ui/css/cloudstack3.css
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e0443030/ui/index.jsp
----------------------------------------------------------------------
diff --cc ui/index.jsp
index 41ad491,5e5a7f2..9e1743e
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@@ -1678,13 -1678,12 +1678,14 @@@ under the License
<script type="text/javascript" src="scripts/system.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/domains.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/docs.js?t=<%=now%>"></script>
- <script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="scripts/ui-custom/projectSelect.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="scripts/ui-custom/zoneFilter.js?t=<%=now%>"></script>
- <!-- Plugins -->
- <script type="text/javascript" src="scripts/ui-custom/plugins.js?t=<%=now%>"></script>
+ <!-- Plugin/module API -->
+ <script type="text/javascript" src="scripts/ui-custom/pluginListing.js?t=<%=now%>"></script>
<script type="text/javascript" src="plugins/plugins.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="modules/modules.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/plugins.js?t=<%=now%>"></script>
</body>
</html>