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

Fixing CherryPy key bug #28760

Merged
merged 1 commit into from Nov 11, 2015

Conversation

Projects
None yet
3 participants
@dmyerscough
Contributor

dmyerscough commented Nov 11, 2015

This issue resolves #28732, #22451, #22442 and #22452.

This has been tested on 2015.5 and develop

[INFO    ] 10.28.13.30 - - [11/Nov/2015:06:19:46] "POST /keys HTTP/1.1" 200 10240 "" "curl/7.22.0 (x86_64-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.2d zlib/1.2.3.4 libidn/1.23 librtmp/2.3"
[INFO    ] [11/Nov/2015:06:19:46] ENGINE Started monitor thread 'Session cleanup'.
[INFO    ] 10.28.13.30 - - [11/Nov/2015:06:19:46] "POST /login HTTP/1.1" 200 170 "" "curl/7.22.0 (x86_64-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.2d zlib/1.2.3.4 libidn/1.23 librtmp/2.3"
[INFO    ] 10.28.13.30 - - [11/Nov/2015:06:19:49] "GET /keys HTTP/1.1" 200 206887 "" "curl/7.22.0 (x86_64-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.2d zlib/1.2.3.4 libidn/1.23 librtmp/2.3"

@whiteinge @jfindlay could you merge this into develop too.

whiteinge added a commit that referenced this pull request Nov 11, 2015

@whiteinge whiteinge merged commit 77d4b98 into saltstack:2015.5 Nov 11, 2015

5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11103 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2172 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #10813 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #9642 — SUCCESS
Details
@whiteinge

This comment has been minimized.

Show comment
Hide comment
@whiteinge

whiteinge Nov 11, 2015

Contributor

Very well done fix. And thank you very much for fixing my crap!

Contributor

whiteinge commented Nov 11, 2015

Very well done fix. And thank you very much for fixing my crap!

@dmyerscough

This comment has been minimized.

Show comment
Hide comment
@dmyerscough

dmyerscough Nov 11, 2015

Contributor

@whiteinge no problem, can we get this merge with 2015.8 and develop :-)

Contributor

dmyerscough commented Nov 11, 2015

@whiteinge no problem, can we get this merge with 2015.8 and develop :-)

@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Nov 14, 2015

Contributor

@dmyerscough, release branches are regularly merged forward.

Contributor

jfindlay commented Nov 14, 2015

@dmyerscough, release branches are regularly merged forward.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment