Commit Graph

175 Commits

Author SHA1 Message Date
Travis Fields
16ec5a40a7 Merge pull request #93 from mhaskel/modulesync
Sync files with modulesync
2014-12-26 16:39:23 -08:00
Morgan Haskel
dcc2867152 Merge pull request #89 from brdude/master
Add Java alternatives for RHEL based distros.
2014-12-26 15:55:56 -08:00
rmenezes
0c2e8bb610 Add Java alternatives for RHEL based distros. 2014-12-26 15:10:37 -08:00
Morgan Haskel
c660622b82 Sync files with modulesync 2014-12-26 10:58:14 -08:00
Morgan Haskel
8fdcc1a2e1 Merge pull request #90 from jbondpdx/master
FM-1523: Added module summary to metadata.json
2014-12-19 15:58:18 -08:00
Colleen Murphy
89e3a04258 Merge pull request #91 from justinstoller/maint/master/lint-fix
variable best practice (stop yelling at me linter)
2014-12-03 09:41:19 -08:00
Justin Stoller
359528b7f9 variable best practice (stop yelling at me linter) 2014-12-02 16:00:48 -08:00
Morgan Haskel
bb2d01bf13 Merge pull request #88 from phervieux/utopic
add utopic support
2014-12-02 16:43:36 -05:00
jbondpdx
4274f4f147 FM-1523: Added module summary to metadata.json 2014-11-20 15:50:07 -08:00
Patrick Hervieux
b04c8a9148 add utopic support 2014-11-14 15:41:02 +01:00
Morgan Haskel
d845e5fdd9 Merge pull request #76 from PierreR/patch-1
cosmetic: default in last position
2014-11-12 10:50:39 -08:00
Morgan Haskel
601c948ae0 Merge pull request #80 from stevenalexander/trival-readme-md-point-correction
cosmetic change to add missing space to bullet point in markdown so it r...
2014-11-12 10:48:30 -08:00
Morgan Haskel
fc369fb2f7 Merge pull request #87 from puppetlabs/revert-61-master
Revert "Add alternative support for RedHat"
2014-11-12 10:30:07 -08:00
Morgan Haskel
f95aad63a5 Revert "Add alternative support for RedHat" 2014-11-12 10:29:12 -08:00
Morgan Haskel
b00b4b8662 Merge pull request #61 from convectionlabs/master
Add alternative support for RedHat
2014-11-12 10:19:57 -08:00
Hunter Haugen
eb54419d09 Merge pull request #86 from mhaskel/merge_1.2.x
Merge 1.2.x
2014-11-10 17:02:25 -08:00
Morgan Haskel
92bd03eec3 Merge pull request #85 from cyberious/1.2.x
Remove misleading changelog, no readme changes done
1.2.0
2014-11-06 16:58:19 -08:00
Travis Fields
3e989f3c04 Update readme to reflect the SLES 12 addition, also fix whitespace in front of 'version 2014-11-06 16:34:02 -08:00
Morgan Haskel
c790b0b955 Merge pull request #84 from cyberious/Release1.2.0
Prepare 1.2.0 release
2014-11-06 13:15:17 -08:00
Travis Fields
50ca60cbee Prep for 1.2.0 supported release 2014-11-06 11:08:48 -08:00
Morgan Haskel
830bb07990 Merge pull request #82 from cyberious/TestcaseFixes
Fixed issue with installing stdlib on certain platforms due to ssl issues
2014-11-05 16:53:04 -08:00
Travis Fields
abad30de06 Update defaults for SLES
Fixed test issues with solaris-11 and added support for sles-12
2014-11-05 16:04:52 -08:00
Morgan Haskel
7224baa72d Merge pull request #64 from kian/master
place default case last in selectors
2014-10-29 18:48:16 -04:00
Steven Alexander
140cb7665a cosmetic change to add missing space to bullet point in markdown so it renders correctly 2014-10-02 09:41:59 +01:00
Hunter Haugen
3c41c8ae8b Merge pull request #77 from PierreR/patch-2
Fix syntax
2014-09-29 09:28:17 -07:00
Hunter Haugen
5f60d5e2c0 Merge pull request #79 from cyberious/master
Remove puppet_module_install in favor of copy_module_to
2014-09-10 12:09:28 -07:00
Travis Fields
d1d1ec2327 Remove puppet_module_install in favor of copy_module_to 2014-09-10 11:30:52 -07:00
VaishaliSaxena
bb34cb71cd Merge pull request #78 from hunner/remove_oel_5
OEL 5 is trying to use up2date which doesn't work
1.1.2
2014-09-02 12:57:22 -07:00
Hunter Haugen
e849b5029c OEL 5 is trying to use up2date which doesn't work 2014-09-02 12:56:21 -07:00
Pi3r
5ad98b17be Fix syntax 2014-09-01 14:39:24 +02:00
Pi3r
7580a25018 cosmetic: default in last position
The main motivation for this change is for compatibility with puppetresource (https://github.com/bartavelle/language-puppet).

IMHO, it makes much more sense this way because all cases are checked order wise.
2014-09-01 13:53:08 +02:00
Hunter Haugen
db0f428a66 Merge pull request #75 from hunner/fix_spec
Ah hah, got it
2014-08-28 18:34:22 -07:00
Hunter Haugen
fb38145cd4 Ah hah, got it 2014-08-28 18:33:56 -07:00
Hunter Haugen
92d53c084e Merge pull request #74 from hunner/spec_filter
Maybe spec filters work like this
2014-08-28 18:21:41 -07:00
Hunter Haugen
4cf0088f91 Maybe spec filters work like this 2014-08-28 18:21:09 -07:00
Hunter Haugen
3648bd8b70 Merge pull request #73 from hunner/spec_typo
Spec typo
2014-08-28 17:53:30 -07:00
Hunter Haugen
30a5311d73 Spec typo 2014-08-28 17:53:11 -07:00
Hunter Haugen
c781b2fa63 Merge pull request #72 from hunner/fix_comma
Misplaced comma
2014-08-28 17:04:58 -07:00
Hunter Haugen
9823d8eefd Misplaced comma 2014-08-28 17:04:44 -07:00
VaishaliSaxena
353e5ee694 Merge pull request #71 from hunner/rm_meta
Remove sci 7 from metadata
2014-08-28 16:50:08 -07:00
Hunter Haugen
6556d18c86 Remove sci 7 from metadata 2014-08-28 16:48:03 -07:00
VaishaliSaxena
eae176c5b0 Merge pull request #70 from hunner/update_tests
Remove Sci 7 from readme and update oracle linux tests for ubuntu
2014-08-28 16:41:24 -07:00
Hunter Haugen
096196bd89 Remove Sci 7 from readme and update oracle linux tests for ubuntu 2014-08-28 16:38:23 -07:00
Ashley Penney
a231ce8891 Merge pull request #69 from mhaskel/spec_updates
Update spec_helper for consistency
2014-08-28 17:39:44 -04:00
Morgan Haskel
f519b26dbc Update spec_helper for consistency 2014-08-28 17:35:30 -04:00
Ashley Penney
cdc30ce467 Merge pull request #68 from hunner/release_1.1.2
Release 1.1.2
2014-08-25 15:38:28 -04:00
Hunter Haugen
d0a7a72631 Release 1.1.2 2014-08-25 12:32:20 -07:00
Morgan Haskel
4bcc4e732a Merge pull request #67 from hunner/make_deb_work
Make deb work
2014-08-22 17:56:44 -04:00
Hunter Haugen
e4628a345c Debian should fail with incorrect java_alternative 2014-08-22 14:42:15 -07:00
Morgan Haskel
67486853f2 Merge pull request #66 from hunner/make_sol_work
Add more tests and make solaris pass
2014-08-22 16:36:37 -04:00