etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into api_refactoring 

Conflicts:
	client/tomcatconf/commands.properties.in

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2013-01-03 23:27:42 -08:00
parent 6929bd9473 42f3804fbd
commit 85e73a640e
8 changed files with 34 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
awsapi/pom.xml
View File

@ -47,6 +47,12 @@
<artifactId>axis2-webapp</artifactId>
<type>war</type>
<version>${cs.axis2.version}</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
@ -123,6 +129,10 @@
<groupId>org.apache.xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
<exclusion>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -139,6 +149,10 @@
<groupId>org.apache.xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
<exclusion>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -151,6 +165,10 @@
<groupId>org.apache.xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
<exclusion>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -163,6 +181,10 @@
<groupId>org.apache.xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
<exclusion>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -175,6 +197,10 @@
<groupId>org.apache.xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
<exclusion>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>

2
client/tomcatconf/commands.properties.in
View File

@ -261,7 +261,7 @@ migrateVolume=org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;15
#### use that key...the key is stored in the db associated w/
#### the userId...every request to the developer API should be
#### checked against the key
registerUserKeys=org.apache.cloudstack.api.command.admin.user.RegisterCmd;1
registerUserKeys=org.apache.cloudstack.api.command.admin.user.RegisterCmd;15
### async-query command
queryAsyncJobResult=org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;15

2
docs/en-US/changing-secondary-storage-servers.xml
View File

@ -22,7 +22,7 @@
under the License.
-->
<section id="changing-secondary-storage-serversp">
<section id="changing-secondary-storage-servers">
<title>Changing Secondary Storage Servers</title>
<para>You can change the secondary storage NFS mount. Perform the following steps to do so:</para>
<orderedlist>

36
docs/en-US/changing-secondary-storage-serversp.xml
View File

@ -1,36 +0,0 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
<!-- Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<section id="changing-secondary-storage-serversp">
<title>Changing Secondary Storage Servers</title>
<para>You can change the secondary storage NFS mount. Perform the following steps to do so:</para>
<orderedlist>
<listitem><para>Stop all running Management Servers.</para></listitem>
<listitem><para>Wait 30 minutes. This allows any writes to secondary storage to complete.</para></listitem>
<listitem><para>Copy all files from the old secondary storage mount to the new.</para></listitem>
<listitem><para>Use the procedure above to change the IP address for secondary storage if required.</para></listitem>
<listitem><para>Start the Management Server.</para></listitem>
</orderedlist>
</section>

29
docs/en-US/configure-xenserver-dom-memory.xml
View File

@ -1,29 +0,0 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
<!-- Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<section id="configure-xenserver-dom0-memory">
<title>Configure XenServer dom0 Memory</title>
<para>Configure the XenServer dom0 settings to allocate more memory to dom0. This can enable XenServer to handle larger numbers of virtual machines. We recommend 2940 MB of RAM for XenServer dom0. For instructions on how to do this, see <ulink url="http://support.citrix.com/article/CTX126531">Citrix Knowledgebase Article</ulink>.The article refers to XenServer 5.6, but the same information applies to XenServer 6</para>
</section>

2
scripts/vm/network/vnet/modifyvlan.sh
View File

@ -67,6 +67,8 @@ addVlan() {
return 2
fi
fi
brctl setfd $vlanBr 0
fi
#pif is eslaved into vlanBr?

6
test/integration/component/test_snapshots.py
View File

@ -582,7 +582,7 @@ class TestSnapshots(cloudstackTestCase):
return
@attr(speed = "slow")
@attr(tags = ["advanced", "advancedns", "smoke"])
@attr(tags = ["advanced", "advancedns", "smoke", "xen"])
def test_03_volume_from_snapshot(self):
"""Create volumes from snapshots
"""
@ -995,7 +995,7 @@ class TestSnapshots(cloudstackTestCase):
return
@attr(speed = "slow")
@attr(tags = ["advanced", "advancedns", "smoke"])
@attr(tags = ["advanced", "advancedns", "smoke", "xen"])
def test_07_template_from_snapshot(self):
"""Create Template from snapshot
"""
@ -1901,7 +1901,7 @@ class TestSnapshotDetachedDisk(cloudstackTestCase):
return
@attr(speed = "slow")
@attr(tags = ["advanced", "advancedns"])
@attr(tags = ["advanced", "advancedns", "xen"])
def test_03_snapshot_detachedDisk(self):
"""Test snapshot from detached disk
"""

1
ui/scripts/accounts.js
View File

@ -1282,6 +1282,7 @@
} else {
if(isSelfOrChildDomainUser(jsonObj.username, jsonObj.accounttype, jsonObj.domainid, jsonObj.iscallerchilddomain)) {
allowedActions.push("changePassword");
allowedActions.push("generateKeys");
}
}
return allowedActions;