You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/04/12 16:28:22 UTC
git commit: updated refs/heads/4.1 to 6a5f61a
Updated Branches:
refs/heads/4.1 5954284ec -> 6a5f61a48
Revert "Fixed Primary typo"
This reverts commit 322eae5429bf38f5370c8b2c19f2ce825828ea99.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a5f61a4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a5f61a4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a5f61a4
Branch: refs/heads/4.1
Commit: 6a5f61a487c24ef95bebf34e6e8d6697ef4ff1e4
Parents: 5954284
Author: Chip Childers <ch...@gmail.com>
Authored: Fri Apr 12 15:27:37 2013 +0100
Committer: Chip Childers <ch...@gmail.com>
Committed: Fri Apr 12 15:27:37 2013 +0100
----------------------------------------------------------------------
.../classes/resources/messages_de_DE.properties | 2 +-
.../cloudstack/storage/test/DirectAgentTest.java | 4 ++--
.../command/CreateVolumeFromBaseImageCommand.java | 6 +++---
.../storage/to/ImageOnPrimayDataStoreTO.java | 4 ++--
.../xen/resource/XenServerStorageResource.java | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a5f61a4/client/WEB-INF/classes/resources/messages_de_DE.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_de_DE.properties b/client/WEB-INF/classes/resources/messages_de_DE.properties
index c89377b..5c7fc63 100644
--- a/client/WEB-INF/classes/resources/messages_de_DE.properties
+++ b/client/WEB-INF/classes/resources/messages_de_DE.properties
@@ -381,7 +381,7 @@ label.installWizard.addHostIntro.subtitle=Was ist ein host?
label.installWizard.addHostIntro.title=host hinzuf\u00FCgen
label.installWizard.addPodIntro.subtitle=Was ist ein pod?
label.installWizard.addPodIntro.title=pod hinzuf\u00FCgen
-label.installWizard.addPrimaryStorageIntro.subtitle=Was ist primary storage?
+label.installWizard.addPrimaryStorageIntro.subtitle=Was ist primay storage?
label.installWizard.addPrimaryStorageIntro.title=primary storage hinzuf\u00FCgen
label.installWizard.addSecondaryStorageIntro.subtitle=Was ist secondary storage?
label.installWizard.addSecondaryStorageIntro.title=secondary storage
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a5f61a4/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
index fc4aea8..2d6b94f 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
@@ -23,7 +23,7 @@ import java.util.UUID;
import javax.inject.Inject;
import org.apache.cloudstack.storage.to.ImageDataStoreTO;
-import org.apache.cloudstack.storage.to.ImageOnPrimaryDataStoreTO;
+import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO;
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
import org.apache.cloudstack.storage.to.TemplateTO;
import org.mockito.Mockito;
@@ -126,7 +126,7 @@ public class DirectAgentTest extends CloudStackTestNGBase {
@Test
public void testDownloadTemplate() {
- ImageOnPrimaryDataStoreTO image = Mockito.mock(ImageOnPrimaryDataStoreTO.class);
+ ImageOnPrimayDataStoreTO image = Mockito.mock(ImageOnPrimayDataStoreTO.class);
PrimaryDataStoreTO primaryStore = Mockito.mock(PrimaryDataStoreTO.class);
Mockito.when(primaryStore.getUuid()).thenReturn(this.getLocalStorageUuid());
Mockito.when(image.getPrimaryDataStore()).thenReturn(primaryStore);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a5f61a4/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java b/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
index 1734bc4..f4be067 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
@@ -18,14 +18,14 @@
*/
package org.apache.cloudstack.storage.command;
-import org.apache.cloudstack.storage.to.ImageOnPrimaryDataStoreTO;
+import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO;
import org.apache.cloudstack.storage.to.VolumeTO;
import com.cloud.agent.api.Command;
public class CreateVolumeFromBaseImageCommand extends Command implements StorageSubSystemCommand {
private final VolumeTO volume;
- private final ImageOnPrimaryDataStoreTO image;
+ private final ImageOnPrimayDataStoreTO image;
public CreateVolumeFromBaseImageCommand(VolumeTO volume, String image) {
this.volume = volume;
@@ -36,7 +36,7 @@ public class CreateVolumeFromBaseImageCommand extends Command implements Storage
return this.volume;
}
- public ImageOnPrimaryDataStoreTO getImage() {
+ public ImageOnPrimayDataStoreTO getImage() {
return this.image;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a5f61a4/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java b/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
index a9a3cc4..18743d7 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
@@ -20,11 +20,11 @@ package org.apache.cloudstack.storage.to;
import org.apache.cloudstack.storage.volume.TemplateOnPrimaryDataStoreInfo;
-public class ImageOnPrimaryDataStoreTO {
+public class ImageOnPrimayDataStoreTO {
private final String pathOnPrimaryDataStore;
private PrimaryDataStoreTO dataStore;
private final TemplateTO template;
- public ImageOnPrimaryDataStoreTO(TemplateOnPrimaryDataStoreInfo template) {
+ public ImageOnPrimayDataStoreTO(TemplateOnPrimaryDataStoreInfo template) {
this.pathOnPrimaryDataStore = template.getPath();
//this.dataStore = template.getPrimaryDataStore().getDataStoreTO();
this.template = new TemplateTO(template.getTemplate());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a5f61a4/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
index fd0845b..70660d2 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
@@ -39,7 +39,7 @@ import org.apache.cloudstack.storage.command.CreatePrimaryDataStoreCmd;
import org.apache.cloudstack.storage.command.CreateVolumeFromBaseImageCommand;
import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
import org.apache.cloudstack.storage.datastore.protocol.DataStoreProtocol;
-import org.apache.cloudstack.storage.to.ImageOnPrimaryDataStoreTO;
+import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO;
import org.apache.cloudstack.storage.to.VolumeTO;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -206,7 +206,7 @@ public class XenServerStorageResource {
protected Answer execute(CreateVolumeFromBaseImageCommand cmd) {
VolumeTO volume = cmd.getVolume();
- ImageOnPrimaryDataStoreTO baseImage = cmd.getImage();
+ ImageOnPrimayDataStoreTO baseImage = cmd.getImage();
Connection conn = hypervisorResource.getConnection();
try {