katellohammer-cli-katellohammer-cli-samkatello-agentkatello-certs-toolskatello-host-toolskatello-installerkatello-packagingkatello-selinuxkatello-websitepuppet-candlepinpuppet-capsulepuppet-certspuppet-commonpuppet-foreman_proxy_contentpuppet-katellopuppet-katello_develpuppet-pulppuppet-qpidpuppet-service_waitsmart_proxy_container_gatewaysmart_proxy_pulp
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 thesituation 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
This commit contains a very small change so that when anarchive repos i published, it is not published to the 'node'.
e.g /var/lib/pulp/nodes/published
View revisions
Also available in: Atom