Plugins » Katello

fixes #4744 - updating copyright to 2014

Merge pull request #3832 from ehelms/fixes-4657

Fixes 4657: Removes Katello current user setting and moves consumer

Fixes #4657: Removes Katello current user setting and moves consumer
authentication checking to the proxies controller.

Previously, the API controller was attempting to handle authentication for
standard users and consumers across all controllers. After moving all consumer...

Merge branch 'master' into cv-rework

Conflicts:
app/controllers/katello/api/v2/changesets_controller.rb
app/controllers/katello/api/v2/content_view_definitions_controller.rb
app/controllers/katello/api/v2/filter_rules_controller.rb
app/controllers/katello/api/v2/filters_controller.rb...

Fixes #4515 - Add support for dynamic bindings

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 pull request #3794 from jlsherrill/cv-rework-merge

Cv rework 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...

Delete puppet module index during katello:reset

Fixes #4594: Updates the references to the consumer cert RPM.