Commit Graph

663 Commits

Author SHA1 Message Date
david22swan
d6eb532960 Merge pull request #294 from puppetlabs/pdksync_heads/master-0-g34e3266
pdksync - Update using 1.5.0
2018-05-18 15:36:33 +01:00
Helen Campbell
891b70a7c6 pdksync_heads/master-0-g34e3266 2018-05-18 15:21:46 +01:00
david22swan
3ba9230b0b Merge pull request #292 from HelenCampbell/gitlabfix
Fixing typo in sync.yml
2018-05-16 17:57:24 +01:00
Helen Campbell
3a35964083 Fixing typo in sync.yml 2018-05-16 17:44:48 +01:00
david22swan
cf1028b8b2 Merge pull request #290 from pmcmaw/unmanage_gitlab
(MODULES-7153) - Unmanage gitlab-ci.yml
2018-05-11 13:30:39 +01:00
Paula McMaw
241800601a (MODULES-7153) - Unmanage gitlab-ci.yml 2018-05-11 11:43:07 +01:00
Paula Muir
2c5397c66c Merge pull request #289 from HelenCampbell/syncupdate
(MODULES-7023) Update .sync.yml for pdk update
2018-04-26 17:06:24 +01:00
Helen Campbell
d7ab10786e (MODULES-7023) Update .sync.yml for pdk update 2018-04-26 15:04:48 +01:00
david22swan
e1173e59c7 Merge pull request #287 from sevencastles/remove_ensure_resource
Remove ensure_resource to avoid potential conflict
2018-02-26 13:47:17 +00:00
Carlo Rengo
6ba478375a Remove ensure_resource to avoid potential conflict
This was probably unintended and could cause conflicts where
stdlib::stages isn't desired.
2018-02-02 10:21:53 +01:00
Helen
47afbd2462 Merge pull request #286 from puppetlabs/release
Release merge back 2.4.0
2018-01-23 16:59:32 +00:00
Paula Muir
10503819d2 Merge pull request #285 from HelenCampbell/release
Release prep 2.4.0
2.4.0
2018-01-23 15:24:15 +00:00
Helen Campbell
5db3084c11 Release prep 2.4.0 2018-01-23 14:58:42 +00:00
Paula Muir
10dc3068a7 Merge pull request #284 from HelenCampbell/conversion1.3.2
PDK Convert 1.3.2
2018-01-23 14:16:32 +00:00
Helen Campbell
b4490a36b3 Remove bundle update command 2018-01-23 13:53:30 +00:00
Helen Campbell
6561d98e58 PDK Convert 1.3.2 2018-01-23 13:42:24 +00:00
TP Honey
61cfbe3154 Merge pull request #283 from HelenCampbell/javahometestfix
Fixes java_home for SLES 11.4 and relevant tests
2018-01-23 10:22:39 +00:00
Helen Campbell
85c17ef66f Fixes the tests for SLES java_home location 2018-01-23 09:55:13 +00:00
mirespace
697c1911f9 $java_home for SLES 11.4
Fixed java_home for matching package to be installed
2018-01-16 11:14:51 +01:00
Paula Muir
c8ce18949b Merge pull request #281 from puppetlabs/msync_MODULES-6339
(maint) modulesync 65530a4 Update Travis
2018-01-05 15:50:32 +00:00
Michael T Lombardi
9c103a2219 (maint) modulesync 65530a4 Update Travis
Related: https://github.com/puppetlabs/modulesync_configs/pull/177
2018-01-03 16:12:39 -06:00
TP Honey
61c8794661 (maint) - modulesync 384f4c1 (#280) 2017-12-13 12:14:15 +00:00
Paula McMaw
901bfe989a Merge pull request #279 from tphoney/FM-6634
FM-6634 rubocop fixes
2017-12-06 15:59:33 +00:00
tphoney
e53b8bb563 FM-6634 rubocop fixes 2017-12-06 15:47:27 +00:00
david22swan
77b2b199e4 Merge pull request #278 from puppetlabs/release
Release mergeback 2.3.0
2017-12-01 15:27:25 +00:00
TP Honey
6db8715496 Merge pull request #277 from david22swan/PreRelease
2.3.0PreRelease
2.3.0
2017-11-29 10:08:54 +00:00
David Swan
4911fe8c77 2.3.0PreRelease 2017-11-28 10:24:28 +00:00
david22swan
fb3e4c4151 Merge pull request #270 from mhjacks/master
Add support for Ubuntu artful (17.10) and bionic (18.04 to be)
2017-11-28 09:25:38 +00:00
TP Honey
9596929938 Merge pull request #274 from puppetlabs/release
Mergeback
2017-11-27 11:16:33 +00:00
Paula McMaw
e0ce74e1a0 Merge pull request #273 from jearls/MODULES-6105-fix-travis-block-for-sync-yml
MODULE-6105: Move `.sync.yml` travis configuration under `.travis.yml:`
2017-11-27 09:20:44 +00:00
Johnson Earls
f80686908c MODULE-6105: Move .sync.yml travis configuration under .travis.yml:
This allows `modulesync` to work again for this module.
2017-11-26 16:21:55 +00:00
david22swan
74d70dae04 Merge pull request #271 from willmeek/rubocopification
Cleanup ruby code via rubocop
2017-11-24 15:26:19 +00:00
Paula McMaw
5ad9e400a2 Merge pull request #272 from puppetlabs/MODULES-4179
MODULES-4179 Updated Oracle Java supported list
2017-11-23 14:50:18 +00:00
Davin Hanlon
078307484f Updated Oracle Java supported list
Added CentOs7 and RHEL7 to Oracle Java supported list
2017-11-23 13:57:21 +00:00
Will Meek
dec5136e11 Cleanup ruby code via rubocop
This commit will add code cleanup as corrected
and alerted by rubocop. It also adds rules to
execute rubocop on Travis.
2017-11-21 14:31:45 +00:00
Martin Jackson
71554f3067 Add support for Ubuntu artful (17.10) and bionic (18.04 to be) 2017-11-20 21:11:32 -06:00
Paula McMaw
692b490438 Release prep for 2.2.0 (#268) 2017-11-20 17:21:33 +00:00
Paula McMaw
7a271eef3e Module sync 1d81b6a (#267) 2017-11-17 15:32:24 +00:00
Paula McMaw
39113d885a Merge pull request #266 from willmeek/release_2_2_0
Release prep for 2.2.0
2.2.0
2017-11-16 14:46:57 +00:00
Will Meek
d0c9b41d9d Release prep for 2.2.0 2017-11-16 14:33:26 +00:00
Paula McMaw
d336d79c04 Merge pull request #265 from willmeek/realpath_test_fix
Realpath test fix
2017-11-16 10:59:40 +00:00
Will Meek
e1df6498c7 Fix facter unit test when using realpath 2017-11-15 14:37:42 +00:00
Sebastian Reitenbach
e50eb64614 do not use unportable readlink utility to find the java_default_home,
use Ruby in a more portable fashion.

adapt tests as well
2017-11-15 14:37:42 +00:00
Sebastian Reitenbach
bdfc567c18 OpenBSD doesn't have /etc/environment, therefore there is no
need to fiddle with it. The default case statement, "do nothing"
is all fine here.

Facter::Util::Resolution.with_env is long time gone since
Facter > 2.x. That was even longer before introduced by me.
Remove that OpenBSD special case in the java_version fact,
and assume that $PATH is properly set in order to find
the 'java' binary.

Additionally confine the java_default_home and java_libjvm_path
to OpenBSD kernel as well. Add some flesh to the java_default_home
fact to allow it to find the java binary.
2017-11-15 14:37:42 +00:00
Michael Baker
db30eb9e2d Adding support for Ubuntu (#243)
* Translate amd64

* Fix the path creation on exec
2017-11-15 14:36:10 +00:00
Paula McMaw
d49c1f0e29 Merge pull request #264 from puppetlabs/release
2.1.1 Release Mergeback
2017-11-09 13:48:10 +00:00
Eric Putnam
336a0e2e1a Merge pull request #263 from pmcmaw/paulaTesting
(FM-6503) - Release Prep for 2.2.1
2.1.1
2017-11-08 09:25:50 -08:00
Paula McMaw
6592edd454 (FM-6503) - Release Prep for 2.2.1 2017-11-06 15:35:10 +00:00
Helen
e6e961e7fc Merge pull request #261 from bastelfreak/bumparchivebmjenplsmerge
allow latest archive version as dependency
2017-10-09 17:51:01 +01:00
Tim Meusel
2b2e639531 allow latest archive version as dependency 2017-10-09 18:30:09 +02:00