]> gitweb.fluxo.info Git - puppet-stdlib.git/log
puppet-stdlib.git
12 years agoMerge branch '3.x' into 4.x
Adrien Thebo [Wed, 27 Mar 2013 21:04:12 +0000 (14:04 -0700)]
Merge branch '3.x' into 4.x

12 years agoMerge branch '2.x' into 3.x
Adrien Thebo [Wed, 27 Mar 2013 21:04:00 +0000 (14:04 -0700)]
Merge branch '2.x' into 3.x

12 years agoMerge branch 'pull-136' into 2.x
Adrien Thebo [Wed, 27 Mar 2013 21:03:40 +0000 (14:03 -0700)]
Merge branch 'pull-136' into 2.x

12 years agoAllow comparisons of Numeric and number as String
Erik Dalén [Wed, 20 Mar 2013 15:36:20 +0000 (16:36 +0100)]
Allow comparisons of Numeric and number as String

Puppet passes numbers as String to functions, but it makes more sense to
compare them as Numeric.
But sometimes Puppet passes them as the wrong type, see:
https://projects.puppetlabs.com/issues/19812

12 years agoMerge branch '3.x' into 4.x
Adrien Thebo [Mon, 18 Mar 2013 22:38:07 +0000 (15:38 -0700)]
Merge branch '3.x' into 4.x

12 years agoMerge branch '2.x' into 3.x
Adrien Thebo [Mon, 18 Mar 2013 22:37:56 +0000 (15:37 -0700)]
Merge branch '2.x' into 3.x

12 years agoMerge branch 'pull-115' into 2.x
Adrien Thebo [Mon, 18 Mar 2013 22:37:46 +0000 (15:37 -0700)]
Merge branch 'pull-115' into 2.x

12 years agostr2bool should return a boolean if called with a boolean
Justin Lambert [Mon, 17 Dec 2012 13:22:36 +0000 (06:22 -0700)]
str2bool should return a boolean if called with a boolean

12 years agoMerge branch '3.x' into 4.x
Adrien Thebo [Mon, 18 Mar 2013 22:06:33 +0000 (15:06 -0700)]
Merge branch '3.x' into 4.x

12 years agoMerge branch '2.x' into 3.x
Adrien Thebo [Mon, 18 Mar 2013 22:06:07 +0000 (15:06 -0700)]
Merge branch '2.x' into 3.x

12 years agoMerge branch 'pull-98' into 2.x
Adrien Thebo [Mon, 18 Mar 2013 22:05:23 +0000 (15:05 -0700)]
Merge branch 'pull-98' into 2.x

12 years agoFix number of arguments check in flatten()
Uwe Stuehler [Tue, 23 Oct 2012 14:43:03 +0000 (16:43 +0200)]
Fix number of arguments check in flatten()

The function only uses the first argument, so raise an error with
too few arguments *and* with too many arguments.

12 years agoMerge branch '3.x' into 4.x
Jeff McCune [Mon, 25 Feb 2013 22:11:18 +0000 (14:11 -0800)]
Merge branch '3.x' into 4.x

* 3.x:
  (maint) Add Ruby 2.0.0 to Travis build matrix

12 years agoMerge branch 'maint/3.x/ruby_two_travis' into 3.x
Jeff McCune [Mon, 25 Feb 2013 22:11:07 +0000 (14:11 -0800)]
Merge branch 'maint/3.x/ruby_two_travis' into 3.x

* maint/3.x/ruby_two_travis:
  (maint) Add Ruby 2.0.0 to Travis build matrix

12 years ago(maint) Add Ruby 2.0.0 to Travis build matrix
Jeff McCune [Mon, 25 Feb 2013 22:00:20 +0000 (14:00 -0800)]
(maint) Add Ruby 2.0.0 to Travis build matrix

Without this patch we're not testing against Ruby 2.0.0 which has recently been
released.  This is a problem because we'd like a way to be notified if a change
set breaks compatibility with future supported versions of Ruby.

This patch should not be taken as an indication that we fully support Ruby 2.0,
just as an indication that we plan to in the future.

This patch also tightens up the specifications of the build matrix.  In
addition to testing against the specific Puppet dependency versions, we're also
testing against the latest 2.7.x release and the latest release.

