Skip to content
This repository has been archived by the owner on Jul 11, 2019. It is now read-only.

Dev 2.0 #44

Merged
merged 86 commits into from
Dec 4, 2015
Merged

Dev 2.0 #44

merged 86 commits into from
Dec 4, 2015

Conversation

jsmartin
Copy link
Contributor

@jsmartin jsmartin commented Dec 4, 2015

Merging over Dev 2.0 refactor

tima and others added 30 commits November 12, 2015 15:42
…ile. The example doesn't make sense otherwise.
…tion lesson. Besides haproxy module is now in core as of 1.9.
delegation_and_role_deps lesson clean up.
Introduction of roles workshop.
Introduced basic_playbook workshop.
Flattened apache_centos lesson and made consistent with revised apache_playbook lesson.
Modified apache_plabook example to use a real world handler. Added missing start iptables.
Added what I presume was an missing include from the cloud/site.yml file. The example doesn't make sense otherwise.
…ile. The example doesn't make sense otherwise.
…tion lesson. Besides haproxy module is now in core as of 1.9.
Removed errant and empty workshop folders.
Cleanup of custom module exercise -- fixed typo, added ansible.cfg, host file path normalized.ost file path normalized.
Setting PluginDir is more trouble than it's worth here so taking it out.
jsmartin added a commit that referenced this pull request Dec 4, 2015
@jsmartin jsmartin merged commit 8831257 into master Dec 4, 2015
@jsmartin jsmartin deleted the dev-2.0 branch January 8, 2016 16:50
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants