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

Fix #35741 #35796

Merged
merged 1 commit into from
Aug 26, 2016
Merged

Fix #35741 #35796

merged 1 commit into from
Aug 26, 2016

Conversation

fix7
Copy link
Contributor

@fix7 fix7 commented Aug 26, 2016

What does this PR do?

Correct use of HTTP credentials in modjk execution module,

What issues does this PR fix or reference?

#35741

Previous Behavior

Credentials fed are misused. All authentication process is broken and any call ends in 401 traceback.

New Behavior

Access to a password protected mod_jk web API works.

Tests written?

No

fix saltstack#35741 . HTTP Credentials are now used in the right order.
@fix7 fix7 changed the base branch from develop to 2016.3 August 26, 2016 13:13
@rallytime
Copy link
Contributor

Thank you very much @fix7!

@rallytime rallytime merged commit 083d836 into saltstack:2016.3 Aug 26, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Aug 29, 2016
* upstream/develop: (53 commits)
  Lint whitespace
  Raise to 5s per @techhat
  Fix lint and missing value
  Lint
  Lint
  Ensure ssh keys are decodable before inserting
  Fix traceback in salt-cloud logging for Azure
  Fix regex bug
  Update inotify.py beacon
  Don't test for linux shells on Windows (saltstack#35743)
  fix 34241, webutil.useradd_all is deprecated (saltstack#35788)
  Updated user.py to redact password when test=true
  Bump the deprecation warning in pkgrepo state to Nitrogen (saltstack#35810)
  Fix misuse of HTTP credentials in modjk execution module (saltstack#35796)
  Schedule documentation update (saltstack#35745)
  Better unicode handling in gitfs (saltstack#35802)
  Adds mock for tornado.locks (saltstack#35807)
  Bump the deprecation warning in pkgrepo state to Nitrogen (saltstack#35806)
  Bump the deprecation warnings in glance module to Nitrogen (saltstack#35805)
  Bump the deprecation warning in salt.client.mixins.py to Nitrogen (saltstack#35804)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants