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.

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

Remove lsb #51

Merged
merged 1 commit into from
May 20, 2015
Merged

Remove lsb #51

merged 1 commit into from
May 20, 2015

Conversation

rnelson0
Copy link
Contributor

Resolves issue #41

@@ -1,6 +1,6 @@
{
"name": "ghoneycutt-nfs",
"version": "1.8.0",
"version": "1.8.1",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please unstage this and rebase your commit? It is good practice to not bump versions in a commit as the upstream maintainer will manage this as they might release other code before this.

@ghoneycutt
Copy link
Owner

retriggered travis. not sure why this was failing everywhere.

@@ -82,7 +82,7 @@
case $::osfamily {
'RedHat' : {
$default_pipefs_directory = 'UNSET'
case $::lsbmajdistrelease {
case $::operatingsystemmajrelease {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll need to update the corresponding spec tests for RedHat to use this fact.

@rnelson0
Copy link
Contributor Author

@ghoneycutt I split this into two commits, one each for manifests and rspec test changes, let me know if you want those merged. Otherwise the rebase is ready for review.

@ghoneycutt
Copy link
Owner

Hi @rnelson0, Thanks again! Please rebase into one commit as either commit is not mergeable by itself.

I'm looking into why travis-ci is failing though. Submitted PR #52. After I get it merged, could you rebase against master and do your search/replace magic again :) Hopefully that fixes the travis-ci issue.

@ghoneycutt
Copy link
Owner

Got it merged.

@rnelson0
Copy link
Contributor Author

@ghoneycutt Done, ready for review.

@rnelson0
Copy link
Contributor Author

Whoops, hold off, just saw the new tests you added in that PR.

  ::nfs and ::nfs::idmap replace lsbmajdistrelease with operatingsystemajrelease for EL only.
  Rspec tests adjusted to use operatingsystemmajrelease in addition to lsbmajdistrelease. 100% pass.
@rnelson0
Copy link
Contributor Author

@ghoneycutt OK really good to go this time!

@ghoneycutt
Copy link
Owner

@rnelson0 great work!

ghoneycutt added a commit that referenced this pull request May 20, 2015
@ghoneycutt ghoneycutt merged commit 67da7a3 into ghoneycutt:master May 20, 2015
@ghoneycutt
Copy link
Owner

Released in v1.9.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants