i18n - fixing merge issue introduced by 2cee9ef0d7ee53
test fix
test fix
Content views: worked on content view search

Fixed a few bugs with content view content search and added version numbers.
Merge pull request #1624 from daviddavis/1620

Fixing #1620 by setting url_content_views_proc to nil
Merge pull request #1626 from daviddavis/cv_content_search

Content views: content search fixes and tweaks
Merge pull request #1634 from lzap/i18n-merge-fix

i18n - fixing merge issue introduced by 2cee9ef0d7ee53
moving cli tests into same script so breakage stops travis when it occurs
content views - fix query that failed on older postresql

The query before this change worked ok for katello on F17; however,
on RHEL 6.3 it would generate the error below. It appears that the newer
version (9.1.7-1) of postgres is more lenient on the 'group by' than the older
version (8.4.13-1).

PGError: ERROR: column "content_views.name" must appear in the GROUP BY clause or be used in an aggregate function LINE 1: SELECT "content_views".* FROM "content_views" INNER JOIN "c... ^ : SELECT "content_views".* FROM "content_views" INNER JOIN "content_view_versions" ON "content_view_versions"."content_view_id" = "content_views"."id" INNER JOIN "content_view_version_environments" ON "content_view_versions"."id" = "content_view_version_environments"."content_view_version_id" INNER JOIN "environments" ON "environments"."id" = "content_view_version_environments"."environment_id" WHERE ("content_views".content_view_definition_id = 1) GROUP BY "content_views"."id" HAVING count("environments"."id") > 1 LIMIT 1 (ActiveRecord::StatementInvalid)

The new query provides an alternative that avoids using 'group by'
which, if used, would require us to list every column defined by
the content_views schema.
removing uneeded cd from ci script
attempting to fix odd pylint error
pulp peformance enhancements
Merge pull request #1638 from bbuckingham/fork_content_views_fix_query-2

content views - fix query that failed on older postresql
Merge pull request #1562 from lzap/ssl-errors-httpd

866493 - frequent SSL renegotiations and log level
comp resources - fixed system tests
content views - fix few bugs in view publish/refresh/promote

Found a few minor bugs when testing composite and non-composite
views.
912698 - ak subscribe:  take the number of sockets in pool into account

When a pool has two sockets and my machine 3, 2 pools should be consumed.
Merge branch 'master' of https://github.com/Katello/katello into fast_import2
fast import - migrating cli methods to use evaluate_task_status
content views - fix a few broken tests