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.

Sign up for GitHub

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

Jump to bottom

Saltnado: provide also get parameters to the context #31130

Merged
merged 1 commit into from Feb 16, 2016
Merged

Saltnado: provide also get parameters to the context #31130

merged 1 commit into from Feb 16, 2016

Conversation

ticosax
Copy link
Contributor

@ticosax ticosax commented Feb 11, 2016

No description provided.

@cachedout
Copy link
Contributor

Hi @ticosax

Thanks for this. We've frozen 2016.3, however. Could you please close this and re-submit it in a new PR against the develop branch? (I know it's a small change, but we're trying to be disciplined.) :]

Also, there is one lint error if you wouldn't mind grabbing while you're making the other change. Thanks!

blueyed
blueyed reviewed Feb 11, 2016
View reviewed changes
salt/netapi/rest_tornado/saltnado.py
@@ -1704,6 +1704,7 @@ def post(self, tag_suffix=None): # pylint: disable=W0221
# is a dictionary. We must cast this as
# a dictionary in order for msgpack to
# serialize it.
'get': dict(self.request.query_arguments),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be moved above the comment (which is about the headers).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@ticosax
Copy link
Contributor Author

ticosax commented Feb 11, 2016

We've frozen 2016.3

I wrote tests to prove it is safe to be included in 2016.3. If I submit it in develop branch, I'm afraid it will be not released before the next 6 month. Am i wrong in my assumption ? or could it be included in 2016.3.1 which is a pity since 2016.3 is not released yet.

regarding the lint-error

tests/unit/netapi/rest_tornado/test_handlers.py:23: [F0401(import-error), ] Unable to import 'salt.ext.six.moves.urllib.parse'

I don't know how to fix it, looks like an error related of the testing environment.

@meggiebot
Copy link

Approved once tests pass

@ticosax
Copy link
Contributor Author

ticosax commented Feb 12, 2016

😅 🙇

@cachedout
Copy link
Contributor

@ticosax Can you please fix the lint errors?

@ticosax
Copy link
Contributor Author

ticosax commented Feb 15, 2016

@cachedout taken from tests/integration/netapi/rest_cherrypy/app_test.py
I disabled the check with # pylint: disable=no-name-in-module.

cachedout pushed a commit that referenced this pull request Feb 16, 2016
Merge pull request #31130 from ticosax/saltnado_pass_get
52a3c9b 
Saltnado: provide also get parameters to the context
@cachedout cachedout merged commit 52a3c9b into saltstack:2016.3 Feb 16, 2016
@ticosax ticosax deleted the saltnado_pass_get branch February 17, 2016 09:09
@ticosax
Copy link
Contributor Author

ticosax commented Feb 17, 2016

@cachedout Thank you ! ✋

@ticosax ticosax mentioned this pull request Feb 19, 2016
Merged
rallytime pushed a commit that referenced this pull request Feb 19, 2016
Merge pull request #31346 from ticosax/backport-31130-to-2015.8
dec254a 
Backport #31130 to 2015.8
@rallytime rallytime added the ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. label Feb 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ZRELEASED - Boron ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ticosax @cachedout @meggiebot @blueyed @rallytime