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
fixing environment creation after master merge
Merge branch 'master' into cv-rework
Conflicts: app/models/katello/content_view.rb app/models/katello/content_view_definition.rb app/models/katello/content_view_version.rb app/models/katello/kt_environment.rb app/views/katello/content_view_definitions/_publish.html.haml...
Merge pull request #3774 from jlsherrill/cv-history
adding content view history ui
Merge pull request #3766 from daviddavis/temp/20140303113408
Content Views: Added test for updating composites
Content Views Rework: prepend content_view on filter models, update routes
This commit addresses the following:
1. Rename the filter models/schema, prepending 'content_view_' to each. This change is to be consistent with other models (e.g. content_view_environments) as well as to ensure that there is...
Content Views: Added tests for updating composites
Merge pull request #3760 from komidore64/manifest-async-tasks
subscriptions - manifest refresh and delete into dynflow actions
Conflicts: app/assets/javascripts/katello/content_view_definitions/content_view_definition.js app/views/katello/content_view_definitions/_publish.html.haml engines/fort/app/models/node.rb engines/fort/lib/fort/actions/content_view_refresh.rb...
Fixing broken tests by reloading models and fixing relationships
View revisions
Also available in: Atom