Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 1.2.x #102

Merged
merged 50 commits into from
Nov 12, 2014
Merged

Merge 1.2.x #102

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
cf12724
Prepare 1.2.4.
May 14, 2014
7c3a3e4
Claim PE3.3 support.
May 15, 2014
7fac269
Release 1.2.4
hunner Jun 4, 2014
74f7190
Merge pull request #64 from hunner/release_1.2.4
Jun 4, 2014
529b526
Merge branch 'master' into merge-test
Jun 9, 2014
06eb4f5
Merge pull request #68 from mhaskel/merge-test
hunner Jun 9, 2014
7075f83
Require rspec >= 2.99 since the tests have been converted to rspec3.
Jun 10, 2014
2dc3744
Merge pull request #69 from mhaskel/rspec-pinning
hunner Jun 10, 2014
96ed280
Pin to new beaker-rspec
hunner Jun 10, 2014
ab45d39
Merge pull request #70 from hunner/pin_rspec
Jun 10, 2014
617976e
Pin rspec ~> 2.99 due to bundle issues
hunner Jun 19, 2014
f28186b
Merge pull request #71 from hunner/299
Jun 19, 2014
b49ce21
Remove windows support.
Jun 19, 2014
7fb6b5e
Merge pull request #72 from mhaskel/remove-win-support
hunner Jun 19, 2014
996af6d
Merge pull request #73 from apenney/rip-out-puppet-files-mistake
Jun 24, 2014
cee1b2b
openssl on sol 11 is in /usr/bin
hunner Jun 26, 2014
68fbf5c
Merge pull request #74 from hunner/sol11_path
justinstoller Jun 26, 2014
6553150
1.2.5 prep.
Jul 10, 2014
03362c1
Merge pull request #79 from mhaskel/1.2.5-prep
hunner Jul 10, 2014
c3558ca
Remove AIX 5.3 support as we can't test against it.
Jul 10, 2014
5c1b8ac
Merge pull request #80 from mhaskel/remove_aix_53
hunner Jul 10, 2014
096c230
Capture back metadata.json reformating
Jul 14, 2014
ed2b035
Merge pull request #81 from cyberious/1.2.x
Jul 14, 2014
7c4db4c
Remove puppet_module_install in favor of copy_module_to
Sep 10, 2014
62adc4f
Merge pull request #85 from cyberious/1.2.x
hunner Sep 10, 2014
aa79096
Add configuration file for modulesync
Jun 25, 2014
1c5e701
Sync files
Jun 26, 2014
2f7fa14
Update .sync.yml to support new .travis.yml configs
Jun 27, 2014
2a34044
Synchronize .travis.yml
Jun 27, 2014
7ceeb52
Update Gemfile for .travis.yml defaults
Jun 30, 2014
30f6f79
Add validate and lint tasks to travis script
Jul 3, 2014
beb1184
Update spec_helper for more consistency
Aug 28, 2014
8278a39
Fix acceptance helper
Oct 6, 2014
10f99db
Stop depending on puppet certs to test java_ks
Oct 8, 2014
5dcbdde
Fix solaris 10 tests
Oct 8, 2014
bed08ea
Remove puppet_module_install in favor of copy_module_to
Sep 10, 2014
ae9f479
Merge pull request #95 from mhaskel/1.2.x_rebase_master
cyberious Nov 10, 2014
a370589
1.2.6 prep
Nov 10, 2014
1a03afe
Merge pull request #96 from mhaskel/1.2.6-prep
hunner Nov 10, 2014
f6d9b94
I had some rebase fail
Nov 10, 2014
2b1fe1b
Merge pull request #97 from mhaskel/rebase_fail
cyberious Nov 10, 2014
37a3692
Let the java module fail
Nov 10, 2014
f819a56
Merge pull request #98 from mhaskel/allow_java_to_fail
hunner Nov 10, 2014
c21dc01
Fix path for solaris
Nov 10, 2014
4145d79
Merge pull request #99 from mhaskel/sol_fix
cyberious Nov 10, 2014
3c96f6f
Fix path for PE
Nov 11, 2014
954f3dd
Merge pull request #100 from mhaskel/fix_path
hunner Nov 11, 2014
b553940
Fix for sles10
Nov 11, 2014
1133bd2
Merge pull request #101 from mhaskel/sles10_fix
hunner Nov 11, 2014
ade564c
Merge remote-tracking branch 'upstream/1.2.x' into merge_1.2.x
Nov 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spec/acceptance/keystore_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
case fact('osfamily')
when "Solaris"
keytool_path = '/usr/java/bin/'
resource_path = "['/usr/java/bin/','/opt/puppet/bin/']"
resource_path = "['/usr/java/bin/','/opt/puppet/bin/','/usr/bin/']"
when "AIX"
keytool_path = '/usr/java6/bin/'
resource_path = "['/usr/java6/bin/','/usr/bin/']"
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/private_key_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
case fact('osfamily')
when "Solaris"
keytool_path = '/usr/java/bin/'
resource_path = "['/usr/java/bin/','/opt/puppet/bin/']"
resource_path = "['/usr/java/bin/','/opt/puppet/bin/','/usr/bin/']"
when "AIX"
keytool_path = '/usr/java6/bin/'
resource_path = "['/usr/java6/bin/','/usr/bin/']"
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/truststore_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
case fact('osfamily')
when "Solaris"
keytool_path = '/usr/java/bin/'
resource_path = "['/usr/java/bin/','/opt/puppet/bin/']"
resource_path = "['/usr/java/bin/','/opt/puppet/bin/','/usr/bin/']"
when "AIX"
keytool_path = '/usr/java6/bin/'
resource_path = "['/usr/java6/bin/','/usr/bin/']"
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/unsupported_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
case fact('osfamily')
when "Solaris"
keytool_path = '/usr/java/bin/'
resource_path = "['/usr/java/bin/','/opt/puppet/bin/']"
resource_path = "['/usr/java/bin/','/opt/puppet/bin/','/usr/bin/']"
when "AIX"
keytool_path = '/usr/java6/bin/'
resource_path = "['/usr/java6/bin/','/opt/puppet/bin/']"
Expand Down