[cloudstack] branch 4.14 updated (3b5f99a -> 7be87f1)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rafael pushed a change to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from 3b5f99a  kvm: Prevent KVM from performing volume migrations of running instances (#4562)
     add e1f3179  Adjust tests to fix a problem with the container builders (https://github.com/khos2ow/cloudstack-deb-builder) (#4668)
     new 7be87f1  Merge forward PR#4668 of Branch 4.13 on branch 4.14

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/cloudstack/ca/provider/RootCAProviderTest.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

[cloudstack] 01/01: Merge forward PR#4668 of Branch 4.13 on branch 4.14

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rafael pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 7be87f1cf8292493ae87f937911548d5de799b64
Merge: 3b5f99a e1f3179
Author: Rafael Weingärtner <ra...@apache.org>
AuthorDate: Thu Feb 25 21:01:18 2021 -0300

    Merge forward PR#4668 of Branch 4.13 on branch 4.14

 .../apache/cloudstack/ca/provider/RootCAProviderTest.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --cc plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
index 04aba36,1f16360..f9fd531
--- a/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
+++ b/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
@@@ -41,7 -41,8 +41,10 @@@ import org.junit.Assert
  import org.junit.Before;
  import org.junit.Test;
  import org.junit.runner.RunWith;
++
 +import org.mockito.junit.MockitoJUnitRunner;
+ import org.mockito.Mockito;
 -import org.mockito.runners.MockitoJUnitRunner;
++
  
  @RunWith(MockitoJUnitRunner.class)
  public class RootCAProviderTest {