You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/01/07 19:39:02 UTC
[6/6] git commit: Sync updates: Merge branch 'master' into
api_refactoring
Updated Branches:
refs/heads/api_refactoring 13de3ca25 -> a948a8937
Sync updates: Merge branch 'master' into api_refactoring
Conflicts:
server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java
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/a948a893
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a948a893
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a948a893
Branch: refs/heads/api_refactoring
Commit: a948a89378862f7a0e0cb7c3c7e0e92f840685c6
Parents: 13de3ca d5ac10d
Author: Rohit Yadav <bh...@apache.org>
Authored: Mon Jan 7 10:38:43 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Mon Jan 7 10:38:43 2013 -0800
----------------------------------------------------------------------
.../hypervisor/vmware/resource/VmwareResource.java | 49 +++++++--------
.../cloud/api/commands/AddTrafficMonitorCmd.java | 3 +-
.../cloud/api/commands/ListTrafficMonitorsCmd.java | 3 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 18 ++++--
ui/scripts/accounts.js | 2 +
5 files changed, 40 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a948a893/server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
index 98e893e,df9df82..fdbbbe4
--- a/server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
+++ b/server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
@@@ -25,13 -28,12 +25,12 @@@ import com.cloud.exception.InvalidParam
import com.cloud.host.Host;
import com.cloud.network.NetworkUsageManager;
import com.cloud.server.ManagementService;
- import org.apache.cloudstack.api.response.ExternalFirewallResponse;
-import com.cloud.server.api.response.TrafficMonitorResponse;
+import org.apache.cloudstack.api.response.TrafficMonitorResponse;
import com.cloud.user.Account;
import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.exception.CloudRuntimeException;
- @APICommand(name = "addTrafficMonitor", description="Adds Traffic Monitor Host for Direct Network Usage", responseObject = ExternalFirewallResponse.class)
-@Implementation(description="Adds Traffic Monitor Host for Direct Network Usage", responseObject = TrafficMonitorResponse.class)
++@APICommand(name = "addTrafficMonitor", description="Adds Traffic Monitor Host for Direct Network Usage", responseObject = TrafficMonitorResponse.class)
public class AddTrafficMonitorCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddTrafficMonitorCmd.class.getName());
private static final String s_name = "addtrafficmonitorresponse";
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a948a893/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java
index ccbcec9,8dd0139..21ad339
--- a/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java
+++ b/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java
@@@ -31,11 -30,10 +31,10 @@@ import org.apache.cloudstack.api.respon
import com.cloud.host.Host;
import com.cloud.network.NetworkUsageManager;
import com.cloud.server.ManagementService;
- import org.apache.cloudstack.api.response.ExternalFirewallResponse;
-import com.cloud.server.api.response.TrafficMonitorResponse;
+import org.apache.cloudstack.api.response.TrafficMonitorResponse;
import com.cloud.utils.component.ComponentLocator;
- @APICommand(name = "listTrafficMonitors", description="List traffic monitor Hosts.", responseObject = ExternalFirewallResponse.class)
-@Implementation(description="List traffic monitor Hosts.", responseObject = TrafficMonitorResponse.class)
++@APICommand(name = "listTrafficMonitors", description="List traffic monitor Hosts.", responseObject = TrafficMonitorResponse.class)
public class ListTrafficMonitorsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListServiceOfferingsCmd.class.getName());
private static final String s_name = "listtrafficmonitorsresponse";
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a948a893/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------