Conflicts: cli/katello-cli.spec puppet/katello-configure.spec rel-eng/packages/katello rel-eng/packages/katello-cli rel-eng/packages/katello-configure rel-eng/releasers.conf src/katello.spec
…ng the page to not load. [stolen from tomckay]
- New strings for changes. - Fixed a spec test since it failed properly, yay!
…included When System->Packages loads, have the Add/Remove links disabled. Enable them when user adds text in the form... and disable when user removes the text.
This commit provides some changes to the content/layout of the GPG Keys -> Products and Repositories pane. Since the same name can be used for multiple repos in different products, this change is to show the user which product a given repo is associated with.
This is a short term fix while we work on the real solution to 773088 and the timeout issues we are seeing. By no means is this the right or long term thing to do. Will move back to 30 after we have fixed the above bug