Merge remote-tracking branch 'origin/stable'
* origin/stable: (MODULES-3775) (msync 8d0455c) update travis/appveyer w/Ruby 2.3 (maint) modulesync 70360747
Merge pull request #190 from puppetlabs/hunner_msync
(MODULES-3704) Update gemfile template to be identical
Merge pull request #191 from puppetlabs/fix_json
(MODULES-3632) Use json_pure always
(FM-5982) workaround PMT issue
By using git cloning, the base path length is reduces, avoiding the issue on appveyor.
Merge pull request #192 from puppetlabs/modulesync
(FM-5972) Update to next modulesync_configs [dedaf10]
(MODULES-4263) add blacksmith rake tasks
new CI changes require that windows modules have access to blacksmith tasks
Merge pull request #194 from eputnam/blacksmith_rasks
(MODULES-4263) add blacksmith rake tasks
Merge pull request #193 from puppetlabs/hunner_msync
(MODULES-4097) Sync travis.yml
Merge pull request #196 from puppetlabs/hunner_msync
(MODULES-4098) Sync the rest of the files
[MODULES-4255] Obfuscate passwords in sqlserver_instance
When errors are logged after setup.exe fails to run
Merge pull request #195 from wilson208/obfuscate-password
[MODULES-4255] Obfuscate passwords in sqlserver_instance
(maint) Prime Feature and Instance installation with .Net 3.5 source
Previously, there was known bug with installing .Net Framework 3.5 on Server 2012R2 due to the installation media not making the required features available, instead they were removed. This commit copies and mounts a Windows Server 2012 R2 installation ISO and uses the `windows_feature_source` property in the module to use the `I:\source\sxs` folder for feature installation components.
Merge pull request #197 from wilson208/dotnet35-install
(maint) Prime Feature and Instance installation with .Net 3.5 source
(MODULES-4321): edit sqlserver for loc
Merge pull request #198 from jbondpdx/readme-edit-2017
(MODULES-4321): edit sqlserver for loc
* stable: (FM-5476) (docs) Edits for docs signoff. (FM-5473) Release 1.1.4
Merge branch 'master' into stable
* master: (MODULES-4321): edit sqlserver for loc (maint) Prime Feature and Instance installation with .Net 3.5 source [MODULES-4255] Obfuscate passwords in sqlserver_instance (MODULES-4098) Sync the rest of the files (MODULES-4097) Sync travis.yml (MODULES-4263) add blacksmith rake tasks new CI changes require that windows modules have access to blacksmith tasks (FM-5982) workaround PMT issue (FM-5972) Update to next modulesync_configs [dedaf10] Workaround frozen strings, json, and devtools (MODULES-3704) Update gemfile template to be identical
This commit prepares the module for module release 1.1.5 [ci skip]
(maint) Update tests for running in parallel
Previously some tests were missing `require` statemetns. When using serial spec tests this error is hidden. However parallel spec test, as performed in Travis, are failing. This commit adds the missing required files for tests to complete.
Merge pull request #199 from glennsarti/ticket/stable/FM-6026-release…
…-1.1.5 (FM-6026) Release 1.1.5