12 years agoMerge branch '3.x' into 4.x
Jeff McCune [Mon, 18 Feb 2013 20:22:18 +0000 (12:22 -0800)]
Merge branch '3.x' into 4.x

* 3.x:
  changed .count to .size to support legacy ruby

12 years agoMerge branch '2.x' into 3.x
Jeff McCune [Mon, 18 Feb 2013 20:22:04 +0000 (12:22 -0800)]
Merge branch '2.x' into 3.x

* 2.x:
  changed .count to .size to support legacy ruby

12 years agoMerge branch 'mhellmic-2.x' into 2.x
Jeff McCune [Mon, 18 Feb 2013 20:21:49 +0000 (12:21 -0800)]
Merge branch 'mhellmic-2.x' into 2.x

* mhellmic-2.x:
  changed .count to .size to support legacy ruby

12 years agochanged .count to .size to support legacy ruby
Martin Hellmich [Mon, 18 Feb 2013 15:02:15 +0000 (16:02 +0100)]
changed .count to .size to support legacy ruby

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Thu, 3 Jan 2013 21:39:05 +0000 (13:39 -0800)]
Merge branch '3.x' into 4.x

* 3.x:
  Add test/validation for is_float if created from an arithmetical operation
  Add test/validation for is_integer if created from an arithmetical operation
  Add test/validation for is_numeric if created from an arithmetical operation

13 years agoMerge branch '3.2.x' into 3.x
Jeff McCune [Thu, 3 Jan 2013 21:38:36 +0000 (13:38 -0800)]
Merge branch '3.2.x' into 3.x

* 3.2.x:
  Add test/validation for is_float if created from an arithmetical operation
  Add test/validation for is_integer if created from an arithmetical operation
  Add test/validation for is_numeric if created from an arithmetical operation

13 years agoMerge branch 'stephenrjohnson-bug/3.x/18157_arithmetical_operations' into 3.2.x
Jeff McCune [Thu, 3 Jan 2013 21:38:16 +0000 (13:38 -0800)]
Merge branch 'stephenrjohnson-bug/3.x/18157_arithmetical_operations' into 3.2.x

* stephenrjohnson-bug/3.x/18157_arithmetical_operations:
  Add test/validation for is_float if created from an arithmetical operation
  Add test/validation for is_integer if created from an arithmetical operation
  Add test/validation for is_numeric if created from an arithmetical operation

13 years agoAdd test/validation for is_float if created from an arithmetical operation
stephen [Thu, 3 Jan 2013 14:05:29 +0000 (14:05 +0000)]
Add test/validation for is_float if created from an arithmetical operation

13 years agoAdd test/validation for is_integer if created from an arithmetical operation
stephen [Thu, 3 Jan 2013 14:02:58 +0000 (14:02 +0000)]
Add test/validation for is_integer if created from an arithmetical operation

13 years agoAdd test/validation for is_numeric if created from an arithmetical operation
stephen [Thu, 3 Jan 2013 13:53:03 +0000 (13:53 +0000)]
Add test/validation for is_numeric if created from an arithmetical operation

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Wed, 28 Nov 2012 22:45:03 +0000 (14:45 -0800)]
Merge branch '3.x' into 4.x

* 3.x:
  Update Modulefile, CHANGELOG for 3.2.0

13 years agoUpdate Modulefile, CHANGELOG for 3.2.0
Jeff McCune [Wed, 28 Nov 2012 22:44:27 +0000 (14:44 -0800)]
Update Modulefile, CHANGELOG for 3.2.0

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Wed, 28 Nov 2012 22:39:34 +0000 (14:39 -0800)]
Merge branch '3.x' into 4.x

* 3.x:
  Update Modulefile, CHANGELOG for 2.6.0

13 years agoMerge branch '2.x' into 3.x
Jeff McCune [Wed, 28 Nov 2012 22:39:29 +0000 (14:39 -0800)]
Merge branch '2.x' into 3.x

* 2.x:
  Update Modulefile, CHANGELOG for 2.6.0

Conflicts:
CHANGELOG
Modulefile

