opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
663 commits 2 branches 0 tags 1.8 MiB
Commit graph

43 commits

Author SHA1 Message Date
Jeff McCune
25b670e6f6 Update Modulefile, README, CHANGELOG for stdlib-4.0.0 2013-04-11 13:52:49 -07:00
Jeff McCune
e1f2a93288 Update Modulefile, CHANGELOG for 3.2.0 2012-11-28 14:44:27 -08:00
Jeff McCune
1e5618c44f Merge branch '2.x' into 3.x 
* 2.x:
  Update Modulefile, CHANGELOG for 2.6.0

Conflicts:
	CHANGELOG
	Modulefile
 2012-11-28 14:39:29 -08:00
Jeff McCune
2b7591896d Update Modulefile, CHANGELOG for 2.6.0 2012-11-28 14:38:27 -08:00
Jeff McCune
6f0c1e248c Merge branch '3.1.x' into 3.x 
* 3.1.x:
  Update CHANGELOG, Modulefile for 3.1.1
 2012-10-25 16:06:29 -07:00
Jeff McCune
a3c600d5f2 Update CHANGELOG, Modulefile for 3.1.1 2012-10-25 16:06:25 -07:00
Jeff McCune
f4c8c6b8de Merge branch '2.x' into 3.x 
* 2.x:
  Update Modulefile, CHANGELOG for 2.5.1

Conflicts:
	CHANGELOG
	Modulefile
 2012-10-25 15:54:51 -07:00
Jeff McCune
1bb4c7a79e Update Modulefile, CHANGELOG for 2.5.1 2012-10-25 15:51:23 -07:00
Jeff McCune
43729e6ea9 Revert "Revert "Merge branch '2.5.x' into 3.0.x"" 
This reverts commit 9e8c60a8b7.

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...  =)
 2012-10-25 15:44:14 -07:00
Jeff McCune
2ce2c5bd8d Merge branch '3.0.x' into 3.1.x 
* 3.0.x:
  Revert "Merge branch '2.5.x' into 3.0.x"
 2012-10-25 15:43:51 -07:00
Jeff McCune
9e8c60a8b7 Revert "Merge branch '2.5.x' into 3.0.x" 
This reverts commit c8c7afc7a0, reversing
changes made to 03ec16e291.

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.
 2012-10-25 15:42:05 -07:00
Jeff McCune
1d371ab8b6 Merge branch '3.0.x' into 3.1.x 
* 3.0.x:

Conflicts:
	CHANGELOG
	Modulefile
 2012-10-25 12:00:28 -07:00
Jeff McCune
c8c7afc7a0 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
 2012-10-25 11:59:02 -07:00
Jeff McCune
e8fb678c91 Update Modulefile, CHANGELOG for 3.1.0 2012-10-25 11:33:09 -07:00
Jeff McCune
7d8df4b998 Merge branch '2.5.x' 
* 2.5.x:
  Update Modulefile, CHANGELOG for 2.5.0

Conflicts:
	CHANGELOG
	Modulefile
 2012-10-25 11:11:11 -07:00
Jeff McCune
88af331b0e Update Modulefile, CHANGELOG for 2.5.0 2012-10-25 11:03:27 -07:00
Jeff McCune
44e99a7c00 Update CHANGELOG, Modulefile for 3.0.1 2012-08-16 19:47:32 -07:00
Jeff McCune
cf18f61581 Update CHANGELOG, Modulefile for 3.0.0 2012-08-16 11:01:09 -07:00
Jeff McCune
46daf0fb6d Update Modulefile, CHANGELOG for 2.4.0 2012-08-14 10:18:42 -07:00
Jeff McCune
730aee4ef9 Update CHANGELOG, Modulefile for 2.3.3 2012-05-23 10:52:41 -07:00
Jeff McCune
beaa812e10 Update CHANGELOG for 2.3.2 release 2012-05-10 22:19:24 -07:00
Jeff McCune
fea0b06bc8 Merge branch '2.2.x' into 2.3.x 
* 2.2.x:
  (#13494) Specify the behavior of zero padded strings
  Update CHANGELOG, Modulefile for 2.1.3

Conflicts:
	CHANGELOG
	Modulefile
 2012-03-29 15:20:28 -07:00
Jeff McCune
10c793f8f0 Merge branch '2.1.x' into 2.2.x 
* 2.1.x:
  Update CHANGELOG, Modulefile for 2.1.3

Conflicts:
	CHANGELOG
	Modulefile
 2012-03-29 15:19:21 -07:00
Jeff McCune
a033450ab3 Update CHANGELOG, Modulefile for 2.1.3 2012-03-29 09:43:20 -07:00
Jeff McCune
6b8f9dd329 Update CHANGELOG and Modulefile for 2.3.1 2012-03-13 17:35:43 -07:00
Jeff McCune
f7b8ab71cc Update CHANGELOG, Modulefile for 2.3.0 release 2012-03-12 17:45:12 -07:00
Jeff McCune
a70b09d5de Update CHANGELOG and Modulefile for 2.2.1 2011-12-30 12:21:21 -08:00
Jeff McCune
ed0de46a2a Merge branch '2.1.x' into 2.2.x 
* 2.1.x:
  Update Modulefile CHANGELOG for v2.1.2 release

Conflicts:
	CHANGELOG
	Modulefile
 2011-12-30 12:19:15 -08:00
Jeff McCune
842b0aa19c Update Modulefile CHANGELOG for v2.1.2 release 2011-12-30 12:05:15 -08:00
James Turnbull
051764b3a1 * v2.x: 
Update CHANGELOG and Modulefile for v2.2.0
 2011-11-08 14:16:11 -08:00
Jeff McCune
ad5316f561 Update CHANGELOG, README and Modulefile for v2.1.1 2011-08-18 12:06:44 -07:00
Jeff McCune
44e92bb176 Update CHANGELOG, README and Modulefile for v2.1.1 2011-08-18 10:52:54 -07:00
Jeff McCune
06b549b028 Update CHANGELOG, Modulefile and README for 2.1.0 2011-08-17 16:37:20 -07:00
Jeff McCune
666225c988 Update CHANGELOG and Modulefile for 2.0.0 release 2011-08-08 10:38:56 -07:00
Jeff McCune
07d0eca317 Update CHANGELOG and Modulefile for 1.1.0 2011-08-04 18:34:32 -07:00
Jeff McCune
0466e1bc6f Update CHANGELOG and README for 1.0.0 2011-08-04 17:24:46 -07:00
Jeff McCune
a6ed9fbca3 Update CHANGELOG and version for 0.1.7 2011-06-21 17:08:05 -07:00
Jeff McCune
27973cb594 Update CHANGELOG for version 0.1.6 2011-06-15 11:53:15 -07:00
Jeff McCune
fdb175a6af Update CHANGELOG for 0.1.5 2011-06-03 11:44:37 -07:00
Jeff McCune
cdbdc275ac Update CHANGELOG with stage re-ordering 2011-05-26 10:25:45 -07:00
Jeff McCune
46533ae428 Update CHANGELOG for 0.1.3 release 2011-05-25 13:29:27 -07:00
Jeff McCune
a78111222e Update changelog for version 0.1.2 
Also add release process information.
 2011-05-24 11:49:57 -07:00
Jeff McCune
ea972e379d Add changelog to track releases 
Following the development process, as new releases of this module are
cut the Changelog will be updated.
 2011-05-24 11:27:41 -07:00