[2/3] git commit: updated refs/heads/vmware-disk-controllers to 1a8fe82

2015-01-10 Thread sateesh 
CLOUDSTACK-3439. [VMWARE] While preparing for migration, include dynamically 
created nics in case of VMware too.


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

Branch: refs/heads/vmware-disk-controllers
Commit: 4b67a48144402a3a43d51c869456d9268873b1b1
Parents: 82fa918
Author: Likitha Shetty 
Authored: Mon Jan 5 11:35:43 2015 +0530
Committer: Likitha Shetty 
Committed: Thu Jan 8 09:50:19 2015 +0530

--
 .../cloudstack/engine/orchestration/NetworkOrchestrator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b67a481/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
--
diff --git 
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
 
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 9feaa80..0c7b3ed 100644
--- 
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ 
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -1377,7 +1377,7 @@ public class NetworkOrchestrator extends ManagerBase 
implements NetworkOrchestra
 
 @Override
 public void prepareNicForMigration(VirtualMachineProfile vm, 
DeployDestination dest) {
-if(vm.getType().equals(VirtualMachine.Type.DomainRouter) && 
vm.getHypervisorType().equals(HypervisorType.KVM)){
+if(vm.getType().equals(VirtualMachine.Type.DomainRouter) && 
(vm.getHypervisorType().equals(HypervisorType.KVM) || 
vm.getHypervisorType().equals(HypervisorType.VMware))) {
 //Include nics hot plugged and not stored in DB
 prepareAllNicsForMigration(vm, dest);
 return;

[1/3] git commit: updated refs/heads/vmware-disk-controllers to 1a8fe82

2015-01-10 Thread sateesh 
Repository: cloudstack
Updated Branches:
  refs/heads/vmware-disk-controllers 85bd96c6b -> 1a8fe8258


UI validation: Fix asterisk showing up on non-required fields


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

Branch: refs/heads/vmware-disk-controllers
Commit: 82fa9184bfe5f59443a101e1008d57ce77cce53a
Parents: 85bd96c
Author: Brian Federle 
Authored: Wed Jan 7 08:46:59 2015 -0800
Committer: Brian Federle 
Committed: Wed Jan 7 08:49:27 2015 -0800

--
 ui/scripts/ui/dialog.js | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/82fa9184/ui/scripts/ui/dialog.js
--
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index e5ac14b..051759f 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -193,11 +193,12 @@
 );
 
 // red asterisk
-var $astersikSpan = 
$('').addClass('field-required').html('*');
-$name.find('label').prepend($astersikSpan);
+var $asterisk = 
$('').addClass('field-required').html('*');
 
-if (field.validation == null || field.validation.required == 
false) {
-$astersikSpan.hide();
+$name.find('label').prepend($asterisk);
+
+if (field.validation == null || !field.validation.required) {
+$asterisk.hide();
 }
 
 // Tooltip description

[3/3] git commit: updated refs/heads/vmware-disk-controllers to 1a8fe82

2015-01-10 Thread sateesh 
no extranous log4j files


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

Branch: refs/heads/vmware-disk-controllers
Commit: 1a8fe825801865e35ea43e79bcf4d6dc606ecf1d
Parents: 4b67a48
Author: Daan Hoogland 
Authored: Thu Jan 8 17:36:17 2015 +0100
Committer: Daan Hoogland 
Committed: Thu Jan 8 17:36:17 2015 +0100

--
 plugins/hypervisors/hyperv/conf/log4j-cloud.xml | 93 
 plugins/hypervisors/hyperv/conf/log4j.xml   | 93 
 2 files changed, 186 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a8fe825/plugins/hypervisors/hyperv/conf/log4j-cloud.xml
--
diff --git a/plugins/hypervisors/hyperv/conf/log4j-cloud.xml 
b/plugins/hypervisors/hyperv/conf/log4j-cloud.xml
deleted file mode 100644
index 1e97ce9..000
--- a/plugins/hypervisors/hyperv/conf/log4j-cloud.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-http://jakarta.apache.org/log4j/"; 
debug="false">
-
-   
-   
-   
-
-   
-   
-  
-  
-  
-
-
-  
-  
- 
-  
-   
-   
-   
-   
-   
-
-   
-  
-  
-
-  
- 
-  
-   
-
-   
-   
-   
-
-   
- 
-   
-   
-   
- 
-   
-   
-   
- 
-   
-
-   
-   
-  
-   
-
-   
-  
-   
-   
-   
- 
-   
-
-   
-   
-   
-
-   
-  
-  
-  
-   
-
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a8fe825/plugins/hypervisors/hyperv/conf/log4j.xml
--
diff --git a/plugins/hypervisors/hyperv/conf/log4j.xml 
b/plugins/hypervisors/hyperv/conf/log4j.xml
deleted file mode 100644
index 1e97ce9..000
--- a/plugins/hypervisors/hyperv/conf/log4j.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-http://jakarta.apache.org/log4j/"; 
debug="false">
-
-   
-   
-   
-
-   
-   
-  
-  
-  
-
-
-  
-  
- 
-  
-   
-   
-   
-   
-   
-
-   
-  
-  
-
-  
- 
-  
-   
-
-   
-   
-   
-
-   
- 
-   
-   
-   
- 
-   
-   
-   
- 
-   
-
-   
-   
-  
-   
-
-   
-  
-   
-   
-   
- 
-   
-
-   
-   
-   
-
-   
-  
-  
-  
-   
-
-