Updated Branches: refs/heads/javelin d7bc09f95 -> 8a9cf0400
Fixing the file that was merged incorrectly Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8a9cf040 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8a9cf040 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8a9cf040 Branch: refs/heads/javelin Commit: 8a9cf04008fbf90d19eee6bdb5d06a1c06fb3734 Parents: 1bdec94 Author: Prachi Damle <[email protected]> Authored: Thu Jan 3 10:42:30 2013 -0800 Committer: Prachi Damle <[email protected]> Committed: Thu Jan 3 11:44:40 2013 -0800 ---------------------------------------------------------------------- .../engine/datacenter/entity/api/ZoneEntity.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8a9cf040/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java ---------------------------------------------------------------------- diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java index ae789ea..5bf3554 100755 --- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java @@ -25,14 +25,14 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.xml.bind.annotation.XmlRootElement; - +import org.apache.cloudstack.engine.service.api.ProvisioningService; +import org.apache.cloudstack.framework.ws.jackson.Url; /** * Describes a zone and operations that can be done in a zone. */ @Path("/zone/{zoneid}") @Produces({"application/json"}) @XmlRootElement(name="zone") -@Path("zone/{zone-id}") public interface ZoneEntity extends DataCenterResourceEntity { @GET @Path("/pods")
