Updated Branches: refs/heads/4.2 c498d2d78 -> fbb6df74f
CLOUDSTACK-4163: Get QuickCloud working again The object store work broke changed the expected behavior of the NfsSecondaryStorageResource Signed-off-by: Chiradeep Vittal <chirad...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fbb6df74 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fbb6df74 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fbb6df74 Branch: refs/heads/4.2 Commit: fbb6df74ff9410f0cf65eece2925c872da8bddb5 Parents: c498d2d Author: Donal Lafferty <donal.laffe...@citrix.com> Authored: Wed Aug 7 11:21:24 2013 -0700 Committer: Chiradeep Vittal <chirad...@apache.org> Committed: Wed Aug 7 14:14:50 2013 -0700 ---------------------------------------------------------------------- .../cloudstack/storage/resource/NfsSecondaryStorageResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fbb6df74/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java ---------------------------------------------------------------------- diff --git a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index 89ce8e0..0da9451 100755 --- a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -1366,7 +1366,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S private Answer execute(ListTemplateCommand cmd) { if (!_inSystemVM) { - return new Answer(cmd, true, null); + return new ListTemplateAnswer(null, null); } DataStoreTO store = cmd.getDataStore(); @@ -1391,7 +1391,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S private Answer execute(ListVolumeCommand cmd) { if (!_inSystemVM) { - return new Answer(cmd, true, null); + return new ListVolumeAnswer(cmd.getSecUrl(), null); } DataStoreTO store = cmd.getDataStore(); if (store instanceof NfsTO) {
