cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject git commit: updated refs/heads/master to 415631a
Date Fri, 25 Sep 2015 09:45:43 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 6841ba61d -> 415631ab5


Revert "Merge pull request #884 from wido/test-tmp-dir"

This reverts commit 6841ba61da5e407f7a16c4a575d1a4e8c8345970, reversing
changes made to 13b29bac5a1778e295df7e9fb21c502fcf017183.

Master is currently frozen, no merges without RM approval.
http://mail-archives.apache.org/mod_mbox/cloudstack-dev/201509.mbox/browser

It also broke the build:
[INFO] Apache CloudStack Framework - Jobs ................ SUCCESS [3.448s]
[INFO] Apache CloudStack Cloud Engine Internal Components API  SUCCESS [2.528s]
[INFO] Apache CloudStack Server .......................... FAILURE [24.769s]
[INFO] Apache CloudStack Usage Server .................... SKIPPED


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/415631ab
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/415631ab
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/415631ab

Branch: refs/heads/master
Commit: 415631ab58d9e38e66bf07a1f101a455245fa33b
Parents: 6841ba6
Author: Remi Bergsma <github@remi.nl>
Authored: Fri Sep 25 11:41:03 2015 +0200
Committer: Remi Bergsma <github@remi.nl>
Committed: Fri Sep 25 11:41:03 2015 +0200

----------------------------------------------------------------------
 .../com/cloud/storage/template/LocalTemplateDownloaderTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/415631ab/core/test/com/cloud/storage/template/LocalTemplateDownloaderTest.java
----------------------------------------------------------------------
diff --git a/core/test/com/cloud/storage/template/LocalTemplateDownloaderTest.java b/core/test/com/cloud/storage/template/LocalTemplateDownloaderTest.java
index b685e4c..74d1adc 100644
--- a/core/test/com/cloud/storage/template/LocalTemplateDownloaderTest.java
+++ b/core/test/com/cloud/storage/template/LocalTemplateDownloaderTest.java
@@ -31,7 +31,7 @@ public class LocalTemplateDownloaderTest {
     @Test
     public void localTemplateDownloaderTest() {
         String url =  "file://" + new File("pom.xml").getAbsolutePath();
-        TemplateDownloader td = new LocalTemplateDownloader(null, url, System.getProperty("java.io.tmpdir"),
TemplateDownloader.DEFAULT_MAX_TEMPLATE_SIZE_IN_BYTES, null);
+        TemplateDownloader td = new LocalTemplateDownloader(null, url, "/tmp", TemplateDownloader.DEFAULT_MAX_TEMPLATE_SIZE_IN_BYTES,
null);
         long bytes = td.download(true, null);
         if (!(bytes > 0)) {
             fail("Failed download");


Mime
View raw message