cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject [1/3] git commit: updated refs/heads/baremetal-4.2 to f5e67e7
Date Fri, 21 Jun 2013 01:48:00 GMT
Updated Branches:
  refs/heads/baremetal-4.2 0293875e0 -> f5e67e7c0


Baremetal: Fix typo of BaremetaUserdataProvider

Should be "Baremetal" rather than "Baremeta"


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

Branch: refs/heads/baremetal-4.2
Commit: 83c95656fd38ce8397f43feaf3d10c606a2e9ec9
Parents: 0293875
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Wed Jun 19 16:42:24 2013 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Thu Jun 20 17:42:09 2013 -0700

----------------------------------------------------------------------
 .../com/cloud/baremetal/networkservice/BaremetalPxeManager.java    | 2 +-
 server/src/com/cloud/network/NetworkServiceImpl.java               | 2 +-
 ui/scripts/zoneWizard.js                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83c95656/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManager.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManager.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManager.java
index e0a5162..2dd26bc 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManager.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManager.java
@@ -61,5 +61,5 @@ public interface BaremetalPxeManager extends Manager, PluggableService {
 	public static final String BAREMETAL_PXE_CAPABILITY = "BaremetalPxe";
 	public static final String BAREMETAL_PXE_SERVICE_PROPERTIES = "baremetalpxe_commands.properties";
 	public static final Provider BAREMETAL_PXE_SERVICE_PROVIDER = new Provider("BaremetalPxeProvider",
true);;
-	public static final Provider BAREMETAL_USERDATA_PROVIDER = new Provider("BaremetaUserdataProvider",
true);
+	public static final Provider BAREMETAL_USERDATA_PROVIDER = new Provider("BaremetalUserdataProvider",
true);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83c95656/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index 6ede914..0cef49c 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -3754,7 +3754,7 @@ public class NetworkServiceImpl extends ManagerBase implements  NetworkService
{
 
             addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalDhcpProvider", null,
null);
             addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalPxeProvider", null,
null);
-            addProviderToPhysicalNetwork(physicalNetworkId, "BaremetaUserdataProvider", null,
null);
+            addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalUserdataProvider",
null, null);
         }
         return null;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83c95656/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 046b122..fb01dc7 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -24,7 +24,7 @@
   var configurationUseLocalStorage = false;
 	var skipGuestTrafficStep = false;
   var selectedNetworkOfferingObj = {};
-	var baremetalProviders = ["BaremetalDhcpProvider", "BaremetalPxeProvider", "BaremetaUserdataProvider"];
+	var baremetalProviders = ["BaremetalDhcpProvider", "BaremetalPxeProvider", "BaremetalUserdataProvider"];
 	var selectedBaremetalProviders = [];
 	
   // Makes URL string for traffic label


Mime
View raw message