You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2017/01/12 17:15:24 UTC
[1/2] ambari git commit: AMBARI-19464. Stack Downgrading Potentially
Corrupts Kerberos Descriptor. Fix imports (echekanskiy via dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 af00bc6d4 -> 6adc8bb9c
refs/heads/trunk e3587d555 -> a7280dd89
AMBARI-19464. Stack Downgrading Potentially Corrupts Kerberos Descriptor. Fix imports (echekanskiy via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6adc8bb9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6adc8bb9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6adc8bb9
Branch: refs/heads/branch-2.5
Commit: 6adc8bb9c1c79f4e619d9df6b255868fcaf7faab
Parents: af00bc6
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Thu Jan 12 19:11:07 2017 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Thu Jan 12 19:11:07 2017 +0200
----------------------------------------------------------------------
.../server/orm/entities/ArtifactEntity.java | 1 -
.../UpgradeUserKerberosDescriptorTest.java | 22 ++++++++++++--------
2 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6adc8bb9/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java
index eeda7d4..4d5e2ac 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java
@@ -31,7 +31,6 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Collections;
import java.util.Map;
-import java.util.TreeMap;
/**
* Entity representing an Artifact.
http://git-wip-us.apache.org/repos/asf/ambari/blob/6adc8bb9/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java
index 9e2080b..cc6f0fa 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java
@@ -17,14 +17,6 @@
*/
package org.apache.ambari.server.serveraction.upgrades;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.assertEquals;
-
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-
import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper;
import org.apache.ambari.server.actionmanager.HostRoleCommand;
import org.apache.ambari.server.agent.ExecutionCommand;
@@ -40,12 +32,24 @@ import org.easymock.Capture;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
-
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.anyString;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+
/**
* Tests OozieConfigCalculation logic
*/
[2/2] ambari git commit: AMBARI-19464. Stack Downgrading Potentially
Corrupts Kerberos Descriptor. Fix imports (echekanskiy via dlysnichenko)
Posted by dm...@apache.org.
AMBARI-19464. Stack Downgrading Potentially Corrupts Kerberos Descriptor. Fix imports (echekanskiy via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a7280dd8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a7280dd8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a7280dd8
Branch: refs/heads/trunk
Commit: a7280dd89298814925f7a7ad71225d2dee46dacb
Parents: e3587d5
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Thu Jan 12 19:14:17 2017 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Thu Jan 12 19:14:17 2017 +0200
----------------------------------------------------------------------
.../server/orm/entities/ArtifactEntity.java | 8 +++----
.../UpgradeUserKerberosDescriptorTest.java | 22 ++++++++++++--------
2 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a7280dd8/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java
index d06d985..4d5e2ac 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java
@@ -18,9 +18,7 @@
package org.apache.ambari.server.orm.entities;
-import java.util.Collections;
-import java.util.Map;
-import java.util.TreeMap;
+import com.google.gson.Gson;
import javax.persistence.Basic;
import javax.persistence.Column;
@@ -31,8 +29,8 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Transient;
-
-import com.google.gson.Gson;
+import java.util.Collections;
+import java.util.Map;
/**
* Entity representing an Artifact.
http://git-wip-us.apache.org/repos/asf/ambari/blob/a7280dd8/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java
index 9e2080b..cc6f0fa 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java
@@ -17,14 +17,6 @@
*/
package org.apache.ambari.server.serveraction.upgrades;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.assertEquals;
-
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-
import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper;
import org.apache.ambari.server.actionmanager.HostRoleCommand;
import org.apache.ambari.server.agent.ExecutionCommand;
@@ -40,12 +32,24 @@ import org.easymock.Capture;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
-
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.anyString;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+
/**
* Tests OozieConfigCalculation logic
*/