Commit graph

349 commits

Author SHA1 Message Date
Bryan Jen
65ee1d69b1 Merge pull request #187 from tphoney/release_prep_1_4_2
Release prep 1 4 2
2015-08-21 09:19:55 -07:00
tphoney
cda3ccaecc 1.4.2 release prep 2015-08-21 14:58:26 +01:00
David Danzilio
54f12d3f8e Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-inifile into create_ini_settings_namespace 2015-08-17 13:47:14 -04:00
Morgan Haskel
7e0527248f Merge pull request #186 from puppetlabs/1.4.x
1.4.x mergeback
2015-08-17 10:18:10 -07:00
David Danzilio
a94f51e68d Adding path to create_ini_settings resources
Currently the create_ini_settings function creates an ini_setting with a
title comprised of the section and setting names. This means that we
run into resource conflicts when defining the same section/setting
combinations but in different files. Since the path parameter is
required, we can safely add this to the title of the ini_setting
resource created by the create_ini_settings function. This commit does
just that.
2015-08-12 18:00:57 -04:00
JT (Jonny)
de45163752 Merge pull request #184 from glarizza/MODULES_2369_key_val_separator
[MODULES-2369] Support a space as a key_val_separator
2015-08-07 15:43:56 +01:00
Gary Larizza
d452e6ca1e Support a space as a key_val_separator
Previously, trying to use a space as a key_val_separator in the ini_setting
type would fail because #strip is being called on the key_val_separator
attribute, which completely kills the space. This commit checks to see
if key_val_separator has been set as a space, and, if so, sets the `k_v_s`
variable in the library to be ' ' instead of ''.  This in turn allows the
provider to check for existing values (instead of inserting the value every
time Puppet is run).
2015-08-06 13:56:16 -07:00
Bryan Jen
f1e4313740 Merge pull request #183 from cyberious/MODULES-1908
(MODULES-1908) Munge the setting to ensure we always strip the whitespace
2015-08-03 10:10:20 -07:00
Travis Fields
48965fb01c (MODULES-1908) Munge the setting to ensure we always strip the whitespace 2015-08-03 09:41:11 -07:00
Hunter Haugen
b499f70710 Merge pull request #182 from mhaskel/MODULES-2212
MODULES-2212 - Add use_exact_match parameter for subsettings
2015-07-31 16:21:22 -07:00
Morgan Haskel
2ab47100c7 MODULES-2212 - Add use_exact_match parameter for subsettings
There's no way to distinguish between a subsetting with a value and a
subsetting with no value, so add a parameter to allow that to be
specified.
2015-07-31 16:11:27 -07:00
Morgan Haskel
9147ecc3e8 Whitespace cleanup
This file was misindented
2015-07-29 13:33:20 -07:00
Jean B.
ab87c73142 Merge pull request #181 from hunner/tweak_readme
Reorder output and remove whitespace
2015-07-28 11:48:47 -07:00
Hunter Haugen
af39974708 Reorder output and remove whitespace 2015-07-27 16:15:02 -07:00
Hunter Haugen
43f0c68631 Merge pull request #180 from jbondpdx/1.4.x
Edits to new Function: `create_ini_settings` in README
2015-07-27 16:13:04 -07:00
jbondpdx
d9b4c3622a fixing mistakes in code samples 2015-07-27 16:11:32 -07:00
jbondpdx
7f465f53ce Edits to new Function: create_ini_settings in README
Also added language highlighting throughout.
2015-07-27 15:50:03 -07:00
Morgan Haskel
f72730d3c0 Merge pull request #179 from hunner/docs_changes
Docs changes from master
2015-07-20 10:45:15 -07:00
TP Honey
7a45b38414 Merge pull request #173 from poikilotherm/fix/master/add_create_ini_settings_to_readme
MODULES-2158: Add documentation for create_ini_settings() to README
2015-07-20 12:34:33 +01:00
TP Honey
9fc499baa5 Merge pull request #174 from DavidS/fixup-readme
(maint) fixup description of ini_setting%setting
2015-07-20 12:32:14 +01:00
Bryan Jen
e2f1fe1c16 Merge pull request #178 from hunner/release_1.4.1
Release 1.4.1
2015-07-15 14:53:46 -07:00
Hunter Haugen
c3ce25ad7f Release 1.4.1 2015-07-15 14:53:17 -07:00
Morgan Haskel
2a7dbc140d Merge pull request #177 from puppetlabs/1.4.x
1.4.x
2015-07-09 11:50:05 -07:00
Morgan Haskel
7543b3c0e7 Merge pull request #175 from hunner/bump_version
Bump version for release
2015-07-08 13:20:45 -07:00
Hunter Haugen
b36984132d Bump version for release 2015-07-08 11:54:54 -07:00
David Schmitt
560134c661 (maint) fixup description of ini_setting%setting 2015-07-07 11:07:25 +01:00
Jonathan Tripathy
101519d5e9 Release Prep 1.4.0 2015-07-07 10:37:55 +01:00
Oliver Bertuch
d3724aa875 Add documentation for create_ini_settings() to README 2015-07-03 16:14:21 +02:00
JT (Jonny)
bf32ac86ca Merge pull request #172 from drewfisher314/ticket/2136-add-solaris-12
Add support for Solaris 12
2015-06-23 15:59:57 +01:00
Morgan Haskel
a09bfef1ed Merge pull request #171 from misterdorm/bug1599
MODULES-1599 Match only on space and tab whitespace after k/v separator
2015-06-22 10:44:02 -07:00
Drew Fisher
366523b5ab Add support for Solaris 12 2015-06-22 10:43:00 -06:00
Mike Dorman
c784253096 MODULES-1599 Match only on space and tab whitespace after k/v separator
The previous match for \s would also match on newlines.  This caused
existing settings with blank values to have the newline considered part
of the whitespace surrounding the separator.  When such settings are
set with a value, the value ends up on the next line.

