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

Backport/2.6/40856 #41278

Merged
merged 3 commits into from
Jun 7, 2018
Merged

Backport/2.6/40856 #41278

merged 3 commits into from
Jun 7, 2018

Conversation

kbreit
Copy link
Contributor

@kbreit kbreit commented Jun 7, 2018

SUMMARY

Backport of 40856.

Meraki utility now loads() using the JSON module. Modules were modified to account for these changes. This allows the module to do less processing and is a slight simplification.
Additional bugs were fixed in the code.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

meraki module utility and modules

ANSIBLE VERSION
2.6
ADDITIONAL INFORMATION

This should be backported to the 2.6 branch.

@kbreit
Changed request() to run json.loads() instead of module doing it
4c4941d 
- Removed json.loads() from modules
- Removed some unreliable integration tests
- Removed self.function setting in construct_path()
-

(cherry picked from commit 0ba1e52)
@kbreit
PEP8 changes
fd66c63 
(cherry picked from commit 182979f)
@kbreit
Remove debug line for push
4188435 
(cherry picked from commit 5350dcf)
@ansibot
Copy link
Contributor

ansibot commented Jun 7, 2018

cc @Qalthos @dagwieers @ganeshrn @gdpak @gundalow @privateip @rcarrillocruz @trishnaguha
click here for bot help

@ansibot ansibot added affects_2.6 This issue/PR affects Ansible v2.6 backport This PR does not target the devel branch. bug This issue/PR relates to a bug. community_review In order to be merged, this PR must follow the community review workflow. meraki Cisco Meraki community module This issue/PR relates to a module. needs_triage Needs a first human triage before being processed. networking Network category support:community This issue/PR relates to code supported by the Ansible community. test This PR relates to tests. labels Jun 7, 2018
@samdoran samdoran removed the needs_triage Needs a first human triage before being processed. label Jun 7, 2018
@mattclay
Copy link
Member

mattclay commented Jun 7, 2018

Backport of commit 2be2a57

@mattclay mattclay merged commit c87e264 into ansible:stable-2.6 Jun 7, 2018
@kbreit kbreit deleted the backport/2.6/40856 branch June 23, 2018 02:10
@dagwieers dagwieers added the cisco Cisco technologies label Feb 22, 2019
@ansible ansible locked and limited conversation to collaborators Jun 11, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
affects_2.6 This issue/PR affects Ansible v2.6 backport This PR does not target the devel branch. bug This issue/PR relates to a bug. cisco Cisco technologies community_review In order to be merged, this PR must follow the community review workflow. meraki Cisco Meraki community module This issue/PR relates to a module. networking Network category support:community This issue/PR relates to code supported by the Ansible community. test This PR relates to tests.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@kbreit @ansibot @mattclay @dagwieers @samdoran