 Brett Porter
|
86024aeef8
|
Use HTTP for fixture checkout
For testing over conference wifi!
|
2013-07-13 13:14:50 +10:00 |
|
|
Brett Porter
|
9188f0e15a
|
Merge pull request #29 from actionjack/master
Added support for Amazon linux
|
2013-07-12 20:11:22 -07:00 |
|
|
Brett Porter
|
6f7cdb76b4
|
Merge branch 'preferences' of https://github.com/mediatemple/puppetlabs-java into mediatemple-preferences
Conflicts:
CHANGELOG
|
2013-07-13 13:09:40 +10:00 |
|
|
Brett Porter
|
cde7046e99
|
Merge branch 'fixes_for_centos_versions' of https://github.com/garethr/puppetlabs-java into garethr-fixes_for_centos_versions
Conflicts:
Modulefile
README.markdown
manifests/init.pp
spec/spec_helper.rb
|
2013-06-02 21:47:19 -07:00 |
|
|
Brett Porter
|
44280b3535
|
Merge pull request #26 from nrvale0/add_quantal
add support for Ubuntu quantal and raring
|
2013-06-02 20:52:17 -07:00 |
|