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

Cherry picks 3.2.1 #469

Merged
merged 3 commits into from
Dec 13, 2016
Merged

Conversation

johnpmitsch
Copy link

No description provided.

@theforeman-bot
Copy link

There were the following issues with the commit message:

  • 08c3fee must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@akofink
Copy link
Member

akofink commented Dec 13, 2016

You will need #468 for passing tests.

@ehelms
Copy link
Member

ehelms commented Dec 13, 2016

@akofink even though it fixes tests, this branch is part of 1.13/3.2 where the hammer is older, I suspect if we keep the test fixing commit in here it will break in production

@akofink
Copy link
Member

akofink commented Dec 13, 2016

@ehelms Yes, it must be paired with theforeman/hammer-cli#227. You could modify travis to use the appropriate branch in hammer-cli instead of master, I guess.

@ehelms
Copy link
Member

ehelms commented Dec 13, 2016

I'd recommend pulling that comment and accepting that tests will not run on this branch.

@theforeman-bot
Copy link

There were the following issues with the commit message:

  • dee72c8 must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

akofink and others added 2 commits December 13, 2016 15:04
Add organization options to all content view filter rule commands
(cherry picked from commit 153cbf2)
@theforeman-bot
Copy link

There were the following issues with the commit message:

  • 64b0186 must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@johnpmitsch
Copy link
Author

@ehelms its back to the 2 cherry picks and the version bump

@ehelms ehelms merged commit a232a57 into Katello:0.1-stable Dec 13, 2016
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.

5 participants