move exception_paranoia option form application.rb to katello.yml
Merge branch 'master' into story/configuration

* master: (28 commits)
  Reduced API documentation for Headpin mode
  ...

Conflicts:
	src/config/katello.template.yml
	src/lib/katello_config.rb
Log exception message for RecordNotFound exception

To at least have a clue where it's coming form.
add default values to configuration
Merge branch 'master' into story/configuration

* master: (16 commits)
  851331 - Add organization label attribute
  ...
replace Notify with #notify in controller

Notify is for ActiveRecord models only
add missing notification when repo discovery fails
leave app_mode option in katello.yml

for sed command in katello-configure to work
documentation update
Merge branch 'master' into story/configuration

* master: (7 commits)
  867304 - sorting first environment in paths for env selector
  ...
Rails32 - Adds compass-rails for Compass 0.12 on Fedora 18 and
updates configuration file for compass for both version of compass
0.11.5 and 0.12.
Content views: fix column headers in CLI

Fix column headers in CLI to use locale function to convert text
changing secrets 'shhhh' to 'katello'
rename katello-defaults.yml to katello_defaults.yml
jruby - rpm installation is not supported on jruby yet
Merge pull request #1606 from daviddavis/cv_header_locale_fix

Content views: header locale fix
Rewriting test to hopefully fix jenkins error

Trying to fix jenkins error: ActiveRecord::StatementInvalid:
       PG::Error: ERROR:  current transaction is aborted, commands ignored
until end of transaction block
       : SELECT COUNT(*) FROM "content_view_definitions"
Merge pull request #1603 from ehelms/compass-rails-32

Rails32 - Adds compass-rails for Compass 0.12 on Fedora 18 and
Merge pull request #1607 from daviddavis/fix_jenkins_cv

Trying to fix jenkins error
content views - fix migration that maps repos to view versions

This is a fix for a broken migration. Without this migration,
rake db:migrate will fail on installations that have
existing environments/repositories.  The primary issue
observed by the user is an error indicating an attempt
to assign a version=view.