Also adding acceptance test for this particular situation.
2015-06-18 15:06:44 -06:00
Bryan Jen
e132445690 Merge pull request #168 from hunner/fix_helper_name
Correct the name of the require
2015-06-11 16:50:50 -07:00
Hunter Haugen
3c92a35df5 Correct the name of the require 2015-06-11 16:49:46 -07:00
Bryan Jen
e89bf765a0 Merge pull request #167 from puppetlabs/update_gemfile
Update the gemfile for puppet install helper
2015-06-11 16:14:21 -07:00
Hunter Haugen
034233ff2a Update the gemfile for puppet install helper 2015-06-11 16:11:29 -07:00
Bryan Jen
62a31bab5a Merge pull request #166 from hunner/add_helper
Add helper to install puppet/pe/puppet-agent
2015-06-11 15:42:56 -07:00
Hunter Haugen
6acf750d62 Add helper to install puppet/pe/puppet-agent 2015-06-11 15:31:27 -07:00
Bryan Jen
485c8392f4 Merge pull request #165 from mhaskel/merge_1.3.x_to_master
Correct the date and metadata ordering
2015-06-09 16:04:19 -07:00
Morgan Haskel
30ee205613 Correct the date and metadata ordering 2015-06-09 16:02:10 -07:00
David Schmitt
bb67906957 Merge pull request #164 from justinstoller/maint/master/set-puppet-version
(maint) allow setting PUPPET_VERSION in acceptance
2015-06-09 15:49:58 +01:00
Justin Stoller
9a7c0f38dc (maint) allow setting PUPPET_VERSION in acceptance 2015-06-08 22:15:08 -07:00
JT (Jonny)
9858f5b5c0 Merge pull request #161 from tphoney/1.3.0_prep
prep 1.3.0
2015-05-29 12:25:26 +01:00
tphoney
461174d8d7 prep 1.3.0 2015-05-29 11:02:19 +01:00
Hunter Haugen
c72bfbb9b1 Merge pull request #129 from duritong/create_ini_settings
introduce create_ini_settings
2015-05-27 13:15:33 -07:00
Hunter Haugen
4da2f6e23f Add ability to unittest puppet 4 2015-05-27 08:12:17 -07:00
Bryan Jen
3bfcceb17f Merge pull request #160 from puppetlabs/modulesync_updates
Modulesync updates
2015-05-07 14:12:10 -07:00
Morgan Haskel
b19132b3a1 beaker gemfile fixes 2015-05-06 14:32:35 -07:00
Morgan Haskel
d584cb69c8 sync via modulesync 2015-05-06 14:30:46 -07:00
Morgan Haskel
84dde69729 sync via modulesync 2015-05-06 14:10:11 -07:00