You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/01/09 14:26:47 UTC
[47/50] [abbrv] git commit: plugins: Fix getPropertiesFiles() for
pluggable service plugins, CiscoNexusVSMEElement
plugins: Fix getPropertiesFiles() for pluggable service plugins, CiscoNexusVSMEElement
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2eee2cd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2eee2cd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2eee2cd9
Branch: refs/heads/javelin
Commit: 2eee2cd999889d105395621eb1f22103ca6f51c5
Parents: 0b0752f
Author: Rohit Yadav <bh...@apache.org>
Authored: Wed Jan 9 04:56:32 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Wed Jan 9 04:56:32 2013 -0800
----------------------------------------------------------------------
.../discovery/ApiDiscoveryServiceImpl.java | 4 ++--
.../network/element/CiscoNexusVSMElement.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2eee2cd9/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
----------------------------------------------------------------------
diff --git a/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java b/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
index ca57df5..5363e55 100644
--- a/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
+++ b/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
@@ -139,6 +139,6 @@ public class ApiDiscoveryServiceImpl extends AdapterBase implements ApiDiscovery
@Override
public String[] getPropertiesFiles() {
- return new String[]{"api-discovery_commands.properties"};
+ return new String[] { "api-discovery_commands.properties" };
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2eee2cd9/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
index b9567dc..911078e 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
@@ -237,7 +237,7 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme
}
@Override
- public String getPropertiesFile() {
- return "cisconexusvsm_commands.properties";
+ public String[] getPropertiesFiles() {
+ return new String[] { "cisconexusvsm_commands.properties" };
}
}