You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by ra...@apache.org on 2021/02/26 00:14:13 UTC

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

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 {