Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AMBARI-25171. Backport Knox Trusted Proxy changes into 2.7.4 (amagyar) #2854

Merged
merged 1 commit into from Mar 12, 2019

Conversation

zeroflag
Copy link
Contributor

@zeroflag zeroflag commented Mar 8, 2019

What changes were proposed in this pull request?

Backport of #2682 #2702 #2665 #2683

How was this patch tested?

Manually with:

 curl -k -i -u sam:sam-password -X GET https://localhost:8443/gateway/default/ambari/api/v1/users

@zeroflag zeroflag self-assigned this Mar 8, 2019
@asfgit
Copy link

asfgit commented Mar 8, 2019

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/Ambari-Github-PullRequest-Builder/4980/
Test FAILed.
Test FAILured.

@zeroflag
Copy link
Contributor Author

zeroflag commented Mar 8, 2019

retest this please

@asfgit
Copy link

asfgit commented Mar 8, 2019

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/Ambari-Github-PullRequest-Builder/4981/
Test PASSed.

@zeroflag
Copy link
Contributor Author

zeroflag commented Mar 8, 2019

cc: @g-boros

@zeroflag zeroflag merged commit 1529ef2 into apache:branch-2.7 Mar 12, 2019
@zeroflag zeroflag deleted the AMBARI-25171-branch-2.7 branch March 12, 2019 09:04
payert pushed a commit to payert/ambari that referenced this pull request Apr 16, 2020
apache#2854)

(cherry picked from commit 1529ef2)

Conflicts:
	ambari-server/src/main/java/org/apache/ambari/server/configuration/AmbariServerConfigurationKey.java
	ambari-server/src/main/java/org/apache/ambari/server/configuration/AmbariServerConfigurationProvider.java
	ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapConfigurationProvider.java
	ambari-server/src/main/java/org/apache/ambari/server/security/authentication/jwt/JwtAuthenticationPropertiesProvider.java
	ambari-server/src/main/java/org/apache/ambari/server/security/authentication/tproxy/AmbariTProxyConfigurationProvider.java
	ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java
	ambari-server/src/test/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnableTest.java
	ambari-server/src/test/java/org/apache/ambari/server/alerts/AmbariPerformanceRunnableTest.java
	ambari-server/src/test/java/org/apache/ambari/server/alerts/StaleAlertRunnableTest.java
	ambari-server/src/test/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelperTest.java
	ambari-server/src/test/java/org/apache/ambari/server/configuration/AmbariServerConfigurationProviderTest.java
	ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
	ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java
	ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOCachedTest.java
	ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
	ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/PreconfigureKerberosActionTest.java
	ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
	ambari-server/src/test/java/org/apache/ambari/server/state/services/CachedAlertFlushServiceTest.java
	ambari-server/src/test/java/org/apache/ambari/server/update/HostUpdateHelperTest.java
	ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog251Test.java
	ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog252Test.java
	ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog270Test.java

Change-Id: I72d1b9f87341f2f7384d63fed06d054c03046f47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
3 participants