Merge branch 'master' into api_refactoring

yadvr · yadvr · commit 85e73a640efa · 2013-01-03T23:27:42.000-08:00
Conflicts:
	client/tomcatconf/commands.properties.in

Signed-off-by: Rohit Yadav &lt;bhaisaab@apache.org&gt;
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
@@ -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>
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
@@ -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
diff --git a/docs/en-US/changing-secondary-storage-servers.xml b/docs/en-US/changing-secondary-storage-servers.xml
@@ -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>
diff --git a/docs/en-US/changing-secondary-storage-serversp.xml b/docs/en-US/changing-secondary-storage-serversp.xml
diff --git a/docs/en-US/configure-xenserver-dom-memory.xml b/docs/en-US/configure-xenserver-dom-memory.xml
diff --git a/scripts/vm/network/vnet/modifyvlan.sh b/scripts/vm/network/vnet/modifyvlan.sh
@@ -67,6 +67,8 @@ addVlan() {
 				return 2
 			fi
 		fi
+
+		brctl setfd $vlanBr 0
 	fi
 	
 	#pif is eslaved into vlanBr?
diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py
@@ -582,7 +582,7 @@ def test_02_snapshot_data_disk(self):
         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 @@ def test_06_recurring_snapshot_data_disk(self):
         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 @@ def tearDown(self):
         return
 
     @attr(speed = "slow")
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(tags = ["advanced", "advancedns", "xen"])
     def test_03_snapshot_detachedDisk(self):
         """Test snapshot from detached disk
         """
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
@@ -1282,6 +1282,7 @@
     } else {
         if(isSelfOrChildDomainUser(jsonObj.username, jsonObj.accounttype, jsonObj.domainid, jsonObj.iscallerchilddomain)) {
             allowedActions.push("changePassword");
+            allowedActions.push("generateKeys");
         }
     }
     return allowedActions;

Original file line number	Diff line number	Diff line change
`@@ -1282,6 +1282,7 @@`
`1282`	`1282`	`} else {`
`1283`	`1283`	`if(isSelfOrChildDomainUser(jsonObj.username, jsonObj.accounttype, jsonObj.domainid, jsonObj.iscallerchilddomain)) {`
`1284`	`1284`	`allowedActions.push("changePassword");`
	`1285`	`+ allowedActions.push("generateKeys");`
`1285`	`1286`	`}`
`1286`	`1287`	`}`
`1287`	`1288`	`return allowedActions;`