13 years agoUpdate Modulefile, CHANGELOG for 2.6.0
Jeff McCune [Wed, 28 Nov 2012 22:38:27 +0000 (14:38 -0800)]
Update Modulefile, CHANGELOG for 2.6.0

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Wed, 28 Nov 2012 22:29:32 +0000 (14:29 -0800)]
Merge branch '3.x' into 4.x

* 3.x:
  Add reject() function

13 years agoMerge branch '2.x' into 3.x
Jeff McCune [Wed, 28 Nov 2012 22:29:14 +0000 (14:29 -0800)]
Merge branch '2.x' into 3.x

* 2.x:
  Add reject() function

13 years agoMerge branch 'duritong-fun/2.x/reject' into 2.x
Jeff McCune [Wed, 28 Nov 2012 22:29:01 +0000 (14:29 -0800)]
Merge branch 'duritong-fun/2.x/reject' into 2.x

* duritong-fun/2.x/reject:
  Add reject() function

13 years agoAdd reject() function
Peter Meier [Wed, 28 Nov 2012 18:13:57 +0000 (19:13 +0100)]
Add reject() function

Like the grep function, but we can now reject members of an array
based on a pattern.

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Wed, 28 Nov 2012 01:08:20 +0000 (17:08 -0800)]
Merge branch '3.x' into 4.x

* 3.x:
  Revert "(Maint) Add spec/functions to rake test task"

13 years agoMerge branch '2.x' into 3.x
Jeff McCune [Wed, 28 Nov 2012 01:08:12 +0000 (17:08 -0800)]
Merge branch '2.x' into 3.x

* 2.x:
  Revert "(Maint) Add spec/functions to rake test task"

Conflicts:
Rakefile

13 years agoRevert "(Maint) Add spec/functions to rake test task"
Jeff McCune [Wed, 28 Nov 2012 01:06:29 +0000 (17:06 -0800)]
Revert "(Maint) Add spec/functions to rake test task"

This reverts commit dbe3c8ecf6379963f583ea11e51e403e5ad55002.

Because testing these against Puppet 2.6.x is causing failures.  These
need to be cleaned up, but I want to leave and this was the behavior
before I tried to "fix" it.

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Wed, 28 Nov 2012 00:22:18 +0000 (16:22 -0800)]
Merge branch '3.x' into 4.x

* 3.x:
  (Maint) Add spec/functions to rake test task
  Add example behaviors for ensure_packages() function
  Add an ensure_packages function.

13 years agoMerge branch '2.x' into 3.x
Jeff McCune [Wed, 28 Nov 2012 00:22:11 +0000 (16:22 -0800)]
Merge branch '2.x' into 3.x

* 2.x:
  (Maint) Add spec/functions to rake test task
  Add example behaviors for ensure_packages() function
  Add an ensure_packages function.

Conflicts:
Rakefile

13 years agoMerge branch 'metcalfc/2.x/ensure_packages' into 2.x
Jeff McCune [Wed, 28 Nov 2012 00:19:52 +0000 (16:19 -0800)]
Merge branch 'metcalfc/2.x/ensure_packages' into 2.x

* metcalfc/2.x/ensure_packages:
  (Maint) Add spec/functions to rake test task
  Add example behaviors for ensure_packages() function
  Add an ensure_packages function.

13 years ago(Maint) Add spec/functions to rake test task
Jeff McCune [Wed, 28 Nov 2012 00:18:07 +0000 (16:18 -0800)]
(Maint) Add spec/functions to rake test task

Without this patch the `test` rake task does not exercise the
rspec-puppet behaviors located in spec/functions/  This is a
self-evident problem.

This patch fixes the problem by adding spec/functions to the list of
directories scanned for spec tests.

13 years agoAdd example behaviors for ensure_packages() function
Jeff McCune [Wed, 28 Nov 2012 00:15:32 +0000 (16:15 -0800)]
Add example behaviors for ensure_packages() function

Without this patch the ensure_packages() function has no rspec behavior
examples.  This patch fixes the problem by filling out a spec file with
expected behaviors I could think of.

13 years agoAdd an ensure_packages function.
Chad Metcalf [Tue, 18 Sep 2012 18:43:30 +0000 (11:43 -0700)]
Add an ensure_packages function.

