Squashed 'vagrant/modules/apache/' changes from a509cd6..fb9d353

fb9d353 Merge pull request #238 from oxilion/balancermember
a38647b Add balancer and balancermember define
6f134f3 Merge pull request #243 from Wesseldr/patch-1
e01230d Merge pull request #239 from alexjfisher/master
00b0f63 Added an 'h' in a typo on default_ssl_vost
420394e Update example to perform redirect to SSL instead of using rewrite.
01d2911 Merge pull request #236 from hunner/lint_fixes
84297cb Updating for puppet lint
71d984e Fix typo in vhost.pp
db1c11f Merge pull request #233 from hunner/fix_directories
8e50c97 Merge pull request #234 from hunner/virtual_docroot
595a22d Adding virtual_docroot rspec-system tests
c66ad74 Add posibility to set VirtualDocumentRoot
eb042b6 Add array spec tests for directories
b13c371 Remove camel-case
8f1bd30 Add test for all directories hashtributes. Update template
075eb17 Merge pull request #232 from hunner/php_prefork
0e38068 Merge pull request #229 from hunner/remove_firewall
84be403 Merge pull request #228 from jyrkiput/#21262
45b2659 Update apache::mod::php's error message to be correct
d8a7bca Remove firewall resource
77f3c58 (#21262) Removed nonexisting parameter from comment
3c3b20c Merge pull request #227 from hunner/fix_cgid_variable
f67aba3 Add @ to cgisock_path
2424f95 Merge pull request #226 from hunner/vhost_system_tests
8321c0d Merge pull request #225 from hunner/mod_php
17bd001 Merge pull request #224 from bmurt/master
68be3f4 Adding rspec-system tests for php + prefork
2665e60 Adding explicit error and description of php without prefork
fdb0512 remove require call, and use metaparameter instead
3f66ad5 Update README, without destroying whitespace.
71e0f31 update description and expected library string
98f0abe I prefer 'prefork' it's explictly what's desired here.
a6cc946 borrowed precondition from prefork
62b0bec mpm_module must be prefork for mod_php
d1c8254 ah, php is not compatible with apache::mod::worker, and requires apache::mod::prefork
94d8c09 apache::mod::php needs a custom lib for Debian and Ubuntu
f58a193 Adding extra vhost tests
a29fac2 XSendfile Module support for Apache
3f7d104 Merge pull request #222 from hunner/system_exit_codes
f9dcbbb Merge pull request #218 from hunner/info_enhancement
fbdfbb2 Only 0 (no changes) and 2 (successful) are valid exit codes
353f2d8 Merge pull request #220 from hunner/add_3.2
77e6e4f Add ruby 2.0.0 testing
b9b9a9a Add travis testing for Puppet 3.2
f0933e1 Update specs for current module layout
2878b32 Merge pull request #217 from hunner/add_vhost_system_specs
b81e39a Merge remote-tracking branch 'trlinkin/info_enhancement' into info_enhancement
88c30b6 Adding rspec-system tests for apache::vhost
21705f2 Merge pull request #216 from hunner/rspec_system_2
b0fc18e Add information about spec testing to README
fc02b02 Add various new directories to .gitignore
225735f Update specs for rspec-system 2.0.0
0cb4020 Update Gemfile with relevant dependencies
149d0b2 Add apache::mod::info spec tests

git-subtree-dir: vagrant/modules/apache
git-subtree-split: fb9d353d2587986f465d56313ed17b93d65ca9db
Merge commit '60c07c6a4f422ae32ad0f322f59cd2e849ccc79e'
Squashed 'vagrant/modules/epel/' changes from 4fc5b13..82b71a0

82b71a0 Merge pull request #10 from treydock/master
18fba7c - Update README to reflect renaming of rake task for unit testing
7cef433 - Remove Puppet-2.6 from travis-ci config - Rename rake task spec:all to ci (ref puppetlabs-firewall)
b830a4c - Add travis-ci configuration
b818968 - Modify Gemfile to allow CI tests against different Puppet versions in bundler
4c40206 - More explicit rspec tests for os_maj_version fact
790364f - Add test coverage for Amazon AWS Linux - Set fact definitions in class rspec tests to merge into (overwrite) default_facts - Small changes to context for better organization based on module layout
0636b14 - Update baseurl in rspec tests (#13)
260fbbe - Update gpgkey exec tests (#5) - Set fact definitions in class rspec tests to merge into (overwrite) default_facts
889b460 - Move each repo and gpgkey to seperated shared context, this is to make the current tests be able to show future changes in parameterize class will not effect default functionality
9ca2129 - Add comments to rpm_gpg_key as pointed out by puppet-lint tests
deee366 - Make the rspec tests more direct and not relying on variables to determine proper outcomes
e3f9770 - Add rspec-puppet and puppet-lint unit testing - Fix variable encapsulation for epel::rpm_gpg_key - Update README with with basic unit testing instructions - issue #9
4a0a846 Fixup Markdown rendoring
8973cbf Readying for release
c280031 Merge pull request #11 from proletaryo/master
a4bd9c0 Merge pull request #6 from caphrim007/master
f49a184 Merge pull request #14 from jswickmw/patch-1
8043603 Merge pull request #8 from zipkid/proxy_as_class_param
496a7c4 Merge pull request #5 from vholer/master
ac57187 Merge pull request #13 from nixon/repourl
99496ff Have the epel GPG key in place before creating the Yumrepos
87bfe87 update repo base url to avoid 404
e21c817 Update README.md
a6164f5 Added support for AWS Linux by enablig already installed EPEL
4d0c919 Allow proxy to be passed as a param
6dd1693 Moved fetching of :operatingsystemrelease value into the setcode because otherwise puppet may evaluate it before it actually has a value and cause :kernelrelease to be set as the :operatingsystemrelease value
3722f2b Quote tr arguments.

git-subtree-dir: vagrant/modules/epel
git-subtree-split: 82b71a0d02994685fd60e2895173c028a3988b0c
Merge commit 'f2931985638f4772a2c3fce1a1170960ed202c8f'
Squashed 'vagrant/modules/mysql/' changes from efb7a6e..37f38d0

37f38d0 Merge pull request #216 from vakuum/pr-1
2e82660 Fixed PID file location for SLES 11 SP2.
afbf808 Merge pull request #213 from apenney/081-release
66077bb Release 0.8.1 to fix a Fedora 19 bug.
3d641d0 Merge pull request #212 from derekhiggins/fact-typo
48af8a7 Fix typo in fact name
ec7e40e Merge pull request #211 from apenney/specs
4d811e4 Add basic specs for database provider.
d365978 Merge pull request #206 from apenney/080-release
17fdcf8 Prepare the 0.8.0 release.
2b91872 Merge pull request #210 from red-trela/fedora-19-mariadb
e8e2367 Merge pull request #165 from leinaddm/add_ft_word_len_options
3ca7d95 Cover Fedora 19's move from mysql to mariadb packages
e12eb0e add ft_min_word_len and ft_max_word_len config options
0dfa6a4 Merge pull request #208 from apenney/database_user
8bf0368 Various changes to the provider to ensure commands are successful, as well as improvements to the tests.
00130ef Add initial spec tests for database_user.
e961b83 Fix spelling of privileges across the spec file.
731036e Merge pull request #167 from abraham1901/master
9d69afc Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
aa5d1f0 Merge pull request #198 from mhellmic/maxconnections
6cef2e8 Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
f3e5c89 Merge pull request #187 from RsrchBoy/topic/perl
1b5dc3c Merge pull request #186 from apenney/rootpassword
ead86b5 Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
d9ce083 Merge pull request #162 from frimik/19744
9839a1c Merge pull request #132 from Savar/manage_config_file_parameter
7f7e886 handling of my.cnf config file is now optional
880eaae changed the max_connections default to 151
1263d89 changed the test accordingly to the new max-connections parameter
3089d3a add a maximum connection parameter and set the default to 1000
cf74d2b Merge pull request #204 from hunner/release_0.7.1
a714827 Release 0.7.1
1610add Merge pull request #203 from hunner/update_travis
b5778d5 Update specs for current testing practices and GH publish
deba75d Merge pull request #166 from ekohl/quote-mycnf
a42d5be Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
59a6fb8 Quote the password
08579ef Merge pull request #202 from hunner/release_0.7.0
db18db5 Release 0.7.0
d8ddbc8 Merge pull request #200 from hunner/tmpconfigure
c459884 Change tmpdir to @tmpdir
9dc1b94 make tmpdir configurable
d41dbfd Merge pull request #201 from hunner/template_depr
4b900ec Update template for #179
a04038e Merge pull request #179 from msmithgu/parameterize-max_allowed_packet
16affe5 Merge pull request #199 from hunner/ansi_quotes
18866d2 Merge pull request #197 from mhellmic/RedHat
d68aa83 Update specs for ansi quoting
608e4e8 Fixed SQL for databse_grant and database_user when ANSI_QUOTES Mysql option is set.
d29bc94 Merge pull request #188 from gimler/patch-1
826d441 Merge pull request #192 from doismellburning/patch-1
b9b122e change the distribution osfamily from Redhat into RedHat
4d9e9a5 * Fixing lint warnings
fad4f06 * Fixing lint warnings
6c81ea0 * Trying fix unit tests for Travis
5d9bd3e Update README.md
b07c67e Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
04fb83f fix puppet warning default_engine
beeb261 Merge branch 'master' into topic/perl
811ebc6 A very small fix for the case where the root password has been changed by hand and then you change your mysql::server entry to match.  If you also change any mysql::db entries at the same time this causes those to be attempted before your /root/.my.cnf is updated.
1a13580 Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
a171c52 * Puppet 2.6 fix
242f6e5 parameterized previously hardcoded max_allowed_packet config setting
7f94bc3 added spec test for parameterized max_allowed_packet
81f333d ...and credit $self, too.
724098e ...and add mysql::perl to README.md
0dec443 mysql::perl tests
fac48b8 add mysql::perl
5ea8e5f * Adding `server_idparameter to `mysql::config` * Adding `sql_log_bin` parameter to `mysql::config` * Adding `log_bin` parameter to `mysql::config` * Adding `max_binlog_size` parameter to `mysql::config` * Adding `binlog_do_db` parameter to `mysql::config` * Adding `expire_logs_days` parameter to `mysql::config` * Adding `log_bin_trust_function_creators` parameter to `mysql::config` * Adding `replicate_ignore_table` parameter to `mysql::config` * Adding `replicate_wild_do_table` parameter to `mysql::config` * Adding `replicate_wild_ignore_table` parameter to `mysql::config` * Adding `expire_logs_days`  parameter to `mysql::params` * Adding `max_binlog_size` parameter to `mysql::params`
2a1b1e7 * Adding `key_buffer` parameter to `mysql::config` * Adding `thread_stack` parameter to `mysql::config` * Adding `thread_cache_size` parameter to `mysql::config` * Adding `myisam-recover` parameter to `mysql::config` * Adding `query_cache_limit` parameter to `mysql::config` * Adding `query_cache_size` parameter to `mysql::config` * Adding `max_connections` parameter to `mysql::config` * Adding `tmp_table_size` parameter to `mysql::config` * Adding `table_open_cache` parameter to `mysql::config` * Adding `long_query_time` parameter to `mysql::config` * Updating mysql_config spec tests * Fixing lint warnings
e3b6de2 Implement character_set. You can change the default server and client character set
629c6ce fixes #19744 - no restart on root/.my.cnf change

git-subtree-dir: vagrant/modules/mysql
git-subtree-split: 37f38d0ad7eb66effed7ece519f7df44741ba19c
merge puppet-mysql subtree
Squashed 'vagrant/modules/pear/' changes from a622266..128c82f

128c82f Fix "Could not match" errors in pear provider

git-subtree-dir: vagrant/modules/pear
git-subtree-split: 128c82fa669bcc0f9642b3df8cb829288ca7bf29
Merge commit 'cbd317bb5535b43e0190736f2f744811d825831c'
handy-dandy script to update subtrees