Plugins » Katello

fixing errors from merge from cv-rework

Merge remote-tracking branch 'upstream/cv-rework' into cv-rework-dynflow

Conflicts:
app/lib/actions/katello/system/create.rb
app/lib/actions/katello/user/create.rb
app/models/katello/content_view.rb
app/models/katello/glue/pulp/repo.rb
app/models/katello/repository.rb...

Merge remote-tracking branch 'origin/master' into cv-rework

Conflicts:
app/lib/actions/katello/environment/library_create.rb
app/models/katello/content_view_definition.rb
app/models/katello/content_view_version.rb
test/actions/headpin/library_create_test.rb

Fix typo

Actions::Base is preferred over Dynflow::Action

Merge Actions::Headpin into Actions::Katello

It's not clear what next version of Headpin will or will not include.
Having all Katello related actions under one namespace makes the
situation much easier for now.

Fixes #4644: Update foreman content when library is created

Fixes #4644: Create Foreman environment for all content views

There are cases when it makes sense to have the environment
created even when no puppet content is there: such as provisioning
a system into the environment without using puppet at all.

fixing environment creation after master merge

Merge pull request #3794 from jlsherrill/cv-rework-merge

Cv rework merge