Its often the case that modules need to install a handful of packages.
In some cases its worth breaking these dependencies out into their own
modules (e.g., Java). In others it makes more sense to keep them in the
module. This can be problematic when multiple modules depend on common
packages (git, python ruby, etc). ensure_resource was a good first step
towards solving this problem. ensure_resource does not handle arrays and
for 3 or more packages stamping out ensure_resource declarations is
tedious.

ensure_packages is a convenience function that takes an array of packages
and wraps calls to ensure_resource. Currently users cannot specify
package versions. But the function could be extended to use a hash if
that functionality would be useful.

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Tue, 27 Nov 2012 00:34:15 +0000 (16:34 -0800)]
Merge branch '3.x' into 4.x

* 3.x:
  (#17797) min() and max() functions

13 years agoMerge branch '2.x' into 3.x
Jeff McCune [Tue, 27 Nov 2012 00:34:04 +0000 (16:34 -0800)]
Merge branch '2.x' into 3.x

* 2.x:
  (#17797) min() and max() functions

13 years agoMerge branch 'fun/2.x/min_max' into 2.x
Jeff McCune [Tue, 27 Nov 2012 00:33:56 +0000 (16:33 -0800)]
Merge branch 'fun/2.x/min_max' into 2.x

* fun/2.x/min_max:
  (#17797) min() and max() functions

13 years ago(#17797) min() and max() functions
Erik Dalén [Fri, 23 Nov 2012 16:00:04 +0000 (17:00 +0100)]
(#17797) min() and max() functions

returns the min or max of all arguments given to them

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Mon, 26 Nov 2012 19:41:25 +0000 (11:41 -0800)]
Merge branch '3.x' into 4.x

* 3.x:
  (#14670) Fixup file_line autorequire specs
  (#14670) autorequire a file_line resource's path

13 years agoMerge branch '2.x' into 3.x
Jeff McCune [Mon, 26 Nov 2012 19:41:01 +0000 (11:41 -0800)]
Merge branch '2.x' into 3.x

* 2.x:
  (#14670) Fixup file_line autorequire specs
  (#14670) autorequire a file_line resource's path

13 years agoMerge branch 'fun/2.x/14670_file_line_autorequire' into 2.x
Jeff McCune [Mon, 26 Nov 2012 19:39:26 +0000 (11:39 -0800)]
Merge branch 'fun/2.x/14670_file_line_autorequire' into 2.x

* fun/2.x/14670_file_line_autorequire:
  (#14670) Fixup file_line autorequire specs
  (#14670) autorequire a file_line resource's path

13 years ago(#14670) Fixup file_line autorequire specs
Jeff McCune [Mon, 26 Nov 2012 19:37:08 +0000 (11:37 -0800)]
(#14670) Fixup file_line autorequire specs

Without this patch applied the file_line autorequire examples are
failing.  This is a problem because the failures are false positives and
should be passing given the implementation.

This patch fixes the problem by changing the examples to directly test
the existence of the relationship by finding it in the list of
autorequire relationships.

13 years ago(#14670) autorequire a file_line resource's path
Peter Meier [Wed, 23 May 2012 19:42:07 +0000 (21:42 +0200)]
(#14670) autorequire a file_line resource's path

If we manage a file we edit with file_line, it should be autorequired by
file_line.  Without this patch applied the relationship is not
automatically setup and the user is forced to manually manage the
relationship.

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Tue, 20 Nov 2012 21:16:59 +0000 (16:16 -0500)]
Merge branch '3.x' into 4.x

* 3.x:
  Add join_keys_to_values function

13 years agoMerge branch '2.x' into 3.x
Jeff McCune [Tue, 20 Nov 2012 21:16:50 +0000 (16:16 -0500)]
Merge branch '2.x' into 3.x

* 2.x:
  Add join_keys_to_values function

13 years agoMerge branch 'lifton-feature/2.x/join_keys_to_values_function' into 2.x
Jeff McCune [Tue, 20 Nov 2012 21:16:37 +0000 (16:16 -0500)]
Merge branch 'lifton-feature/2.x/join_keys_to_values_function' into 2.x

* lifton-feature/2.x/join_keys_to_values_function:
  Add join_keys_to_values function

13 years agoAdd join_keys_to_values function
Joshua Harlan Lifton [Tue, 20 Nov 2012 03:23:27 +0000 (19:23 -0800)]
Add join_keys_to_values function

This commit adds a function that joins each of a hash's keys with that
key's corresponding value, separated by a separator string. The
arguments are a hash and separator string. The return value is an
array of joined key/value pairs.

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Mon, 19 Nov 2012 13:45:39 +0000 (08:45 -0500)]
Merge branch '3.x' into 4.x

* 3.x:
  Extend delete function for strings and hashes
  Fixed typo

13 years agoMerge branch '2.x' into 3.x
Jeff McCune [Mon, 19 Nov 2012 13:45:31 +0000 (08:45 -0500)]
Merge branch '2.x' into 3.x

* 2.x:
  Extend delete function for strings and hashes
  Fixed typo

13 years agoMerge branch 'lifton-feature/2.x/extend_delete_function' into 2.x
Jeff McCune [Mon, 19 Nov 2012 13:45:18 +0000 (08:45 -0500)]
Merge branch 'lifton-feature/2.x/extend_delete_function' into 2.x

* lifton-feature/2.x/extend_delete_function:
  Extend delete function for strings and hashes
  Fixed typo

13 years agoExtend delete function for strings and hashes
Joshua Harlan Lifton [Sun, 18 Nov 2012 06:27:15 +0000 (22:27 -0800)]
Extend delete function for strings and hashes

Previous to this commit, the delete function only acted on
arrays. This commit adds the same functionality for hashes and strings
in the obvious way: delete(h, k) would delete the k key from the h
hash and delete(s, sub) would delete all instances of the sub
substring from the s string.

13 years agoFixed typo
Joshua Harlan Lifton [Sun, 18 Nov 2012 06:26:57 +0000 (22:26 -0800)]
Fixed typo

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Thu, 15 Nov 2012 13:57:28 +0000 (08:57 -0500)]
Merge branch '3.x' into 4.x

* 3.x:
  Add the pick() function

13 years agoMerge branch '2.x' into 3.x
Jeff McCune [Thu, 15 Nov 2012 13:57:21 +0000 (08:57 -0500)]
Merge branch '2.x' into 3.x

* 2.x:
  Add the pick() function

13 years agoMerge branch 'feature/2.x/pick' into 2.x
Jeff McCune [Thu, 15 Nov 2012 13:56:52 +0000 (08:56 -0500)]
Merge branch 'feature/2.x/pick' into 2.x

* feature/2.x/pick:
  Add the pick() function

13 years agoAdd the pick() function
Gary Larizza [Fri, 3 Aug 2012 22:46:26 +0000 (15:46 -0700)]
Add the pick() function

This function is similar to a coalesce function in SQL in that it will
return
the first value in a list of values that is not undefined or an empty
string
(two things in Puppet that will return a boolean false value).
Typically,
this function is used to check for a value in the Puppet
Dashboard/Enterprise
Console, and failover to a default value like the following:

  $real_jenkins_version = pick($::jenkins_version, '1.449')

The value of $real_jenkins_version will first look for a top-scope
variable
called 'jenkins_version' (note that parameters set in the Puppet
Dashboard/
Enterprise Console are brought into Puppet as top-scope variables), and,
failing that, will use a default value of 1.449.

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Wed, 7 Nov 2012 22:03:31 +0000 (14:03 -0800)]
Merge branch '3.x' into 4.x

* 3.x:
  (#13974) Add predicate functions for interface facts

13 years agoMerge branch '2.x' into 3.x
Jeff McCune [Wed, 7 Nov 2012 22:03:22 +0000 (14:03 -0800)]
Merge branch '2.x' into 3.x

* 2.x:
  (#13974) Add predicate functions for interface facts

13 years agoMerge branch 'add/2.x/13974-has_interface_with' into 2.x
Jeff McCune [Wed, 7 Nov 2012 22:03:08 +0000 (14:03 -0800)]
Merge branch 'add/2.x/13974-has_interface_with' into 2.x

* add/2.x/13974-has_interface_with:
  (#13974) Add predicate functions for interface facts

13 years ago(#13974) Add predicate functions for interface facts
Wil Cooley [Wed, 21 Mar 2012 05:21:53 +0000 (22:21 -0700)]
(#13974) Add predicate functions for interface facts

If one wishes to test if a host has a particular IP address (such as a floating
virtual address) or has an interface on a particular network (such as a
secondary management network), the facts that provide this information are
difficult to use within Puppet.

This patch addresses these needs by implementing functions
‘has_ip_address(value)’ and ‘has_ip_network(value)’. These functions look
through all interfaces for ipaddress_<interface> and network_<interface>
(respectively) having the requested <value>.

These functions are implemented on top of a lower-level predicate
function, ‘has_interface_with(kind, value)’, which iterates through the
interfaces in the ‘interfaces’ fact and checks the facts <kind>_<interface>
looking for <value>.

Additionally, the existence of a particular named interface can be checked for
by calling with only a single argument: has_interface_with(interface).

A Boolean is returned in all cases.

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Wed, 7 Nov 2012 17:44:35 +0000 (09:44 -0800)]
Merge branch '3.x' into 4.x

* 3.x:
  Add function, uriescape, to URI.escape strings. Redmine #17459
  Add function, uriescape, to URI.escape strings. Redmine #17459
  Update CHANGELOG, Modulefile for 3.1.1

13 years agoMerge branch 'add/4.x/joejulian-add_uriescape' into 4.x
Jeff McCune [Wed, 7 Nov 2012 17:44:31 +0000 (09:44 -0800)]
Merge branch 'add/4.x/joejulian-add_uriescape' into 4.x

* add/4.x/joejulian-add_uriescape:
  Add function, uriescape, to URI.escape strings. Redmine #17459

13 years agoMerge branch '2.x' into 3.x
Jeff McCune [Wed, 7 Nov 2012 17:43:52 +0000 (09:43 -0800)]
Merge branch '2.x' into 3.x

* 2.x:
  Add function, uriescape, to URI.escape strings. Redmine #17459

13 years agoMerge branch 'add/3.x/joejulian-add_uriescape' into 3.x
Jeff McCune [Wed, 7 Nov 2012 17:43:47 +0000 (09:43 -0800)]
Merge branch 'add/3.x/joejulian-add_uriescape' into 3.x

* add/3.x/joejulian-add_uriescape:
  Add function, uriescape, to URI.escape strings. Redmine #17459

13 years agoMerge branch 'add/2.x/joejulian-add_uriescape' into 2.x
Jeff McCune [Wed, 7 Nov 2012 17:40:37 +0000 (09:40 -0800)]
Merge branch 'add/2.x/joejulian-add_uriescape' into 2.x

* add/2.x/joejulian-add_uriescape:
  Add function, uriescape, to URI.escape strings. Redmine #17459

13 years agoAdd function, uriescape, to URI.escape strings. Redmine #17459
Joe Julian [Wed, 7 Nov 2012 00:17:57 +0000 (16:17 -0800)]
Add function, uriescape, to URI.escape strings. Redmine #17459

13 years agoAdd function, uriescape, to URI.escape strings. Redmine #17459
Joe Julian [Wed, 7 Nov 2012 00:17:57 +0000 (16:17 -0800)]
Add function, uriescape, to URI.escape strings. Redmine #17459

13 years agoAdd function, uriescape, to URI.escape strings. Redmine #17459
Joe Julian [Wed, 7 Nov 2012 00:17:57 +0000 (16:17 -0800)]
Add function, uriescape, to URI.escape strings. Redmine #17459

13 years agoMerge branch '3.1.x' into 3.x
Jeff McCune [Thu, 25 Oct 2012 23:06:29 +0000 (16:06 -0700)]
Merge branch '3.1.x' into 3.x

* 3.1.x:
  Update CHANGELOG, Modulefile for 3.1.1

13 years agoUpdate CHANGELOG, Modulefile for 3.1.1
Jeff McCune [Thu, 25 Oct 2012 23:06:25 +0000 (16:06 -0700)]
Update CHANGELOG, Modulefile for 3.1.1

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Thu, 25 Oct 2012 22:55:04 +0000 (15:55 -0700)]
Merge branch '3.x' into 4.x

* 3.x:
  Update Modulefile, CHANGELOG for 2.5.1

13 years agoMerge branch '2.x' into 3.x
Jeff McCune [Thu, 25 Oct 2012 22:54:51 +0000 (15:54 -0700)]
Merge branch '2.x' into 3.x

* 2.x:
  Update Modulefile, CHANGELOG for 2.5.1

Conflicts:
CHANGELOG
Modulefile

13 years agoMerge branch '2.5.x' into 2.x
Jeff McCune [Thu, 25 Oct 2012 22:53:40 +0000 (15:53 -0700)]
Merge branch '2.5.x' into 2.x

* 2.5.x:
  Update Modulefile, CHANGELOG for 2.5.1

13 years agoUpdate Modulefile, CHANGELOG for 2.5.1
Jeff McCune [Thu, 25 Oct 2012 22:51:23 +0000 (15:51 -0700)]
Update Modulefile, CHANGELOG for 2.5.1

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Thu, 25 Oct 2012 22:47:53 +0000 (15:47 -0700)]
Merge branch '3.x' into 4.x

* 3.x:
  Revert "Revert "Merge branch '2.5.x' into 3.0.x""
  Revert "Merge branch '2.5.x' into 3.0.x"
  (maint) Fix spec failures resulting from Facter API changes

13 years agoMerge branch '3.1.x' into 3.x
Jeff McCune [Thu, 25 Oct 2012 22:47:48 +0000 (15:47 -0700)]
Merge branch '3.1.x' into 3.x

* 3.1.x:
  Revert "Revert "Merge branch '2.5.x' into 3.0.x""
  Revert "Merge branch '2.5.x' into 3.0.x"
  (maint) Fix spec failures resulting from Facter API changes

13 years agoMerge branch '2.5.x' into 3.1.x
Jeff McCune [Thu, 25 Oct 2012 22:47:25 +0000 (15:47 -0700)]
Merge branch '2.5.x' into 3.1.x

* 2.5.x:
  (maint) Fix spec failures resulting from Facter API changes

13 years agoRevert "Revert "Merge branch '2.5.x' into 3.0.x""
Jeff McCune [Thu, 25 Oct 2012 22:44:14 +0000 (15:44 -0700)]
Revert "Revert "Merge branch '2.5.x' into 3.0.x""

This reverts commit 9e8c60a8b73fd96393b08d690c7197e62aae623e.

This was an error on my part.  3.1.x descends from 3.0.x _and_ 2.5.x, but 3.0.x does
not descend from 2.5.x.  I should not have merged 2.5.x into 3.0.x,
instead I should have merged 2.5.x into 3.1.x skipping over the 3.0.x
merge up.

I'm slowly starting to understand the implications of semver on our
branching strategy...  =)

13 years agoMerge branch '3.0.x' into 3.1.x
Jeff McCune [Thu, 25 Oct 2012 22:43:51 +0000 (15:43 -0700)]
Merge branch '3.0.x' into 3.1.x

* 3.0.x:
  Revert "Merge branch '2.5.x' into 3.0.x"

13 years agoRevert "Merge branch '2.5.x' into 3.0.x"
Jeff McCune [Thu, 25 Oct 2012 22:42:05 +0000 (15:42 -0700)]
Revert "Merge branch '2.5.x' into 3.0.x"

This reverts commit c8c7afc7a00aaeeddea6514d9fe9508513e53a73, reversing
changes made to 03ec16e291a70ac5ac412be36ae3b86a771b98af.

This was a mistake on my part.  2.5 is a minor release and minor
releases should never be merged into patch level branches.  2.5.x should
have been merged into 3.1.x instead.

13 years agoMerge branch '2.5.x' into 2.x
Jeff McCune [Thu, 25 Oct 2012 22:39:27 +0000 (15:39 -0700)]
Merge branch '2.5.x' into 2.x

* 2.5.x:
  (maint) Fix spec failures resulting from Facter API changes

13 years agoMerge branch 'fix/2.5.x/facter_loader' into 2.5.x
Jeff McCune [Thu, 25 Oct 2012 22:38:50 +0000 (15:38 -0700)]
Merge branch 'fix/2.5.x/facter_loader' into 2.5.x

* fix/2.5.x/facter_loader:
  (maint) Fix spec failures resulting from Facter API changes

13 years ago(maint) Fix spec failures resulting from Facter API changes
Jeff McCune [Thu, 25 Oct 2012 22:32:34 +0000 (15:32 -0700)]
(maint) Fix spec failures resulting from Facter API changes

Without this patch stdlib tests fail against Facter 2.x and master but
not 1.6.x.

This patch fixes the problem by initializing the example group
differently depending on the version of Facter integrating into the
system.  The adjusted methods are:

 1.x - Facter.collection.loader.load
 2.x - Facter.collection.load

The collection actually implements the load method in both version, it's
simply marked as private in 1.x.

13 years agoMerge branch '3.x' into 4.x
Jeff McCune [Thu, 25 Oct 2012 19:01:36 +0000 (12:01 -0700)]
Merge branch '3.x' into 4.x

* 3.x:

13 years agoMerge branch '3.1.x' into 3.x
Jeff McCune [Thu, 25 Oct 2012 19:01:01 +0000 (12:01 -0700)]
Merge branch '3.1.x' into 3.x

* 3.1.x:
  Update Modulefile, CHANGELOG for 3.1.0
  Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""
  Update Modulefile, CHANGELOG for 2.5.0
  Explicitly load functions used by ensure_resource
  re-formatting
  Add better docs about duplicate resource failures
  Handle undef for parameter argument
  Add function ensure_resource and defined_with_params
  Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""
  Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""
  Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"
  Prevent undefined method `split' for nil:NilClass with pe_foo_version facts
  (maint) Clear all facts before each example
  Add spec tests for pe_version facts
  Add PE facts to stdlib
  Fix some logical inconsistencies in README
  (#14422) Update README to include the bug tracker URL.
  Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'""

13 years agoMerge branch '3.0.x' into 3.1.x
Jeff McCune [Thu, 25 Oct 2012 19:00:28 +0000 (12:00 -0700)]
Merge branch '3.0.x' into 3.1.x

* 3.0.x:

Conflicts:
CHANGELOG
Modulefile

13 years agoMerge branch '2.5.x' into 3.0.x
Jeff McCune [Thu, 25 Oct 2012 18:59:02 +0000 (11:59 -0700)]
Merge branch '2.5.x' into 3.0.x

* 2.5.x:
  Update Modulefile, CHANGELOG for 2.5.0
  Explicitly load functions used by ensure_resource
  re-formatting
  Add better docs about duplicate resource failures
  Handle undef for parameter argument
  Add function ensure_resource and defined_with_params
  Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""
  Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"
  Prevent undefined method `split' for nil:NilClass with pe_foo_version facts
  (maint) Clear all facts before each example
  Add spec tests for pe_version facts
  Add PE facts to stdlib

Conflicts:
CHANGELOG
Modulefile
spec/spec_helper.rb

13 years agoMerge branch '3.1.x' into 4.x
Jeff McCune [Thu, 25 Oct 2012 18:33:43 +0000 (11:33 -0700)]
Merge branch '3.1.x' into 4.x

* 3.1.x:
  Update Modulefile, CHANGELOG for 3.1.0

13 years agoUpdate Modulefile, CHANGELOG for 3.1.0
Jeff McCune [Thu, 25 Oct 2012 18:33:09 +0000 (11:33 -0700)]
Update Modulefile, CHANGELOG for 3.1.0

13 years agoRevert "Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts...
Jeff McCune [Thu, 25 Oct 2012 18:28:43 +0000 (11:28 -0700)]
Revert "Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'""""

This reverts commit 2885d314b61055d20d85d36a68214f7d9e1e6ac6.

No, really.  Keep the !@#$% integration branches around so we don't have
this revert nightmare again.

13 years agoMerge branch '3.1.x'
Jeff McCune [Thu, 25 Oct 2012 18:26:19 +0000 (11:26 -0700)]
Merge branch '3.1.x'

* 3.1.x:
  Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""