Plugins » Katello

fixing manifest import after dynflow changes
and fixing issue with enabling a repo after creating a puppet repo

Adapting new dynflow work to content views UI

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

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.

Merge branch 'master' into cv-rework

fixing environment creation after master merge

Merge pull request #3804 from bbuckingham/cv-rework-archives

Content Views Rework: do not publish archive repos to nodes

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

Cv rework merge

Merge pull request #3796 from daviddavis/temp/20140311111528

Composite Content Views: Publish and yum content validation