You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/09/22 09:21:58 UTC
[1/3] git commit: updated refs/heads/4.4 to b0b4845
Repository: cloudstack
Updated Branches:
refs/heads/4.4 a29f954a2 -> b0b48456b
CLOUDSTACK-401: add missing file format in docs.js
(cherry picked from commit 18a4e09d981e65fd497f1d7d2e98ebcca7e16aff)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8d459470
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8d459470
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8d459470
Branch: refs/heads/4.4
Commit: 8d459470165153dfae6b2d62b151e5fe96f0e0eb
Parents: a29f954
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Sun Sep 21 14:40:09 2014 -0400
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Sep 22 09:17:09 2014 +0200
----------------------------------------------------------------------
ui/scripts/docs.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d459470/ui/scripts/docs.js
----------------------------------------------------------------------
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index abda45b..ab4e04a 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -627,7 +627,7 @@ cloudStack.docs = {
externalLink: ''
},
helpPrimaryStorageProtocol: {
- desc: 'For XenServer, choose NFS, iSCSI, or PreSetup. For KVM, choose NFS or SharedMountPoint. For vSphere, choose VMFS (iSCSI or FiberChannel) or NFS. For Hyper-V, choose SMB/CIFS',
+ desc: 'For XenServer, choose NFS, iSCSI, or PreSetup. For KVM, choose NFS, SharedMountPoint, RDB, CLVM or Gluster. For vSphere, choose VMFS (iSCSI or FiberChannel) or NFS. For Hyper-V, choose SMB/CIFS. For LXC, choose NFS or SharedMountPoint. For OVM, choose NFS or ocfs2.',
externalLink: ''
},
helpPrimaryStorageServer: {
@@ -1197,7 +1197,7 @@ cloudStack.docs = {
externalLink: ''
},
helpUploadVolumeFormat: {
- desc: 'The disk image format of the volume. XenServer is VHD, VMware is OVA, and KVM is QCOW2. Hyper-V is VHD.',
+ desc: 'The disk image format of the volume. XenServer is VHD, VMware is OVA, and KVM is QCOW2. Hyper-V is VHD or VHDX. OVM is RAW.',
externalLink: ''
},
helpUploadVolumeURL: {
[3/3] git commit: updated refs/heads/4.4 to b0b4845
Posted by da...@apache.org.
CLOUDSTACK-1632
(cherry picked from commit 482b51476be4cf45aa002ea53fb68fd2c62bc5af)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b0b48456
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b0b48456
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b0b48456
Branch: refs/heads/4.4
Commit: b0b48456bb8b1034131b5b1484b62fa7dc8b10bc
Parents: 1cf3c28
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Sun Sep 21 15:56:47 2014 -0400
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Sep 22 09:19:55 2014 +0200
----------------------------------------------------------------------
.../user/securitygroup/AuthorizeSecurityGroupEgressCmd.java | 2 +-
.../user/securitygroup/AuthorizeSecurityGroupIngressCmd.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0b48456/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
index 9909bf3..f7339e9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
@@ -97,7 +97,7 @@ public class AuthorizeSecurityGroupEgressCmd extends BaseAsyncCmd {
// This @ACL will not work, since we don't have a way to convert this parameter to the entity like securityGroupId.
//@ACL(accessType = AccessType.OperateEntry)
- @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, description="The name of the security group. Mutually exclusive with securityGroupName parameter")
+ @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, description="The name of the security group. Mutually exclusive with securityGroupId parameter")
private String securityGroupName;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0b48456/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
index 3549d51..a807386 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
@@ -97,7 +97,7 @@ public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd {
// This @ACL will not work, since we don't have a way to convert this parameter to the entity like securityGroupId.
//@ACL(accessType = AccessType.OperateEntry)
- @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, description="The name of the security group. Mutually exclusive with securityGroupName parameter")
+ @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, description="The name of the security group. Mutually exclusive with securityGroupId parameter")
private String securityGroupName;
/////////////////////////////////////////////////////
[2/3] git commit: updated refs/heads/4.4 to b0b4845
Posted by da...@apache.org.
generateAPI doc: version 4.4.1, year:2014, add back button on main pages
(cherry picked from commit d8ffcdb251624ae9c6ce124f2f3f68e45a341581)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1cf3c282
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1cf3c282
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1cf3c282
Branch: refs/heads/4.4
Commit: 1cf3c282cb89b5affce21ac6eb63ebf9a638f4a5
Parents: 8d45947
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Sun Sep 21 15:16:31 2014 -0400
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Sep 22 09:18:24 2014 +0200
----------------------------------------------------------------------
tools/apidoc/generateadmincommands.xsl | 4 ++--
tools/apidoc/generatecommand.xsl | 2 +-
tools/apidoc/generatedomainadmincommands.xsl | 4 ++--
tools/apidoc/generatetoc.xsl | 2 +-
tools/apidoc/generatetoc_footer.xsl | 2 +-
tools/apidoc/generatetoc_header.xsl | 5 +++--
tools/apidoc/generateusercommands.xsl | 4 ++--
7 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1cf3c282/tools/apidoc/generateadmincommands.xsl
----------------------------------------------------------------------
diff --git a/tools/apidoc/generateadmincommands.xsl b/tools/apidoc/generateadmincommands.xsl
index 9abec10..21ebc12 100644
--- a/tools/apidoc/generateadmincommands.xsl
+++ b/tools/apidoc/generateadmincommands.xsl
@@ -57,7 +57,7 @@ version="1.0">
<xsl:for-each select="command/command">
<!-- Modify this line for the release version -->
<span>
- Apache CloudStack v4.2.0 Root Admin API Reference
+ Apache CloudStack v4.4.1 Root Admin API Reference
</span>
<p></p>
<h1><xsl:value-of select="name"/></h1>
@@ -150,7 +150,7 @@ version="1.0">
</div>
<div id="footer_mainmaster">
- <p>Copyright © 2013 The Apache Software Foundation, Licensed under the
+ <p>Copyright © 2014 The Apache Software Foundation, Licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a> <br />
Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
</div>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1cf3c282/tools/apidoc/generatecommand.xsl
----------------------------------------------------------------------
diff --git a/tools/apidoc/generatecommand.xsl b/tools/apidoc/generatecommand.xsl
index 965a3a3..c3a5009 100644
--- a/tools/apidoc/generatecommand.xsl
+++ b/tools/apidoc/generatecommand.xsl
@@ -179,7 +179,7 @@ version="1.0">
<li> <a href="#"> Contacts</a> </li>
</ul>
- <p>Copyright © 2013 The Apache Software Foundation, Licensed under the
+ <p>Copyright © 2014 The Apache Software Foundation, Licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a> <br />
Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1cf3c282/tools/apidoc/generatedomainadmincommands.xsl
----------------------------------------------------------------------
diff --git a/tools/apidoc/generatedomainadmincommands.xsl b/tools/apidoc/generatedomainadmincommands.xsl
index 7238f05..68c663e 100644
--- a/tools/apidoc/generatedomainadmincommands.xsl
+++ b/tools/apidoc/generatedomainadmincommands.xsl
@@ -60,7 +60,7 @@ version="1.0">
<xsl:for-each select="command/command">
<!-- Modify this line for the release version -->
<span>
- Apache CloudStack v4.2.0 Domain Admin API Reference
+ Apache CloudStack v4.4.1 Domain Admin API Reference
</span>
<p></p>
<h1><xsl:value-of select="name"/></h1>
@@ -144,7 +144,7 @@ version="1.0">
</div>
<div id="footer">
<div id="footer_mainmaster">
- <p>Copyright © 2013 The Apache Software Foundation, Licensed under the
+ <p>Copyright © 2014 The Apache Software Foundation, Licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a> <br />
Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
</div>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1cf3c282/tools/apidoc/generatetoc.xsl
----------------------------------------------------------------------
diff --git a/tools/apidoc/generatetoc.xsl b/tools/apidoc/generatetoc.xsl
index 8f30de5..f06fa4b 100644
--- a/tools/apidoc/generatetoc.xsl
+++ b/tools/apidoc/generatetoc.xsl
@@ -25,7 +25,7 @@ version="1.0">
<body>
<table border="1" cellpadding="1" cellspacing="0.5">
<tr>
-<h1 ALIGN='CENTER'>Cloudstack API Version 2.2</h1>
+<h1 ALIGN='CENTER'>Cloudstack API Version 4.4.1</h1>
<br/>
<h2 ALIGN='CENTER'>Table of Contents</h2>
<th><h3>Name</h3></th>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1cf3c282/tools/apidoc/generatetoc_footer.xsl
----------------------------------------------------------------------
diff --git a/tools/apidoc/generatetoc_footer.xsl b/tools/apidoc/generatetoc_footer.xsl
index 93a8667..5995929 100644
--- a/tools/apidoc/generatetoc_footer.xsl
+++ b/tools/apidoc/generatetoc_footer.xsl
@@ -26,7 +26,7 @@ under the License.
<div id="footer">
<div id="footer_mainmaster">
- <p>Copyright © 2013 The Apache Software Foundation, Licensed under the
+ <p>Copyright © 2014 The Apache Software Foundation, Licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a> <br />
Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
</div>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1cf3c282/tools/apidoc/generatetoc_header.xsl
----------------------------------------------------------------------
diff --git a/tools/apidoc/generatetoc_header.xsl b/tools/apidoc/generatetoc_header.xsl
index 8ea0064..20cf459 100644
--- a/tools/apidoc/generatetoc_header.xsl
+++ b/tools/apidoc/generatetoc_header.xsl
@@ -52,12 +52,13 @@ version="1.0">
<div class="inside_apileftpanel">
<div class="inside_contentpanel" style="width:930px;">
<!-- Modify this line for the release version -->
- <h1>Apache CloudStack API Documentation (v4.2.0)</h1>
+ <h1>Apache CloudStack API Documentation (v4.4.1)</h1>
+ <a class="api_backbutton" href="http://cloudstack.apache.org/docs/api/"></a>
<div class="apiannouncement_box">
<div class="apiannouncement_contentarea">
<h3>Using the CloudStack API</h3>
<p>For information about how the APIs work, and tips on how to use them, see the
- <a href="http://cloudstack.apache.org/docs/">Developer's Guide</a>.</p>
+ <a href="http://docs.cloudstack.apache.org/en/latest/dev.html">Developer's Guide</a>.</p>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1cf3c282/tools/apidoc/generateusercommands.xsl
----------------------------------------------------------------------
diff --git a/tools/apidoc/generateusercommands.xsl b/tools/apidoc/generateusercommands.xsl
index 4fa1f86..8f64df1 100644
--- a/tools/apidoc/generateusercommands.xsl
+++ b/tools/apidoc/generateusercommands.xsl
@@ -57,7 +57,7 @@ version="1.0">
<xsl:for-each select="command/command">
<!-- Modify this line for the release version -->
<span>
- Apache CloudStack v4.2.0 User API Reference
+ Apache CloudStack v4.4.1 User API Reference
</span>
<p></p>
<h1><xsl:value-of select="name"/></h1>
@@ -142,7 +142,7 @@ version="1.0">
<div id="footer">
<div id="footer_mainmaster">
- <p>Copyright © 2013 The Apache Software Foundation, Licensed under the
+ <p>Copyright © 2014 The Apache Software Foundation, Licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a> <br />
Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
</div>