[prev in list] [next in list] [prev in thread] [next in thread] 

List:       katello-commits
Subject:    [katello-commits] [Katello/katello] 124704: Pulpv2 - converting Repo creation/deletion
From:       Justin Sherrill <jlsherrill () gmail ! com>
Date:       2013-01-30 13:54:13
Message-ID: 51092605d46ee_6995e77ae829694 () sh2 ! rs ! github ! com ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/Katello/katello
  Commit: 124704c7a94adbf3487d2123c16831b44df7b393
      https://github.com/Katello/katello/commit/124704c7a94adbf3487d2123c16831b44df7b393
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/glue/pulp/user.rb
    M src/app/models/repository.rb
    M src/app/views/repositories/_edit.html.haml
    A src/db/migrate/20120814142911_repository_add_content_id.rb
    A src/db/migrate/20120815145728_repository_add_arch.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  Pulpv2 - converting Repo creation/deletion


  Commit: 5ea34758faeded01dce327a3d80fb4b77dc100df
      https://github.com/Katello/katello/commit/5ea34758faeded01dce327a3d80fb4b77dc100df
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/repository.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - cleaning some unused/no longer available repo attrs


  Commit: c9bc0a0f974a69a5557979d4fcabf5852270aade
      https://github.com/Katello/katello/commit/c9bc0a0f974a69a5557979d4fcabf5852270aade
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  Pulpv2 - fixing schedule application


  Commit: a2ed37ed0515808ab128d59d61f381081a203528
      https://github.com/Katello/katello/commit/a2ed37ed0515808ab128d59d61f381081a203528
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/user.rb
    M src/app/models/pulp_sync_status.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/repository.rb
    M src/app/models/task_status.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - fixing some task related parsing and urls, sync management page now mostly \
works


  Commit: fc698f8f2e28a4375f4aab1e4257678e3d05bc9e
      https://github.com/Katello/katello/commit/fc698f8f2e28a4375f4aab1e4257678e3d05bc9e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M src/app/models/pulp_sync_status.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - fixing sync with candidate build, and improving sync status reporting


  Commit: ab4ec52af333c2c0a3214b19a1dfeb50fdab50c7
      https://github.com/Katello/katello/commit/ab4ec52af333c2c0a3214b19a1dfeb50fdab50c7
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-08-24 (Fri, 24 Aug 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - cancel sync now working


  Commit: 34e7139171d8398b28f9ec87e221190c61ade318
      https://github.com/Katello/katello/commit/34e7139171d8398b28f9ec87e221190c61ade318
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M src/app/models/glue/pulp/repos.rb

  Log Message:
  -----------
  pulpv2 - fixing manifest import


  Commit: 1bef970f22d6ac252a675bdfa7b0c34f1a1eb382
      https://github.com/Katello/katello/commit/1bef970f22d6ac252a675bdfa7b0c34f1a1eb382
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - fixing package/errata list for new candidate build


  Commit: 15830aa82d0cad011c4475f14054cd588990554f
      https://github.com/Katello/katello/commit/15830aa82d0cad011c4475f14054cd588990554f
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - breaking out importers and exporters


  Commit: 73c391102d3fb290d37d7ac0ea016ac836aa3313
      https://github.com/Katello/katello/commit/73c391102d3fb290d37d7ac0ea016ac836aa3313
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M src/app/controllers/application_controller.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/repository.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - migrating to proper repo cloning via unit copy


  Commit: 0c625d80150508c1ebe30b61766707ee88c310c5
      https://github.com/Katello/katello/commit/0c625d80150508c1ebe30b61766707ee88c310c5
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M src/app/models/glue/pulp/user.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - adding back role support now that it is present


  Commit: f33af4e756453b12c4f5b3ed8b35e8be252b7068
      https://github.com/Katello/katello/commit/f33af4e756453b12c4f5b3ed8b35e8be252b7068
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M src/app/models/pulp_task_status.rb

  Log Message:
  -----------
  pulpv2 - fixing return on refresh task


  Commit: c0b0e0b4b51e8b14578ffd8c89ade4604c62082a
      https://github.com/Katello/katello/commit/c0b0e0b4b51e8b14578ffd8c89ade4604c62082a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M src/app/controllers/changesets_controller.rb
    M src/app/models/changeset.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/pulp_sync_status.rb
    M src/app/models/repository.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - migrating package and errata promotion


  Commit: 3258528614a75348f9d3f76afe2ca529df24fdec
      https://github.com/Katello/katello/commit/3258528614a75348f9d3f76afe2ca529df24fdec
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-07 (Fri, 07 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/repo.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - converting errata promotion


  Commit: e4df177fa4018288d4e28fc0f8401f6fbbaa7b92
      https://github.com/Katello/katello/commit/e4df177fa4018288d4e28fc0f8401f6fbbaa7b92
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-07 (Fri, 07 Sep 2012)

  Changed paths:
    M src/app/controllers/api/repositories_controller.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/repository.rb
    M src/db/seeds.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - mostly fixed post sync actions


  Commit: bdd1c603892f1c6d2ca1662cd71b3d64333cc735
      https://github.com/Katello/katello/commit/bdd1c603892f1c6d2ca1662cd71b3d64333cc735
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-12 (Wed, 12 Sep 2012)

  Changed paths:
    M src/app/controllers/api/filters_controller.rb
    M src/app/controllers/filters_controller.rb
    M src/app/models/filter.rb
    A src/app/models/filter_package.rb
    R src/app/models/glue/pulp/filter.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/repository.rb
    A src/db/migrate/20120910183801_filter_add_description.rb
    A src/db/migrate/20120910185505_filter_packages.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - fixing package cloning to work with blacklists


  Commit: 8de8bfce93c3f108b7bbcb328e41ed2add861e91
      https://github.com/Katello/katello/commit/8de8bfce93c3f108b7bbcb328e41ed2add861e91
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-13 (Thu, 13 Sep 2012)

  Changed paths:
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - fixing repository distributions call


  Commit: 722c15149df43982682708846585f679870403ad
      https://github.com/Katello/katello/commit/722c15149df43982682708846585f679870403ad
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-13 (Thu, 13 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - changing way we fetch packages and errata for repos for upcomign rfe


  Commit: 62f5ea91821db7d5869380d9389d70e310ae6a12
      https://github.com/Katello/katello/commit/62f5ea91821db7d5869380d9389d70e310ae6a12
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-13 (Thu, 13 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/errata.rb

  Log Message:
  -----------
  pulpv2 - converting api filter call to use search server


  Commit: 9e88be7adc874f766311ffaf8374bddd18622bf4
      https://github.com/Katello/katello/commit/9e88be7adc874f766311ffaf8374bddd18622bf4
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-13 (Thu, 13 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/repository.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - converting repo promotion to use filters

instead of doing a full unit_copy,
we have to copy each type and specify filters where
appropriate


  Commit: 1da67ee8d72accf99233254dc3166372939d72ca
      https://github.com/Katello/katello/commit/1da67ee8d72accf99233254dc3166372939d72ca
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-13 (Thu, 13 Sep 2012)

  Changed paths:
    M cli/doc/source/conf.py
    M cli/src/katello/client/cli/base.py
    M cli/src/katello/client/core/admin.py
    M cli/src/katello/client/core/base.py
    M cli/src/katello/client/core/changeset.py
    M cli/src/katello/client/core/client.py
    M cli/src/katello/client/core/distribution.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/errata.py
    M cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/package.py
    M cli/src/katello/client/core/packagegroup.py
    M cli/src/katello/client/core/permission.py
    M cli/src/katello/client/core/ping.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/provider.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/shell_command.py
    M cli/src/katello/client/core/sync_plan.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/system_group.py
    M cli/src/katello/client/core/template.py
    M cli/src/katello/client/core/user.py
    M cli/src/katello/client/core/user_role.py
    M cli/src/katello/client/core/version.py
    M cli/src/katello/client/shell.py
    M cli/test/katello/__init__.py
    M puppet/modules/certs/manifests/config.pp
    R puppet/pubkeys/LIST
    R puppet/pubkeys/Makefile
    R puppet/pubkeys/README
    R puppet/pubkeys/hudson_rsa.pub
    R puppet/pubkeys/id_auto_dsa.pub
    R puppet/pubkeys/jrist.pub
    R puppet/pubkeys/lzap.pub
    R puppet/pubkeys/mbacovsk.pub
    R puppet/pubkeys/pchalupa.pub
    R puppet/pubkeys/tstrachota.pub
    R puppet/pubkeys/witlessb.pub
    A rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    A rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    A rel-eng/comps/comps-katello-foreman-server-rhel6.xml

  Log Message:
  -----------
  Merge branch 'master', remote-tracking branch 'origin' into pulpv2-merge


  Commit: 3e3079ab691c2e81e7f6615d474d48f5dc8d592d
      https://github.com/Katello/katello/commit/3e3079ab691c2e81e7f6615d474d48f5dc8d592d
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    A src/app/models/deletion_changeset.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/repository.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - Converting repo deletion to delete the actual repo

Conflicts:

	src/app/models/deletion_changeset.rb
	src/app/models/glue/pulp/repos.rb


  Commit: d765ddbe006568b62bc7cdf771753a1b4ec9e7a2
      https://github.com/Katello/katello/commit/d765ddbe006568b62bc7cdf771753a1b4ec9e7a2
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  pulpv2 - moving feed info to accessors
(cherry picked from commit dd92f2597c643556f5cf174162578042c6c03874)


  Commit: 9bcbdb93aa90dcb8ed4db46fcbe128a7f605f6ad
      https://github.com/Katello/katello/commit/9bcbdb93aa90dcb8ed4db46fcbe128a7f605f6ad
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M src/Gemfile
    M src/app/models/glue/pulp/user.rb
    M src/config/environments/development.rb

  Log Message:
  -----------
  Adds runcible local path declaration for easy development and auto-loading of \
runcible files for cross development in the early stages.

Conflicts:

	src/Gemfile
	src/app/models/glue/pulp/user.rb


  Commit: 6e9f8a9f57fa80437ea9f60cbdabffc5fd2cc794
      https://github.com/Katello/katello/commit/6e9f8a9f57fa80437ea9f60cbdabffc5fd2cc794
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  pulpv2 - requiring pulp-rpm-server instead of pulp
(cherry picked from commit 262ece6e7d2756625056d514a75d4a04e28359d7)


  Commit: ca6c5b132d1ca03809355a5ad24d371e1dcc4c75
      https://github.com/Katello/katello/commit/ca6c5b132d1ca03809355a5ad24d371e1dcc4c75
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    A katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb
    M puppet/modules/pulp/manifests/config.pp
    M puppet/modules/pulp/templates/etc/httpd/conf.d/pulp.conf.erb
    R puppet/modules/pulp/templates/etc/pulp/pulp.conf.erb

  Log Message:
  -----------
  pulpv2 -updating katello configure for pulpv2


  Commit: 63e1dd14622d33fd8e078b43f53eb0b259823178
      https://github.com/Katello/katello/commit/63e1dd14622d33fd8e078b43f53eb0b259823178
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M src/app/controllers/application_controller.rb
    M src/app/models/glue/pulp/user.rb
    M src/lib/util/threadsession.rb

  Log Message:
  -----------
  PulpV2 - Adds early support for Runcible gem which supplies new PulpV2 API \
bindings.

Conflicts:

	src/Gemfile
	src/app/models/glue/pulp/user.rb


  Commit: a770720a3f9e7e3d484fb744463725f86e581358
      https://github.com/Katello/katello/commit/a770720a3f9e7e3d484fb744463725f86e581358
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M src/lib/util/threadsession.rb

  Log Message:
  -----------
  PulpV2 - Updates to add logging to Rails logger of RestClient calls.  Note that \
this current method also exposes the ElasticSearch RestClient calls. (cherry picked \
from commit 144f86a7797c27e02abf5463d794c2fcd27304e7)


  Commit: de251cecb3113d1d28db1847b6ed4c7c684a4b76
      https://github.com/Katello/katello/commit/de251cecb3113d1d28db1847b6ed4c7c684a4b76
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/user.rb

  Log Message:
  -----------
  pulpv2 - fixing broken model path


  Commit: a725dbfad0427f7b9d6b06915e4ff6533b9a9cdc
      https://github.com/Katello/katello/commit/a725dbfad0427f7b9d6b06915e4ff6533b9a9cdc
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M src/vendor/converge-ui

  Log Message:
  -----------
  converge-ui update


  Commit: 6f2fd5d6c965a0d127925ce99f7437dd041ab1ca
      https://github.com/Katello/katello/commit/6f2fd5d6c965a0d127925ce99f7437dd041ab1ca
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M .gitignore
    M agent/katello-agent.spec
    M certs-tools/katello-certs-tools.spec
    M certs-tools/setup.py
    M cli/Makefile
    M cli/bin/katello
    M cli/doc/source/cli_devel_basics.rst
    M cli/katello-cli.spec
    A cli/man/headpin.1
    M cli/man/katello.pod
    A cli/po/Makefile
    M cli/po/as.po
    M cli/po/bn.po
    M cli/po/de.po
    M cli/po/es.po
    M cli/po/fr.po
    M cli/po/gu.po
    M cli/po/hi.po
    M cli/po/it.po
    M cli/po/ja.po
    M cli/po/keys.pot
    M cli/po/kn.po
    M cli/po/ko.po
    M cli/po/ml.po
    M cli/po/mr.po
    M cli/po/or.po
    M cli/po/pa.po
    M cli/po/pt.po
    M cli/po/ru.po
    M cli/po/ta.po
    M cli/po/te.po
    M cli/po/zh_CN.po
    M cli/po/zh_TW.po
    M cli/src/katello/client/api/activation_key.py
    M cli/src/katello/client/api/admin.py
    M cli/src/katello/client/api/base.py
    M cli/src/katello/client/api/changeset.py
    M cli/src/katello/client/api/environment.py
    M cli/src/katello/client/api/errata.py
    M cli/src/katello/client/api/gpg_key.py
    M cli/src/katello/client/api/job.py
    M cli/src/katello/client/api/organization.py
    M cli/src/katello/client/api/permission.py
    M cli/src/katello/client/api/product.py
    M cli/src/katello/client/api/provider.py
    M cli/src/katello/client/api/repo.py
    M cli/src/katello/client/api/sync_plan.py
    M cli/src/katello/client/api/system.py
    M cli/src/katello/client/api/system_group.py
    M cli/src/katello/client/api/template.py
    M cli/src/katello/client/api/user.py
    M cli/src/katello/client/api/user_role.py
    M cli/src/katello/client/api/utils.py
    M cli/src/katello/client/cli/base.py
    M cli/src/katello/client/config.py
    M cli/src/katello/client/constants.py
    M cli/src/katello/client/core/activation_key.py
    M cli/src/katello/client/core/admin.py
    M cli/src/katello/client/core/base.py
    M cli/src/katello/client/core/changeset.py
    M cli/src/katello/client/core/client.py
    M cli/src/katello/client/core/datetime_formatter.py
    M cli/src/katello/client/core/distribution.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/errata.py
    M cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/gpg_key.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/package.py
    M cli/src/katello/client/core/packagegroup.py
    M cli/src/katello/client/core/permission.py
    M cli/src/katello/client/core/ping.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/provider.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/shell_command.py
    M cli/src/katello/client/core/sync_plan.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/system_group.py
    M cli/src/katello/client/core/template.py
    M cli/src/katello/client/core/user.py
    M cli/src/katello/client/core/user_role.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/core/version.py
    A cli/src/katello/client/i18n.py
    M cli/src/katello/client/i18n_optparse.py
    M cli/src/katello/client/logutil.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/server.py
    M cli/src/katello/client/shell.py
    M cli/src/katello/client/utils/encoding.py
    M cli/src/katello/client/utils/option_validator.py
    M cli/src/katello/client/utils/printer.py
    M cli/src/katello/client/utils/usage.py
    M cli/test/katello/__init__.py
    A cli/test/katello/tests/core/changeset/changeset_create_test.py
    M cli/test/katello/tests/core/errata/errata_list_test.py
    M cli/test/katello/tests/core/permission/permission_create_test.py
    M cli/test/katello/tests/core/product/product_list_test.py
    M cli/test/katello/tests/core/product/product_promote_test.py
    M cli/test/katello/tests/core/provider/provider_status_test.py
    M cli/test/katello/tests/core/repo/repo_list_test.py
    M cli/test/katello/tests/core/repo/repo_status_test.py
    M cli/test/katello/tests/core/system/system_subscriptions_test.py
    M cli/test/katello/tests/core/template/template_delete_test.py
    M cli/test/katello/tests/core/template/template_import_test.py
    M cli/test/katello/tests/core/template/template_info_test.py
    M cli/test/katello/tests/core/template/template_list_test.py
    R headpin/katello-cli-headpin/LICENSE
    R headpin/katello-cli-headpin/README
    R headpin/katello-cli-headpin/bin/headpin
    R headpin/katello-cli-headpin/etc/client.conf
    R headpin/katello-cli-headpin/katello-cli-headpin.spec
    R headpin/katello-cli-headpin/man/headpin.pod
    A katello-configure/README
    A katello-configure/aux/check_erb
    A katello-configure/bin/katello-configure
    A katello-configure/bin/katello-passwd
    A katello-configure/bin/katello-upgrade
    A katello-configure/default-answer-file
    A katello-configure/katello-configure.spec
    A katello-configure/lib/puppet/parser/functions/katello_config_value.rb
    A katello-configure/lib/puppet/parser/functions/katello_create_read_password.rb
    A katello-configure/lib/puppet/parser/functions/katello_passencrypt.rb
    A katello-configure/lib/puppet/parser/functions/katello_process_count.rb
    A katello-configure/lib/puppet/parser/functions/katello_pulp_url.rb
    A katello-configure/man/katello-configure.pod
    A katello-configure/man/katello-passwd.pod
    A katello-configure/man/katello-upgrade.pod
    A katello-configure/modules/apache2/files/empty/.ignore
    A katello-configure/modules/apache2/files/etc/httpd/conf.d/ssl.conf
    A katello-configure/modules/apache2/files/etc/httpd/conf/httpd.conf.5
    A katello-configure/modules/apache2/files/etc/httpd/conf/httpd.conf.6
    A katello-configure/modules/apache2/manifests/config.pp
    A katello-configure/modules/apache2/manifests/init.pp
    A katello-configure/modules/apache2/manifests/install.pp
    A katello-configure/modules/apache2/manifests/params.pp
    A katello-configure/modules/apache2/manifests/service.pp
    A katello-configure/modules/apache2/manifests/ssl.pp
    A katello-configure/modules/candlepin/manifests/config.pp
    A katello-configure/modules/candlepin/manifests/init.pp
    A katello-configure/modules/candlepin/manifests/install.pp
    A katello-configure/modules/candlepin/manifests/params.pp
    A katello-configure/modules/candlepin/manifests/service.pp
    A katello-configure/modules/candlepin/templates/etc/candlepin/candlepin.conf.erb
    A katello-configure/modules/candlepin/templates/etc/tomcat6/server.xml.erb
    A katello-configure/modules/certs/manifests/config.pp
    A katello-configure/modules/certs/manifests/init.pp
    A katello-configure/modules/certs/manifests/params.pp
    A katello-configure/modules/certs/templates/rhsm-katello-reconfigure.erb
    A katello-configure/modules/common/manifests/line.pp
    A katello-configure/modules/elasticsearch/manifests/config.pp
    A katello-configure/modules/elasticsearch/manifests/init.pp
    A katello-configure/modules/elasticsearch/manifests/install.pp
    A katello-configure/modules/elasticsearch/manifests/params.pp
    A katello-configure/modules/elasticsearch/manifests/service.pp
    A katello-configure/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb
  A katello-configure/modules/elasticsearch/templates/etc/sysconfig/elasticsearch.erb
    A katello-configure/modules/foreman/manifests/config.pp
    A katello-configure/modules/foreman/manifests/init.pp
    A katello-configure/modules/foreman/manifests/install.pp
    A katello-configure/modules/foreman/manifests/params.pp
    A katello-configure/modules/foreman/manifests/repos.pp
    A katello-configure/modules/foreman/manifests/service.pp
    A katello-configure/modules/foreman/templates/database.yml.erb
    A katello-configure/modules/foreman/templates/httpd.conf.erb
    A katello-configure/modules/foreman/templates/settings.yaml.erb
    A katello-configure/modules/foreman/templates/sysconfig.erb
    A katello-configure/modules/foreman/templates/thin.yml.erb
    A katello-configure/modules/katello/manifests/config.pp
    A katello-configure/modules/katello/manifests/init.pp
    A katello-configure/modules/katello/manifests/install.pp
    A katello-configure/modules/katello/manifests/params.pp
    A katello-configure/modules/katello/manifests/service.pp
    A katello-configure/modules/katello/templates/etc/httpd/conf.d/katello.conf.erb
    A katello-configure/modules/katello/templates/etc/katello/client.conf.erb
    A katello-configure/modules/katello/templates/etc/katello/katello.yml.erb
    A katello-configure/modules/katello/templates/etc/katello/thin.yml.erb
    A katello-configure/modules/katello/templates/etc/ldap_fluff.yml.erb
    A katello-configure/modules/katello/templates/etc/sysconfig/katello.erb
    A katello-configure/modules/mongodb/manifests/config.pp
    A katello-configure/modules/mongodb/manifests/init.pp
    A katello-configure/modules/mongodb/manifests/install.pp
    A katello-configure/modules/mongodb/manifests/service.pp
    A katello-configure/modules/mongodb/templates/mongodb.conf.erb
    A katello-configure/modules/postgres/manifests/config.pp
    A katello-configure/modules/postgres/manifests/createdb.pp
    A katello-configure/modules/postgres/manifests/createuser.pp
    A katello-configure/modules/postgres/manifests/dropdb.pp
    A katello-configure/modules/postgres/manifests/init.pp
    A katello-configure/modules/postgres/manifests/install.pp
    A katello-configure/modules/postgres/manifests/params.pp
    A katello-configure/modules/postgres/manifests/service.pp
    A katello-configure/modules/postgres/manifests/sqlexec.pp
    A katello-configure/modules/postgres/templates/pg_hba.conf.erb
    A katello-configure/modules/postgres/templates/postgresql.conf.erb
    A katello-configure/modules/pulp/manifests/config.pp
    A katello-configure/modules/pulp/manifests/init.pp
    A katello-configure/modules/pulp/manifests/install.pp
    A katello-configure/modules/pulp/manifests/params.pp
    A katello-configure/modules/pulp/manifests/service.pp
    A katello-configure/modules/pulp/templates/etc/httpd/conf.d/pulp.conf.erb
    A katello-configure/modules/pulp/templates/etc/pulp/repo_auth.conf.erb
    A katello-configure/modules/qpid/manifests/config.pp
    A katello-configure/modules/qpid/manifests/init.pp
    A katello-configure/modules/qpid/manifests/install.pp
    A katello-configure/modules/qpid/manifests/service.pp
    A katello-configure/modules/qpid/templates/etc/qpidd.conf.erb
    A katello-configure/modules/thumbslug/manifests/config.pp
    A katello-configure/modules/thumbslug/manifests/init.pp
    A katello-configure/modules/thumbslug/manifests/install.pp
    A katello-configure/modules/thumbslug/manifests/params.pp
    A katello-configure/modules/thumbslug/manifests/service.pp
    A katello-configure/modules/thumbslug/templates/etc/thumbslug/thumbslug.conf.erb
    A katello-configure/options-format-file
    A katello-configure/upgrade-scripts/default/0002_update_pulp.sh
    A katello-configure/upgrade-scripts/default/0003_update_candlepin.sh
    A katello-configure/upgrade-scripts/default/0004_migrate_katello_db.sh
    A katello-configure/upgrade-scripts/upgrade/0001_preallocate_mongo.sh
    R puppet/README
    R puppet/aux/check_erb
    R puppet/bin/katello-configure
    R puppet/bin/katello-passwd
    R puppet/bin/katello-upgrade
    R puppet/default-answer-file
    R puppet/katello-configure.spec
    R puppet/lib/puppet/parser/functions/katello_config_value.rb
    R puppet/lib/puppet/parser/functions/katello_create_read_password.rb
    R puppet/lib/puppet/parser/functions/katello_passencrypt.rb
    R puppet/lib/puppet/parser/functions/katello_process_count.rb
    R puppet/lib/puppet/parser/functions/katello_pulp_url.rb
    R puppet/man/katello-configure.pod
    R puppet/man/katello-passwd.pod
    R puppet/man/katello-upgrade.pod
    R puppet/modules/apache2/files/empty/.ignore
    R puppet/modules/apache2/files/etc/httpd/conf.d/ssl.conf
    R puppet/modules/apache2/files/etc/httpd/conf/httpd.conf.5
    R puppet/modules/apache2/files/etc/httpd/conf/httpd.conf.6
    R puppet/modules/apache2/manifests/config.pp
    R puppet/modules/apache2/manifests/init.pp
    R puppet/modules/apache2/manifests/install.pp
    R puppet/modules/apache2/manifests/params.pp
    R puppet/modules/apache2/manifests/service.pp
    R puppet/modules/apache2/manifests/ssl.pp
    R puppet/modules/candlepin/manifests/config.pp
    R puppet/modules/candlepin/manifests/init.pp
    R puppet/modules/candlepin/manifests/install.pp
    R puppet/modules/candlepin/manifests/params.pp
    R puppet/modules/candlepin/manifests/service.pp
    R puppet/modules/candlepin/templates/etc/candlepin/candlepin.conf.erb
    R puppet/modules/candlepin/templates/etc/tomcat6/server.xml.erb
    R puppet/modules/certs/manifests/config.pp
    R puppet/modules/certs/manifests/init.pp
    R puppet/modules/certs/manifests/params.pp
    R puppet/modules/certs/templates/rhsm-katello-reconfigure.erb
    R puppet/modules/common/manifests/line.pp
    R puppet/modules/elasticsearch/manifests/config.pp
    R puppet/modules/elasticsearch/manifests/init.pp
    R puppet/modules/elasticsearch/manifests/install.pp
    R puppet/modules/elasticsearch/manifests/params.pp
    R puppet/modules/elasticsearch/manifests/service.pp
    R puppet/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb
    R puppet/modules/elasticsearch/templates/etc/sysconfig/elasticsearch.erb
    R puppet/modules/katello/manifests/config.pp
    R puppet/modules/katello/manifests/init.pp
    R puppet/modules/katello/manifests/install.pp
    R puppet/modules/katello/manifests/params.pp
    R puppet/modules/katello/manifests/service.pp
    R puppet/modules/katello/templates/etc/httpd/conf.d/katello.conf.erb
    R puppet/modules/katello/templates/etc/katello/client.conf.erb
    R puppet/modules/katello/templates/etc/katello/katello.yml.erb
    R puppet/modules/katello/templates/etc/katello/thin.yml.erb
    R puppet/modules/katello/templates/etc/ldap_fluff.yml.erb
    R puppet/modules/katello/templates/etc/sysconfig/katello.erb
    R puppet/modules/mongodb/manifests/config.pp
    R puppet/modules/mongodb/manifests/init.pp
    R puppet/modules/mongodb/manifests/install.pp
    R puppet/modules/mongodb/manifests/service.pp
    R puppet/modules/postgres/manifests/config.pp
    R puppet/modules/postgres/manifests/createdb.pp
    R puppet/modules/postgres/manifests/createuser.pp
    R puppet/modules/postgres/manifests/dropdb.pp
    R puppet/modules/postgres/manifests/init.pp
    R puppet/modules/postgres/manifests/install.pp
    R puppet/modules/postgres/manifests/params.pp
    R puppet/modules/postgres/manifests/service.pp
    R puppet/modules/postgres/manifests/sqlexec.pp
    R puppet/modules/postgres/templates/pg_hba.conf.erb
    R puppet/modules/postgres/templates/postgresql.conf.erb
    R puppet/modules/pulp/manifests/config.pp
    R puppet/modules/pulp/manifests/init.pp
    R puppet/modules/pulp/manifests/install.pp
    R puppet/modules/pulp/manifests/params.pp
    R puppet/modules/pulp/manifests/service.pp
    R puppet/modules/pulp/templates/etc/httpd/conf.d/pulp.conf.erb
    R puppet/modules/pulp/templates/etc/pulp/repo_auth.conf.erb
    R puppet/modules/qpid/manifests/config.pp
    R puppet/modules/qpid/manifests/init.pp
    R puppet/modules/qpid/manifests/install.pp
    R puppet/modules/qpid/manifests/service.pp
    R puppet/modules/qpid/templates/etc/qpidd.conf.erb
    R puppet/modules/thumbslug/manifests/config.pp
    R puppet/modules/thumbslug/manifests/init.pp
    R puppet/modules/thumbslug/manifests/install.pp
    R puppet/modules/thumbslug/manifests/params.pp
    R puppet/modules/thumbslug/manifests/service.pp
    R puppet/modules/thumbslug/templates/etc/thumbslug/thumbslug.conf.erb
    R puppet/options-format-file
    R puppet/upgrade-scripts/default/0002_update_pulp.sh
    R puppet/upgrade-scripts/default/0003_update_candlepin.sh
    R puppet/upgrade-scripts/default/0004_migrate_katello_db.sh
    R puppet/upgrade-scripts/upgrade/0001_example_script.sh
    R puppet/upgrade-scripts/upgrade/0002_example_script.py
    M rel-eng/build-missing-builds-in-koji.sh
    M rel-eng/comps/comps-katello-candlepin-server-fedora16.xml
    M rel-eng/comps/comps-katello-candlepin-server-fedora17.xml
    M rel-eng/comps/comps-katello-candlepin-server-rhel6.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    M rel-eng/comps/comps-katello-pulp-server-fedora16.xml
    M rel-eng/comps/comps-katello-pulp-server-fedora17.xml
    M rel-eng/comps/comps-katello-pulp-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/packages/katello
    M rel-eng/packages/katello-agent
    M rel-eng/packages/katello-certs-tools
    M rel-eng/packages/katello-cli
    R rel-eng/packages/katello-cli-headpin
    M rel-eng/packages/katello-cli-tests
    M rel-eng/packages/katello-configure
    M rel-eng/packages/katello-repos
    M rel-eng/packages/katello-selinux
    M rel-eng/releasers.conf
    A repos/katello-foreman.repo
    M repos/katello-repos.spec
    A scripts/cli_generator/README
    A scripts/cli_generator/generate.py
    A scripts/cli_generator/templates/action.py
    A scripts/cli_generator/templates/api.py
    A scripts/cli_generator/templates/command.py
    A scripts/cli_generator/templates/main.py
    M scripts/run-codeasys.sh
    M scripts/system-test/cli-system-test
    M scripts/system-test/cli_tests/_base_setup.sh
    M scripts/system-test/cli_tests/changeset.sh
    M scripts/system-test/cli_tests/katello_agent.sh
    M scripts/system-test/cli_tests/provider_import.sh
    M scripts/system-test/cli_tests/rhsm.sh
    M scripts/system-test/cli_tests/system.sh
    M scripts/system-test/cli_tests/user.sh
    M scripts/system-test/katello-cli-tests.spec
    M scripts/test/populate-systems.py
    M scripts/test/repo_generation/create_erratum.sh
    M scripts/test/repo_generation/create_repo.sh
    M scripts/test/repo_generation/zoo/errata.txt
    M selinux/katello-selinux/katello-selinux-enable
    M selinux/katello-selinux/katello-selinux-enable.pod
    A selinux/katello-selinux/katello-selinux-relabel
    A selinux/katello-selinux/katello-selinux-relabel.pod
    M selinux/katello-selinux/katello-selinux.spec
    M src/Gemfile
    M src/app/controllers/activation_keys_controller.rb
    M src/app/controllers/api/activation_keys_controller.rb
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/changesets_content_controller.rb
    M src/app/controllers/api/changesets_controller.rb
    M src/app/controllers/api/crls_controller.rb
    M src/app/controllers/api/distributions_controller.rb
    M src/app/controllers/api/environments_controller.rb
    M src/app/controllers/api/errata_controller.rb
    M src/app/controllers/api/errors_controller.rb
    M src/app/controllers/api/filters_controller.rb
    M src/app/controllers/api/gpg_keys_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/packages_controller.rb
    M src/app/controllers/api/permissions_controller.rb
    M src/app/controllers/api/ping_controller.rb
    M src/app/controllers/api/products_controller.rb
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/role_ldap_groups_controller.rb
    M src/app/controllers/api/roles_controller.rb
    M src/app/controllers/api/status_controller.rb
    M src/app/controllers/api/subscriptions_controller.rb
    M src/app/controllers/api/sync_controller.rb
    M src/app/controllers/api/sync_plans_controller.rb
    M src/app/controllers/api/system_group_errata_controller.rb
    M src/app/controllers/api/system_group_packages_controller.rb
    M src/app/controllers/api/system_groups_controller.rb
    M src/app/controllers/api/system_packages_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/tasks_controller.rb
    M src/app/controllers/api/templates_content_controller.rb
    M src/app/controllers/api/templates_controller.rb
    M src/app/controllers/api/uebercerts_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/changesets_controller.rb
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/environments_controller.rb
    M src/app/controllers/filters_controller.rb
    M src/app/controllers/gpg_keys_controller.rb
    M src/app/controllers/notices_controller.rb
    M src/app/controllers/organizations_controller.rb
    M src/app/controllers/password_resets_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/promotions_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/repositories_controller.rb
    M src/app/controllers/roles_controller.rb
    M src/app/controllers/search_controller.rb
    M src/app/controllers/sync_management_controller.rb
    M src/app/controllers/sync_plans_controller.rb
    M src/app/controllers/sync_schedules_controller.rb
    M src/app/controllers/system_errata_controller.rb
    M src/app/controllers/system_group_errata_controller.rb
    M src/app/controllers/system_group_packages_controller.rb
    M src/app/controllers/system_groups_controller.rb
    M src/app/controllers/system_templates_controller.rb
    M src/app/controllers/systems_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    M src/app/controllers/users_controller.rb
    M src/app/helpers/application_helper.rb
    M src/app/helpers/breadcrumb_helper.rb
    M src/app/helpers/dashboard_helper.rb
    M src/app/helpers/subscriptions_helper.rb
    M src/app/helpers/users_helper.rb
    M src/app/models/activation_key.rb
    M src/app/models/changeset.rb
    M src/app/models/changeset_erratum.rb
    M src/app/models/changeset_package.rb
    M src/app/models/deletion_changeset.rb
    M src/app/models/errors.rb
    M src/app/models/filter.rb
    M src/app/models/glue.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/glue/candlepin/environment.rb
    M src/app/models/glue/candlepin/owner.rb
    M src/app/models/glue/candlepin/pool.rb
    M src/app/models/glue/candlepin/product.rb
    M src/app/models/glue/provider.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/hash_util.rb
    M src/app/models/indexed_model.rb
    M src/app/models/job.rb
    M src/app/models/kt_environment.rb
    M src/app/models/notice.rb
    M src/app/models/organization.rb
    M src/app/models/organization_destroyer.rb
    M src/app/models/ping.rb
    M src/app/models/pool.rb
    M src/app/models/product.rb
    A src/app/models/promotion_changeset.rb
    M src/app/models/provider.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/repository.rb
    M src/app/models/role.rb
    M src/app/models/sync_plan.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/system_template.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb
    M src/app/models/user_notice.rb
    M src/app/stylesheets/_katello_vars.scss
    M src/app/stylesheets/ie.scss
    M src/app/stylesheets/katello.scss
    M src/app/stylesheets/sections/content_search.scss
    M src/app/stylesheets/sections/contents.scss
    M src/app/stylesheets/sections/dashboard.scss
    M src/app/stylesheets/sections/loginpage.scss
    M src/app/stylesheets/sections/operations.scss
    M src/app/stylesheets/sections/orgs.scss
    M src/app/stylesheets/sections/subscriptions.scss
    M src/app/stylesheets/sections/systems.scss
    M src/app/stylesheets/widgets/_env_select.scss
    M src/app/stylesheets/widgets/_org_switcher.scss
    M src/app/stylesheets/widgets/_slidingtree.scss
    M src/app/views/activation_keys/_system_group_items.html.haml
    M src/app/views/changesets/_edit.html.haml
    M src/app/views/changesets/_new.html.haml
    M src/app/views/common/_ajax_notices.haml
    M src/app/views/common/_common_i18n.html.haml
    A src/app/views/common/_fav.html.haml
    M src/app/views/common/_footer.haml
    M src/app/views/common/_header.haml
    M src/app/views/common/user_session.haml
    M src/app/views/content_search/_browser_box.html.haml
    M src/app/views/content_search/_grid.html.haml
    M src/app/views/errata/_short_details.html.haml
    M src/app/views/errata/_show.html.haml
    M src/app/views/filters/_edit.html.haml
    M src/app/views/layouts/_allowed_orgs.html.haml
    M src/app/views/layouts/_org.haml
    M src/app/views/notices/show.html.haml
    M src/app/views/organizations/_edit.html.haml
    A src/app/views/organizations/_footer.html.haml
    M src/app/views/promotions/_distributions.html.haml
    M src/app/views/promotions/_errata_items.html.haml
    M src/app/views/promotions/_package_items.html.haml
    M src/app/views/promotions/_packages.html.haml
    A src/app/views/promotions/_product.html.haml
    R src/app/views/promotions/_products.html.haml
    M src/app/views/promotions/_repo_items.html.haml
    M src/app/views/promotions/_repos.html.haml
    M src/app/views/promotions/_system_templates.html.haml
    M src/app/views/promotions/show.html.haml
    M src/app/views/repositories/_edit.html.haml
    M src/app/views/subscriptions/_edit.html.haml
    M src/app/views/subscriptions/_history.html.haml
    M src/app/views/subscriptions/_list_subscription_show.html.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/sync_management/index.html.haml
    M src/app/views/system_groups/_list_group.html.haml
    M src/app/views/system_groups/errata/_index.html.haml
    M src/app/views/system_groups/events/_system_items.html.haml
    M src/app/views/systems/_edit.html.haml
    M src/app/views/systems/_list_system_show.html.haml
    M src/app/views/systems/_subs.html.haml
    M src/app/views/systems/_subscriptions.html.haml
    M src/app/views/systems/_system_group_items.html.haml
    M src/app/views/systems/errata/_index.html.haml
    M src/app/views/user_sessions/_interstitial.js.haml
    R src/app/views/user_sessions/new.html.haml
    M src/app/views/users/_edit_environment.html.haml
    M src/app/views/users/_edit_form.html.haml
    M src/app/views/users/_new.html.haml
    M src/config/application.rb
    M src/config/assets.yml
    M src/config/compass.rb
    A src/config/environments/apipie.rb
    M src/config/environments/production.rb
    A src/config/initializers/apipie.rb
    M src/config/initializers/app_config.rb
    M src/config/initializers/secret_token.rb
    M src/config/initializers/warden.rb
    M src/config/routes.rb
    A src/db/migrate/20120724192921_add_type_to_changeset.rb
    A src/db/migrate/20120820145108_add_db_indexes.rb
    A src/db/migrate/20120820203952_db_unique_indices.rb
    A src/db/migrate/20120831100126_add_organization_to_notice.rb
    M src/deploy/common/katello-jobs.init
    M src/deploy/common/katello.init
    M src/deploy/common/service-wait.sysconfig
    M src/deploy/common/thin.yml
    A src/doc/apipie_examples.yml
    M src/katello.spec
    A src/lib/bundler_patch_rpm-gems_preferred.rb
    M src/lib/http_resource.rb
    M src/lib/monkeys/fix_string_interpolate.rb
    M src/lib/navigation/content_management.rb
    M src/lib/notifications/controller_helper.rb
    M src/lib/notifications/notifier.rb
    M src/lib/resources/candlepin.rb
    M src/lib/resources/cdn.rb
    M src/lib/resources/pulp.rb
    A src/lib/string.rb
    M src/lib/task.rb
    M src/lib/tasks/hudson.rake
    M src/lib/tasks/jshint.rake
    M src/lib/tasks/rcov.rake
    M src/lib/tasks/test.rake
    M src/lib/tasks/yard.rake
    A src/lib/util/cdn_var_substitutor.rb
    M src/lib/util/db_setup_check.rb
    M src/lib/util/errata.rb
    M src/lib/util/password.rb
    M src/lib/util/task_status.rb
    M src/locale/app.pot
    M src/locale/bn/app.po
    M src/locale/de/app.po
    M src/locale/en/app.po
    M src/locale/es/app.po
    M src/locale/fr/app.po
    M src/locale/gu/app.po
    M src/locale/hi/app.po
    M src/locale/it/app.po
    M src/locale/ja/app.po
    M src/locale/kn/app.po
    M src/locale/ko/app.po
    M src/locale/mr/app.po
    M src/locale/or/app.po
    M src/locale/pa/app.po
    M src/locale/pt_BR/app.po
    M src/locale/ru/app.po
    M src/locale/ta/app.po
    M src/locale/te/app.po
    M src/locale/zh_CN/app.po
    M src/locale/zh_TW/app.po
    M src/public/images/embed/icons/action-icons.png
    M src/public/javascripts/content_search.js
    M src/public/javascripts/gpg_key.js
    M src/public/javascripts/katello.js
    M src/public/javascripts/menu.js
    M src/public/javascripts/notices.js
    M src/public/javascripts/organization.js
    M src/public/javascripts/panel.js
    M src/public/javascripts/promotion.js
    M src/public/javascripts/routes.js
    M src/public/javascripts/search.js
    M src/public/javascripts/slidingtree.js
    M src/public/javascripts/system_edit.js
    M src/public/javascripts/system_groups.js
    M src/public/javascripts/system_subscriptions.js
    M src/public/javascripts/systems.js
    M src/public/javascripts/user.js
    M src/public/javascripts/widgets/comparison_grid.js
    M src/public/javascripts/widgets/path_selector.js
    M src/script/katello-service
    A src/script/pulp_integration_tests
    M src/script/service-wait
    M src/spec/controllers/activation_keys_controller_spec.rb
    M src/spec/controllers/api/activation_keys_controller_spec.rb
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/changesets_controller_spec.rb
    M src/spec/controllers/api/permissions_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/sync_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/api/templates_controller_spec.rb
    M src/spec/controllers/changeset_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/controllers/environments_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/gpg_keys_controller_spec.rb
    M src/spec/controllers/notices_controller_spec.rb
    M src/spec/controllers/organizations_controller_spec.rb
    M src/spec/controllers/password_resets_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/search_controller_spec.rb
    M src/spec/controllers/system_errata_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb
    M src/spec/controllers/system_groups_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/controllers/systems_controller_spec.rb
    M src/spec/controllers/user_session_controller_spec.rb
    M src/spec/helpers/login_helper_methods.rb
    M src/spec/lib/cdn_spec.rb
    A src/spec/lib/string.rb
    M src/spec/models/activation_key_spec.rb
    M src/spec/models/changeset_spec.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb
    M src/spec/models/system_group_spec.rb
    M src/spec/models/system_spec.rb
    M src/spec/models/user_spec.rb
    A src/test/integration/fixtures/repositories/zoo5/.treeinfo
    A src/test/integration/fixtures/repositories/zoo5/CHANGESET
    A src/test/integration/fixtures/repositories/zoo5/PULP_MANIFEST
    A src/test/integration/fixtures/repositories/zoo5/cheetah-0.3-0.8.noarch.rpm
    A src/test/integration/fixtures/repositories/zoo5/create.sh
    A src/test/integration/fixtures/repositories/zoo5/elephant-0.3-0.8.noarch.rpm
    A src/test/integration/fixtures/repositories/zoo5/empty.iso
    A src/test/integration/fixtures/repositories/zoo5/giraffe-0.3-0.8.noarch.rpm
    A src/test/integration/fixtures/repositories/zoo5/images/test1.img
    A src/test/integration/fixtures/repositories/zoo5/images/test2.img
    A src/test/integration/fixtures/repositories/zoo5/lion-0.3-0.8.noarch.rpm
    A src/test/integration/fixtures/repositories/zoo5/monkey-0.3-0.8.noarch.rpm
    A src/test/integration/fixtures/repositories/zoo5/penguin-0.3-0.8.noarch.rpm
    A src/test/integration/fixtures/repositories/zoo5/repodata/06661e2a9839cf0beebcf409410ca4f93c09081f4e772fd0d03e1faf62705a11-comps.xml
  A src/test/integration/fixtures/repositories/zoo5/repodata/0c4d57a68f9a3b13dabc6f8b01ca8958aa796167cececee04717edfc26d02f2d-other.xml.gz
  A src/test/integration/fixtures/repositories/zoo5/repodata/298ce23f48b3613e030d19f3d9c2ff2df31c2f08479bdf94cebb87c208e48c0e-filelists.xml.gz
  A src/test/integration/fixtures/repositories/zoo5/repodata/32c0e38317aade0c057b173ff62344e912e1bd650409c6ac31aecee78e3413af-comps.xml.gz
  A src/test/integration/fixtures/repositories/zoo5/repodata/34d954906c7ce7aa2254e24d7be0a9049e0a2f436add023ca056123a2d48e30e-updateinfo.xml.gz
  A src/test/integration/fixtures/repositories/zoo5/repodata/63aedd074d9f0daf7c6be8c61f91d76a962bb6ceda86b9abd2140f154c320fa2-other.sqlite.bz2
  A src/test/integration/fixtures/repositories/zoo5/repodata/69d65cdebffc6199d3adb3e38b06ca9abaae6c1c7366805099987b28f182178d-filelists.sqlite.bz2
  A src/test/integration/fixtures/repositories/zoo5/repodata/799241a518a4a6b11a68f8e6fbdb719875f87832f60accc0851ced0d6a0497c6-updateinfo.xml.gz
  A src/test/integration/fixtures/repositories/zoo5/repodata/a4ea9fcdce31dc8673c7a9ba66c086bd6a16e1eff717e3896dd1cac444a1423c-primary.xml.gz
  A src/test/integration/fixtures/repositories/zoo5/repodata/fb9b9508e148368d0edf7e03dc905b343937fd958e6531cce6380933d18c3455-primary.sqlite.bz2
  A src/test/integration/fixtures/repositories/zoo5/repodata/repomd.xml
    A src/test/integration/fixtures/repositories/zoo5/squirrel-0.3-0.8.noarch.rpm
    A src/test/integration/fixtures/repositories/zoo5/updateinfo.xml
    A src/test/integration/fixtures/repositories/zoo5/walrus-0.3-0.8.noarch.rpm
    A src/test/integration/fixtures/vcr_cassettes/pulp_consumer.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_consumer_group.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_consumer_helper.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_distribution.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_errata.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_filter.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_filter_helper.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_package.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_package_group.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_package_group_category.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_ping.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_repository.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_repository_helper.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_repository_sync.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_roles.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_task.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_task_helper.yml
    A src/test/integration/fixtures/vcr_cassettes/pulp_user.yml
    A src/test/integration/pulp/helpers/consumer_helper.rb
    A src/test/integration/pulp/helpers/filter_helper.rb
    A src/test/integration/pulp/helpers/repository_helper.rb
    A src/test/integration/pulp/pulp_consumer_group_test.rb
    A src/test/integration/pulp/pulp_consumer_test.rb
    A src/test/integration/pulp/pulp_distribution_test.rb
    A src/test/integration/pulp/pulp_errata_test.rb
    A src/test/integration/pulp/pulp_filter_test.rb
    A src/test/integration/pulp/pulp_package_group_category_test.rb
    A src/test/integration/pulp/pulp_package_group_test.rb
    A src/test/integration/pulp/pulp_package_test.rb
    A src/test/integration/pulp/pulp_ping_test.rb
    A src/test/integration/pulp/pulp_repository_test.rb
    A src/test/integration/pulp/pulp_roles_test.rb
    A src/test/integration/pulp/pulp_task_test.rb
    A src/test/integration/pulp/pulp_user_test.rb
    A src/test/integration/pulp/test_runner.rb
    A src/test/integration/pulp/vcr_pulp_setup.rb

  Log Message:
  -----------
  master merge conflict


  Commit: e6d3d00d096bc02b95c124d51fd746ee7a7abbce
      https://github.com/Katello/katello/commit/e6d3d00d096bc02b95c124d51fd746ee7a7abbce
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M src/app/controllers/changesets_controller.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  fixing missing merge conflict


  Commit: 59e9c702c01bb6f3055f3914166c509bb9e7b727
      https://github.com/Katello/katello/commit/59e9c702c01bb6f3055f3914166c509bb9e7b727
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M katello-configure/lib/puppet/parser/functions/katello_pulp_url.rb

  Log Message:
  -----------
  pulpv2 - fixing pulp url for configure


  Commit: 0ca8013c6a12640a3574191b90dd430e9b4fcdd0
      https://github.com/Katello/katello/commit/0ca8013c6a12640a3574191b90dd430e9b4fcdd0
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M katello-configure/modules/katello/manifests/config.pp

  Log Message:
  -----------
  pulpv2 - pointing cp to new server.conf for pulp


  Commit: 7d41f668798c7f372f8951e23856842f262b1110
      https://github.com/Katello/katello/commit/7d41f668798c7f372f8951e23856842f262b1110
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M katello-configure/modules/katello/manifests/params.pp

  Log Message:
  -----------
  pulpv2 - disabling foreman config since it doesnt seem to work atm


  Commit: 8010e31b97bd585ed532d09aab1797bebd82f099
      https://github.com/Katello/katello/commit/8010e31b97bd585ed532d09aab1797bebd82f099
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  pulpv2 - adding runcible to requires


  Commit: df1fd3540fb1755d085a91f133f3e83db9c6a635
      https://github.com/Katello/katello/commit/df1fd3540fb1755d085a91f133f3e83db9c6a635
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M src/Gemfile

  Log Message:
  -----------
  pulpv2 - making Gemfile work for installer and dev environment

only needed while we are developing runcible


  Commit: da8cd4609a7e054bed8bd177518ada0f053cbf83
      https://github.com/Katello/katello/commit/da8cd4609a7e054bed8bd177518ada0f053cbf83
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M src/Gemfile
    M src/app/models/glue/pulp/user.rb
    A src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    A src/test/fixtures/vcr_cassettes/pulp_user.yml
    A src/test/minitest_helper.rb
    A src/test/test_helper.rb
    A src/test/unit/glue/pulp/user_test.rb
    A src/test/unit/user_test.rb

  Log Message:
  -----------
  PulpV2 - Adds glue layer unit tests for glue/pulp/user combining VCR to record Pulp \
data.


  Commit: 1be3748c493cd9acee5ee91fd602e26de7fcc40d
      https://github.com/Katello/katello/commit/1be3748c493cd9acee5ee91fd602e26de7fcc40d
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - moving reop create to runcible


  Commit: 4f783bc21704a1122f950dff1a3c591b0df2ba11
      https://github.com/Katello/katello/commit/4f783bc21704a1122f950dff1a3c591b0df2ba11
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-09-22 (Sat, 22 Sep 2012)

  Changed paths:
    M src/.gitignore
    M src/Gemfile
    M src/Rakefile
    M src/app/models/user.rb
    M src/config/application.rb
    M src/lib/tasks/test.rake
    A src/test/fixtures/permissions.yml
    A src/test/fixtures/resource_types.yml
    A src/test/fixtures/roles.yml
    A src/test/fixtures/roles_users.yml
    A src/test/fixtures/users.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/minitest_helper.rb
    A src/test/models/user_test.rb
    M src/test/unit/glue/pulp/user_test.rb
    M src/test/unit/user_test.rb

  Log Message:
  -----------
  PulpV2 - Adds a base set of Katello User model unit tests that disable inclusion of \
glue layer and only tests the Katello User model using Minitest Unittest and \
fixtures.


  Commit: 59c4efcdbef8979d2d428b23f4efb0f1e1b1948e
      https://github.com/Katello/katello/commit/59c4efcdbef8979d2d428b23f4efb0f1e1b1948e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/repository.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - moving all unit copy items to runcible


  Commit: a687b7247385f5006a974add7109ca1e1078ca0c
      https://github.com/Katello/katello/commit/a687b7247385f5006a974add7109ca1e1078ca0c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/task_status.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - moving most pulp task calls to runcible


  Commit: 69965f419fc37ff28dd63a7b6e93b005f0983c34
      https://github.com/Katello/katello/commit/69965f419fc37ff28dd63a7b6e93b005f0983c34
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/job.rb
    M src/app/models/task_status.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - migrating sync tasks and deletion to runcible


  Commit: 3a0f5be1f6d956d69535a9b2d25155144739437d
      https://github.com/Katello/katello/commit/3a0f5be1f6d956d69535a9b2d25155144739437d
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/config/environments/development.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - moving unit repo listing to runcible


  Commit: 6ddbfa0df89d610a3786410687233e0795047303
      https://github.com/Katello/katello/commit/6ddbfa0df89d610a3786410687233e0795047303
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - migrating repo schedules to runcible


  Commit: 17a1b9ee693cb8f7b47c320f21cb8811d8feb50c
      https://github.com/Katello/katello/commit/17a1b9ee693cb8f7b47c320f21cb8811d8feb50c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  pulpv2 - fixing repo schedule error


  Commit: 6b643e1b0acaefe22051a4294f42bf51b0fe64ed
      https://github.com/Katello/katello/commit/6b643e1b0acaefe22051a4294f42bf51b0fe64ed
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M src/Gemfile
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/product.rb
    M src/app/models/repository.rb
    M src/app/models/user.rb
    M src/config/application.rb
    M src/lib/tasks/test.rake
    A src/test/fixtures/environment_products.yml
    A src/test/fixtures/environments.yml
    A src/test/fixtures/gpg_keys.yml
    A src/test/fixtures/organizations.yml
    M src/test/fixtures/permissions.yml
    A src/test/fixtures/products.yml
    A src/test/fixtures/providers.yml
    A src/test/fixtures/repositories.yml
    M src/test/fixtures/roles.yml
    M src/test/fixtures/roles_users.yml
    R src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    R src/test/fixtures/vcr_cassettes/pulp_user.yml
    A src/test/glue/pulp/repository_test.rb
    A src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    A src/test/models/repository_test.rb
    M src/test/models/user_test.rb
    A src/test/vcr_cassettes/glue_pulp_user.yml
    A src/test/vcr_cassettes/pulp_user.yml

  Log Message:
  -----------
  PulpV2 - Adds set of repository model tests that include some updates to the \
repository model.


  Commit: 87089cd08604fd9a4a14eed363b6b64b21e6518e
      https://github.com/Katello/katello/commit/87089cd08604fd9a4a14eed363b6b64b21e6518e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - moving more repo items to runcible


  Commit: bab0c86ce26240f4bc73527266ac7e685239eddf
      https://github.com/Katello/katello/commit/bab0c86ce26240f4bc73527266ac7e685239eddf
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    A src/app/models/authorization/.repository.rb.swm
    A src/app/models/authorization/repository.rb
    M src/app/models/repository.rb
    M src/lib/tasks/test.rake
    A src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/repository_test.rb

  Log Message:
  -----------
  PulpV2 - Splits out authorization related code into separate module for repository.


  Commit: 11cfa9a6320d7f9f0a1478ce828e897ddcbf2403
      https://github.com/Katello/katello/commit/11cfa9a6320d7f9f0a1478ce828e897ddcbf2403
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb

  Log Message:
  -----------
  pulp v2 - consumer - initial changes for \
create/review/update/delete/profile/profile upload

This has some initial chgs for working with pulp v2 for consumers.

This is by no means 'finished'; however, making it available
in my forked repo for others to access.


  Commit: bc74bce1964809d939e9e677c2fea6057dd44a3b
      https://github.com/Katello/katello/commit/bc74bce1964809d939e9e677c2fea6057dd44a3b
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M src/.gitignore
    R src/app/models/authorization/.repository.rb.swm
    M src/app/models/authorization/repository.rb
    A src/app/models/glue/elastic_search/indexed_model.rb
    A src/app/models/glue/elastic_search/repository.rb
    M src/app/models/repository.rb
    M src/config/initializers/app_config.rb
    M src/lib/tasks/test.rake
    M src/test/fixtures/environment_products.yml
    M src/test/fixtures/environments.yml
    M src/test/fixtures/repositories.yml
    A src/test/glue/elasticsearch/repository_test.rb
    M src/test/models/repository_test.rb

  Log Message:
  -----------
  PulpV2 - Updated tests for Repository model file, and pulls out elasticsearch \
related code to be nested under the glue layer similar to how Pulp and Candlepin are \
used.


  Commit: c4f553e81d9f15f6018b2f8113928be635f94130
      https://github.com/Katello/katello/commit/c4f553e81d9f15f6018b2f8113928be635f94130
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/task_status.rb

  Log Message:
  -----------
  pulpv2 - removing some unused repo items, and fixing some runcible calls


  Commit: 685e99c86c72a977ae7e1483eb1e5f93da626677
      https://github.com/Katello/katello/commit/685e99c86c72a977ae7e1483eb1e5f93da626677
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-09-28 (Fri, 28 Sep 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  pulpv2 - using extensions always for repository


  Commit: e839913a7ed3898502a056523df13481a774674e
      https://github.com/Katello/katello/commit/e839913a7ed3898502a056523df13481a774674e
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M katello-configure/lib/puppet/parser/functions/katello_pulp_url.rb
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/manifests/params.pp
    M src/Gemfile
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/job.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/repository.rb
    M src/app/models/task_status.rb
    M src/config/environments/development.rb
    M src/katello.spec
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  Merge pull request #766 from jlsherrill/pulpv2

Pulpv2 - more repo migration to runcible as well as installer changes


  Commit: e6c9ab06cd9e714e6c53d42942819cc37c58d97c
      https://github.com/Katello/katello/commit/e6c9ab06cd9e714e6c53d42942819cc37c58d97c
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M katello-configure/lib/puppet/parser/functions/katello_pulp_url.rb
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/manifests/params.pp
    M src/Gemfile
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/job.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/repository.rb
    M src/app/models/task_status.rb
    M src/config/environments/development.rb
    M src/katello.spec
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/pulpv2' into fork-pulpv2


  Commit: 2ca3ced6c403740f17ef1f3a2d40b1c942e029b0
      https://github.com/Katello/katello/commit/2ca3ced6c403740f17ef1f3a2d40b1c942e029b0
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    A src/app/models/errata.rb
    A src/app/models/glue/elastic_search/errata.rb
    A src/app/models/glue/elastic_search/package.rb
    M src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/simple_package.rb
    A src/app/models/package.rb
    M src/app/models/repository.rb
    M src/lib/tasks/test.rake
    A src/test/fixtures/filters.yml
    A src/test/fixtures/filters_repositories.yml
    M src/test/fixtures/gpg_keys.yml
    M src/test/glue/elasticsearch/repository_test.rb
    A src/test/glue/pulp/package_test.rb
    M src/test/glue/pulp/user_test.rb
    A src/test/models/package_test.rb
    M src/test/models/repository_test.rb
    M src/test/vcr_cassettes/glue_pulp_user.yml

  Log Message:
  -----------
  Pulpv2 - Adds simple object for errata and package and splits out the elastic \
search and pulp related functionality for each.


  Commit: 7b3e20a9366b05bf25e77e5ad787def7bfa1a887
      https://github.com/Katello/katello/commit/7b3e20a9366b05bf25e77e5ad787def7bfa1a887
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M katello-configure/lib/puppet/parser/functions/katello_pulp_url.rb
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/manifests/params.pp
    M src/Gemfile
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/job.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/repository.rb
    M src/app/models/task_status.rb
    M src/config/environments/development.rb
    M src/katello.spec
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  Merge branch 'pulpv2' of github.com:Katello/katello into pulpv2

Conflicts:
	src/app/models/repository.rb


  Commit: 9040290f570f9e88d3883eccad22c2dd344266f2
      https://github.com/Katello/katello/commit/9040290f570f9e88d3883eccad22c2dd344266f2
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - removing unused pulp api classes


  Commit: f1aa6675911c3336b1964d2434a9d8c8f76ad8b9
      https://github.com/Katello/katello/commit/f1aa6675911c3336b1964d2434a9d8c8f76ad8b9
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M src/app/controllers/system_packages_controller.rb
    M src/app/models/glue/pulp/consumer.rb

  Log Message:
  -----------
  pulpv2 - updates for retrieving consumer profile from pulp


  Commit: a208b07b83eeeea00a4638f8b5640475218106eb
      https://github.com/Katello/katello/commit/a208b07b83eeeea00a4638f8b5640475218106eb
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M .gitignore
    A .tx/config
    M cli/katello-cli.spec
    M cli/po/keys.pot
    A cli/src/katello/client/api/custom_info.py
    M cli/src/katello/client/api/environment.py
    M cli/src/katello/client/api/filter.py
    M cli/src/katello/client/api/organization.py
    M cli/src/katello/client/api/product.py
    M cli/src/katello/client/api/repo.py
    M cli/src/katello/client/core/activation_key.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/permission.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/system.py
    A cli/src/katello/client/core/system_custom_info.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/utils/printer.py
    A cli/test/katello/tests/core/filter/filter_update_test.py
    M cli/test/katello/tests/core/organization/organization_data.py
    M cli/test/katello/tests/core/organization/organization_info_test.py
    M cli/test/katello/tests/core/organization/organization_subscription_list_test.py
    M cli/test/katello/tests/core/product/product_create_test.py
    M cli/test/katello/tests/core/repo/repo_discovery_test.py
    M katello-configure/bin/katello-upgrade
    M katello-configure/default-answer-file
    M katello-configure/katello-configure.spec
    M katello-configure/lib/puppet/parser/functions/katello_config_value.rb
    M katello-configure/modules/candlepin/manifests/config.pp
    M katello-configure/modules/candlepin/manifests/service.pp
    M katello-configure/modules/certs/manifests/config.pp
    M katello-configure/modules/certs/manifests/params.pp
    M katello-configure/modules/elasticsearch/manifests/config.pp
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/manifests/params.pp
    M katello-configure/modules/mongodb/manifests/config.pp
    M katello-configure/modules/postgres/manifests/service.pp
    M katello-configure/modules/postgres/manifests/sqlexec.pp
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/upgrade-scripts/default/0002_update_pulp.sh
    A katello-utils/.gitignore
    A katello-utils/bin/katello-cat-manifest
    A katello-utils/bin/katello-disconnected
    A katello-utils/katello-utils.spec
    A katello-utils/man/katello-disconnected.pod
    A katello-utils/test/smoke1/fake-manifest-syncable.zip
    A katello-utils/test/smoke1/test
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/packages/katello
    M rel-eng/packages/katello-cli
    M rel-eng/packages/katello-cli-tests
    M rel-eng/packages/katello-configure
    M rel-eng/packages/katello-selinux
    A rel-eng/packages/katello-utils
    R scripts/catmf
    M scripts/cli_generator/generate.py
    M scripts/system-test/cli_tests/_base_cleanup.sh
    M scripts/system-test/cli_tests/provider_import.sh
    M scripts/system-test/helpers
    M scripts/system-test/katello-cli-tests.spec
    M selinux/katello-selinux/katello-selinux.spec
    M src/Gemfile
    M src/app/controllers/activation_keys_controller.rb
    M src/app/controllers/api/activation_keys_controller.rb
    M src/app/controllers/api/api_controller.rb
    A src/app/controllers/api/custom_info_controller.rb
    M src/app/controllers/api/environments_controller.rb
    M src/app/controllers/api/filters_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_controller.rb
    A src/app/controllers/application_info_controller.rb
    M src/app/controllers/environments_controller.rb
    M src/app/controllers/gpg_keys_controller.rb
    M src/app/controllers/organizations_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/repositories_controller.rb
    M src/app/controllers/subscriptions_controller.rb
    M src/app/controllers/system_group_events_controller.rb
    M src/app/controllers/system_groups_controller.rb
    M src/app/controllers/system_templates_controller.rb
    M src/app/controllers/systems_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    M src/app/helpers/application_helper.rb
    A src/app/helpers/application_info_helper.rb
    M src/app/helpers/breadcrumb_helper.rb
    A src/app/helpers/custom_info_helper.rb
    M src/app/helpers/systems_helper.rb
    M src/app/models/activation_key.rb
    A src/app/models/custom_info.rb
    M src/app/models/filter.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/glue/candlepin/environment.rb
    M src/app/models/glue/candlepin/owner.rb
    M src/app/models/glue/candlepin/owner_info.rb
    M src/app/models/glue/candlepin/product.rb
    M src/app/models/glue/provider.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    A src/app/models/katello_label_format_validator.rb
    M src/app/models/kt_environment.rb
    M src/app/models/organization.rb
    M src/app/models/ping.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/provider.rb
    M src/app/models/pulp_sync_status.rb
    M src/app/models/repository.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/task_status.rb
    M src/app/stylesheets/_katello_sprites.scss
    M src/app/stylesheets/katello.scss
    M src/app/stylesheets/sections/dashboard.scss
    M src/app/stylesheets/sections/systems.scss
    M src/app/views/activation_keys/_edit.html.haml
    M src/app/views/activation_keys/_system.html.haml
    M src/app/views/activation_keys/_systems.html.haml
    A src/app/views/application_info/about.html.haml
    M src/app/views/common/_footer.haml
    M src/app/views/dashboard/_sync.haml
    M src/app/views/environments/_edit.html.haml
    M src/app/views/environments/_new.html.haml
    M src/app/views/errata/_short_details.html.haml
    M src/app/views/organizations/_edit.html.haml
    M src/app/views/organizations/_new.html.haml
    M src/app/views/products/_edit.html.haml
    M src/app/views/products/_new.html.haml
    M src/app/views/providers/_edit.html.haml
    M src/app/views/providers/_products_repos.html.haml
    A src/app/views/providers/_remove_item.html.haml
    M src/app/views/repositories/_edit.html.haml
    M src/app/views/repositories/_new.html.haml
    M src/app/views/system_groups/events/_show.html.haml
    M src/app/views/systems/_edit.html.haml
    M src/app/views/systems/_list_system_show.html.haml
    M src/app/views/systems/_more_products.html.haml
    M src/app/views/systems/_products.html.haml
    M src/app/views/systems/_subscriptions.html.haml
    M src/app/views/user_sessions/_interstitial.js.haml
    M src/config/application.rb
    M src/config/assets.yml
    M src/config/initializers/inflections.rb
    M src/config/routes.rb
    M src/db/migrate/20120820203952_db_unique_indices.rb
    A src/db/migrate/20120822205849_create_custom_info.rb
    A src/db/migrate/20120911182817_add_labels_to_environment.rb
    A src/db/migrate/20120911182838_add_labels_to_product.rb
    A src/db/migrate/20120911182916_add_labels_to_repository.rb
    A src/db/migrate/20120912200417_rename_cp_key_to_label.rb
    M src/db/seeds.rb
    M src/doc/apipie_examples.yml
    M src/katello.spec
    M src/lib/navigation/organization.rb
    A src/lib/util/manifest_reader.rb
    M src/lib/util/model_util.rb
    M src/locale/app.pot
    M src/locale/bn/app.po
    M src/locale/de/app.po
    M src/locale/en/app.po
    M src/locale/es/app.po
    M src/locale/fr/app.po
    M src/locale/gu/app.po
    M src/locale/hi/app.po
    M src/locale/it/app.po
    M src/locale/ja/app.po
    M src/locale/kn/app.po
    M src/locale/ko/app.po
    M src/locale/mr/app.po
    M src/locale/or/app.po
    M src/locale/pa/app.po
    M src/locale/pt_BR/app.po
    M src/locale/ru/app.po
    M src/locale/ta/app.po
    M src/locale/te/app.po
    M src/locale/zh_CN/app.po
    M src/locale/zh_TW/app.po
    M src/public/javascripts/auto_complete.js
    M src/public/javascripts/changeset_edit.js
    M src/public/javascripts/content_search.js
    M src/public/javascripts/gpg_key.js
    M src/public/javascripts/katello.js
    A src/public/javascripts/katello_object.js
    M src/public/javascripts/organization.js
    M src/public/javascripts/products_repos.js
    M src/public/javascripts/provider.js
    M src/public/javascripts/system_edit.js
    M src/public/javascripts/system_products.js
    M src/public/javascripts/system_subscriptions.js
    M src/script/backup.sh
    M src/script/katello-debug
    M src/script/restore.sh
    M src/spec/controllers/activation_keys_controller_spec.rb
    M src/spec/controllers/api/activation_keys_controller_spec.rb
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/changesets_controller_spec.rb
    A src/spec/controllers/api/custom_info_controller_spec.rb
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/environments_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    M src/spec/controllers/api/filters_controller_spec.rb
    M src/spec/controllers/api/organizations_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/permissions_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/subscriptions_controller_spec.rb
    M src/spec/controllers/api/sync_controller_spec.rb
    M src/spec/controllers/api/sync_plans_controller_spec.rb
    M src/spec/controllers/api/system_group_errata_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/api/systems_packages_controller_spec.rb
    M src/spec/controllers/api/templates_content_controller_spec.rb
    M src/spec/controllers/api/templates_controller_spec.rb
    M src/spec/controllers/api/uebercerts_controller_spec.rb
    M src/spec/controllers/changeset_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/controllers/distributions_controller_spec.rb
    M src/spec/controllers/environments_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/organizations_controller_spec.rb
    M src/spec/controllers/products_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/system_errata_controller_spec.rb
    M src/spec/controllers/system_events_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb
    M src/spec/controllers/system_group_events_controller_spec.rb
    M src/spec/controllers/system_group_packages_controller_spec.rb
    M src/spec/controllers/system_groups_controller_spec.rb
    M src/spec/controllers/system_packages_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/controllers/systems_controller_spec.rb
    M src/spec/controllers/users_controller_spec.rb
    A src/spec/helpers/application_info_helper_spec.rb
    A src/spec/helpers/custom_info_helper_spec.rb
    M src/spec/helpers/login_helper_methods.rb
    M src/spec/helpers/organization_helper_methods.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/product_test_data.rb
    M src/spec/helpers/repo_test_data.rb
    M src/spec/lib/model_util_spec.rb
    M src/spec/models/activation_key_spec.rb
    M src/spec/models/changeset_spec.rb
    A src/spec/models/custom_info_spec.rb
    M src/spec/models/environment_spec.rb
    M src/spec/models/errata_spec.rb
    M src/spec/models/gpg_key_spec.rb
    M src/spec/models/hypervisor_spec.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/permission_spec.rb
    M src/spec/models/pool_spec.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb
    M src/spec/models/pulp_task_status_spec.rb
    M src/spec/models/repo_spec.rb
    M src/spec/models/repository_spec.rb
    M src/spec/models/role_spec.rb
    M src/spec/models/sync_plan_spec.rb
    M src/spec/models/system_group_spec.rb
    M src/spec/models/system_spec.rb
    M src/spec/models/system_template_package_spec.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb
    M src/spec/models/user_spec.rb

  Log Message:
  -----------
  merge conflict


  Commit: dcd7415d69527aa746840e5db06935b1f5449e83
      https://github.com/Katello/katello/commit/dcd7415d69527aa746840e5db06935b1f5449e83
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - moving event notifiers to pulp


  Commit: 7662768e95e10f3eca66cfdc18c166d0a6fe8845
      https://github.com/Katello/katello/commit/7662768e95e10f3eca66cfdc18c166d0a6fe8845
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M src/.gitignore
    M src/Gemfile
    M src/Rakefile
    M src/app/models/glue/pulp/user.rb
    M src/app/models/user.rb
    M src/config/application.rb
    M src/lib/tasks/test.rake
    A src/test/fixtures/permissions.yml
    A src/test/fixtures/resource_types.yml
    A src/test/fixtures/roles.yml
    A src/test/fixtures/roles_users.yml
    A src/test/fixtures/users.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    A src/test/fixtures/vcr_cassettes/pulp_user.yml
    A src/test/minitest_helper.rb
    A src/test/models/user_test.rb
    A src/test/test_helper.rb
    A src/test/unit/glue/pulp/user_test.rb
    A src/test/unit/user_test.rb

  Log Message:
  -----------
  merge conflict


  Commit: d1daca74da22d190c7dcb3e7fef516321c4c84ea
      https://github.com/Katello/katello/commit/d1daca74da22d190c7dcb3e7fef516321c4c84ea
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M .gitignore
    A .tx/config
    M cli/katello-cli.spec
    M cli/po/keys.pot
    A cli/src/katello/client/api/custom_info.py
    M cli/src/katello/client/api/environment.py
    M cli/src/katello/client/api/filter.py
    M cli/src/katello/client/api/organization.py
    M cli/src/katello/client/api/product.py
    M cli/src/katello/client/api/repo.py
    M cli/src/katello/client/core/activation_key.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/permission.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/system.py
    A cli/src/katello/client/core/system_custom_info.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/utils/printer.py
    A cli/test/katello/tests/core/filter/filter_update_test.py
    M cli/test/katello/tests/core/organization/organization_data.py
    M cli/test/katello/tests/core/organization/organization_info_test.py
    M cli/test/katello/tests/core/organization/organization_subscription_list_test.py
    M cli/test/katello/tests/core/product/product_create_test.py
    M cli/test/katello/tests/core/repo/repo_discovery_test.py
    M katello-configure/bin/katello-upgrade
    M katello-configure/default-answer-file
    M katello-configure/katello-configure.spec
    M katello-configure/lib/puppet/parser/functions/katello_config_value.rb
    M katello-configure/modules/candlepin/manifests/config.pp
    M katello-configure/modules/candlepin/manifests/service.pp
    M katello-configure/modules/certs/manifests/config.pp
    M katello-configure/modules/certs/manifests/params.pp
    M katello-configure/modules/elasticsearch/manifests/config.pp
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/manifests/params.pp
    M katello-configure/modules/mongodb/manifests/config.pp
    M katello-configure/modules/postgres/manifests/service.pp
    M katello-configure/modules/postgres/manifests/sqlexec.pp
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/upgrade-scripts/default/0002_update_pulp.sh
    A katello-utils/.gitignore
    A katello-utils/bin/katello-cat-manifest
    A katello-utils/bin/katello-disconnected
    A katello-utils/katello-utils.spec
    A katello-utils/man/katello-disconnected.pod
    A katello-utils/test/smoke1/fake-manifest-syncable.zip
    A katello-utils/test/smoke1/test
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/packages/katello
    M rel-eng/packages/katello-cli
    M rel-eng/packages/katello-cli-tests
    M rel-eng/packages/katello-configure
    M rel-eng/packages/katello-selinux
    A rel-eng/packages/katello-utils
    R scripts/catmf
    M scripts/cli_generator/generate.py
    M scripts/system-test/cli_tests/_base_cleanup.sh
    M scripts/system-test/cli_tests/provider_import.sh
    M scripts/system-test/helpers
    M scripts/system-test/katello-cli-tests.spec
    M selinux/katello-selinux/katello-selinux.spec
    M src/Gemfile
    M src/app/controllers/activation_keys_controller.rb
    M src/app/controllers/api/activation_keys_controller.rb
    M src/app/controllers/api/api_controller.rb
    A src/app/controllers/api/custom_info_controller.rb
    M src/app/controllers/api/environments_controller.rb
    M src/app/controllers/api/filters_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_controller.rb
    A src/app/controllers/application_info_controller.rb
    M src/app/controllers/environments_controller.rb
    M src/app/controllers/gpg_keys_controller.rb
    M src/app/controllers/organizations_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/repositories_controller.rb
    M src/app/controllers/subscriptions_controller.rb
    M src/app/controllers/system_group_events_controller.rb
    M src/app/controllers/system_groups_controller.rb
    M src/app/controllers/system_templates_controller.rb
    M src/app/controllers/systems_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    M src/app/helpers/application_helper.rb
    A src/app/helpers/application_info_helper.rb
    M src/app/helpers/breadcrumb_helper.rb
    A src/app/helpers/custom_info_helper.rb
    M src/app/helpers/systems_helper.rb
    M src/app/models/activation_key.rb
    A src/app/models/custom_info.rb
    M src/app/models/filter.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/glue/candlepin/environment.rb
    M src/app/models/glue/candlepin/owner.rb
    M src/app/models/glue/candlepin/owner_info.rb
    M src/app/models/glue/candlepin/product.rb
    M src/app/models/glue/provider.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    A src/app/models/katello_label_format_validator.rb
    M src/app/models/kt_environment.rb
    M src/app/models/organization.rb
    M src/app/models/ping.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/provider.rb
    M src/app/models/pulp_sync_status.rb
    M src/app/models/repository.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/task_status.rb
    M src/app/stylesheets/_katello_sprites.scss
    M src/app/stylesheets/katello.scss
    M src/app/stylesheets/sections/dashboard.scss
    M src/app/stylesheets/sections/systems.scss
    M src/app/views/activation_keys/_edit.html.haml
    M src/app/views/activation_keys/_system.html.haml
    M src/app/views/activation_keys/_systems.html.haml
    A src/app/views/application_info/about.html.haml
    M src/app/views/common/_footer.haml
    M src/app/views/dashboard/_sync.haml
    M src/app/views/environments/_edit.html.haml
    M src/app/views/environments/_new.html.haml
    M src/app/views/errata/_short_details.html.haml
    M src/app/views/organizations/_edit.html.haml
    M src/app/views/organizations/_new.html.haml
    M src/app/views/products/_edit.html.haml
    M src/app/views/products/_new.html.haml
    M src/app/views/providers/_edit.html.haml
    M src/app/views/providers/_products_repos.html.haml
    A src/app/views/providers/_remove_item.html.haml
    M src/app/views/repositories/_edit.html.haml
    M src/app/views/repositories/_new.html.haml
    M src/app/views/system_groups/events/_show.html.haml
    M src/app/views/systems/_edit.html.haml
    M src/app/views/systems/_list_system_show.html.haml
    M src/app/views/systems/_more_products.html.haml
    M src/app/views/systems/_products.html.haml
    M src/app/views/systems/_subscriptions.html.haml
    M src/app/views/user_sessions/_interstitial.js.haml
    M src/config/application.rb
    M src/config/assets.yml
    M src/config/initializers/inflections.rb
    M src/config/routes.rb
    M src/db/migrate/20120820203952_db_unique_indices.rb
    A src/db/migrate/20120822205849_create_custom_info.rb
    A src/db/migrate/20120911182817_add_labels_to_environment.rb
    A src/db/migrate/20120911182838_add_labels_to_product.rb
    A src/db/migrate/20120911182916_add_labels_to_repository.rb
    A src/db/migrate/20120912200417_rename_cp_key_to_label.rb
    M src/db/seeds.rb
    M src/doc/apipie_examples.yml
    M src/katello.spec
    M src/lib/navigation/organization.rb
    M src/lib/resources/pulp.rb
    A src/lib/util/manifest_reader.rb
    M src/lib/util/model_util.rb
    M src/locale/app.pot
    M src/locale/bn/app.po
    M src/locale/de/app.po
    M src/locale/en/app.po
    M src/locale/es/app.po
    M src/locale/fr/app.po
    M src/locale/gu/app.po
    M src/locale/hi/app.po
    M src/locale/it/app.po
    M src/locale/ja/app.po
    M src/locale/kn/app.po
    M src/locale/ko/app.po
    M src/locale/mr/app.po
    M src/locale/or/app.po
    M src/locale/pa/app.po
    M src/locale/pt_BR/app.po
    M src/locale/ru/app.po
    M src/locale/ta/app.po
    M src/locale/te/app.po
    M src/locale/zh_CN/app.po
    M src/locale/zh_TW/app.po
    M src/public/javascripts/auto_complete.js
    M src/public/javascripts/changeset_edit.js
    M src/public/javascripts/content_search.js
    M src/public/javascripts/gpg_key.js
    M src/public/javascripts/katello.js
    A src/public/javascripts/katello_object.js
    M src/public/javascripts/organization.js
    M src/public/javascripts/products_repos.js
    M src/public/javascripts/provider.js
    M src/public/javascripts/system_edit.js
    M src/public/javascripts/system_products.js
    M src/public/javascripts/system_subscriptions.js
    M src/script/backup.sh
    M src/script/katello-debug
    M src/script/restore.sh
    M src/spec/controllers/activation_keys_controller_spec.rb
    M src/spec/controllers/api/activation_keys_controller_spec.rb
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/changesets_controller_spec.rb
    A src/spec/controllers/api/custom_info_controller_spec.rb
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/environments_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    M src/spec/controllers/api/filters_controller_spec.rb
    M src/spec/controllers/api/organizations_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/permissions_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/subscriptions_controller_spec.rb
    M src/spec/controllers/api/sync_controller_spec.rb
    M src/spec/controllers/api/sync_plans_controller_spec.rb
    M src/spec/controllers/api/system_group_errata_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/api/systems_packages_controller_spec.rb
    M src/spec/controllers/api/templates_content_controller_spec.rb
    M src/spec/controllers/api/templates_controller_spec.rb
    M src/spec/controllers/api/uebercerts_controller_spec.rb
    M src/spec/controllers/changeset_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/controllers/distributions_controller_spec.rb
    M src/spec/controllers/environments_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/organizations_controller_spec.rb
    M src/spec/controllers/products_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/system_errata_controller_spec.rb
    M src/spec/controllers/system_events_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb
    M src/spec/controllers/system_group_events_controller_spec.rb
    M src/spec/controllers/system_group_packages_controller_spec.rb
    M src/spec/controllers/system_groups_controller_spec.rb
    M src/spec/controllers/system_packages_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/controllers/systems_controller_spec.rb
    M src/spec/controllers/users_controller_spec.rb
    A src/spec/helpers/application_info_helper_spec.rb
    A src/spec/helpers/custom_info_helper_spec.rb
    M src/spec/helpers/login_helper_methods.rb
    M src/spec/helpers/organization_helper_methods.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/product_test_data.rb
    M src/spec/helpers/repo_test_data.rb
    M src/spec/lib/model_util_spec.rb
    M src/spec/models/activation_key_spec.rb
    M src/spec/models/changeset_spec.rb
    A src/spec/models/custom_info_spec.rb
    M src/spec/models/environment_spec.rb
    M src/spec/models/errata_spec.rb
    M src/spec/models/gpg_key_spec.rb
    M src/spec/models/hypervisor_spec.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/permission_spec.rb
    M src/spec/models/pool_spec.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb
    M src/spec/models/pulp_task_status_spec.rb
    M src/spec/models/repo_spec.rb
    M src/spec/models/repository_spec.rb
    M src/spec/models/role_spec.rb
    M src/spec/models/sync_plan_spec.rb
    M src/spec/models/system_group_spec.rb
    M src/spec/models/system_spec.rb
    M src/spec/models/system_template_package_spec.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb
    M src/spec/models/user_spec.rb

  Log Message:
  -----------
  Merge pull request #779 from jlsherrill/pulpv2

Pulpv2 - merging master -> pulpv2


  Commit: e8fa856dca82ca15e92a9ff7295f634187407733
      https://github.com/Katello/katello/commit/e8fa856dca82ca15e92a9ff7295f634187407733
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M src/app/controllers/api/errata_controller.rb
    M src/app/controllers/api/packages_controller.rb
    M src/app/controllers/changesets_controller.rb
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/dashboard_controller.rb
    M src/app/controllers/errata_controller.rb
    M src/app/controllers/packages_controller.rb
    M src/app/controllers/promotions_controller.rb
    M src/app/controllers/system_errata_controller.rb
    M src/app/controllers/system_group_errata_controller.rb
    M src/app/helpers/dashboard_helper.rb
    M src/app/helpers/system_errata_helper.rb
    M src/app/helpers/systems_helper.rb
    M src/app/models/changeset_erratum.rb
    M src/app/models/deletion_changeset.rb
    M src/app/models/glue/elastic_search/errata.rb
    M src/app/models/glue/elastic_search/package.rb
    M src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/repository.rb
    M src/app/models/system_group.rb
    A src/test/glue/elasticsearch/errata_test.rb
    A src/test/glue/elasticsearch/package_test.rb
    A src/test/glue/pulp/errata_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/repository_test.rb

  Log Message:
  -----------
  PulpV2 - Updates to references of Package and Errata based on changes to splitting \
out of elastic search and pulp related calls to separeate files.  This essentially \
removes all references to the eleastic search functionality that used to reside in \
glue pulp layer.


  Commit: e77778a0aee9d5e03ba5fc63d51e4aff776821d0
      https://github.com/Katello/katello/commit/e77778a0aee9d5e03ba5fc63d51e4aff776821d0
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M .gitignore
    A .tx/config
    M cli/katello-cli.spec
    M cli/po/keys.pot
    A cli/src/katello/client/api/custom_info.py
    M cli/src/katello/client/api/environment.py
    M cli/src/katello/client/api/filter.py
    M cli/src/katello/client/api/organization.py
    M cli/src/katello/client/api/product.py
    M cli/src/katello/client/api/repo.py
    M cli/src/katello/client/core/activation_key.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/permission.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/system.py
    A cli/src/katello/client/core/system_custom_info.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/utils/printer.py
    A cli/test/katello/tests/core/filter/filter_update_test.py
    M cli/test/katello/tests/core/organization/organization_data.py
    M cli/test/katello/tests/core/organization/organization_info_test.py
    M cli/test/katello/tests/core/organization/organization_subscription_list_test.py
    M cli/test/katello/tests/core/product/product_create_test.py
    M cli/test/katello/tests/core/repo/repo_discovery_test.py
    M katello-configure/bin/katello-upgrade
    M katello-configure/default-answer-file
    M katello-configure/katello-configure.spec
    M katello-configure/lib/puppet/parser/functions/katello_config_value.rb
    M katello-configure/modules/candlepin/manifests/config.pp
    M katello-configure/modules/candlepin/manifests/service.pp
    M katello-configure/modules/certs/manifests/config.pp
    M katello-configure/modules/certs/manifests/params.pp
    M katello-configure/modules/elasticsearch/manifests/config.pp
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/manifests/params.pp
    M katello-configure/modules/mongodb/manifests/config.pp
    M katello-configure/modules/postgres/manifests/service.pp
    M katello-configure/modules/postgres/manifests/sqlexec.pp
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/upgrade-scripts/default/0002_update_pulp.sh
    A katello-utils/.gitignore
    A katello-utils/bin/katello-cat-manifest
    A katello-utils/bin/katello-disconnected
    A katello-utils/katello-utils.spec
    A katello-utils/man/katello-disconnected.pod
    A katello-utils/test/smoke1/fake-manifest-syncable.zip
    A katello-utils/test/smoke1/test
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/packages/katello
    M rel-eng/packages/katello-cli
    M rel-eng/packages/katello-cli-tests
    M rel-eng/packages/katello-configure
    M rel-eng/packages/katello-selinux
    A rel-eng/packages/katello-utils
    R scripts/catmf
    M scripts/cli_generator/generate.py
    M scripts/system-test/cli_tests/_base_cleanup.sh
    M scripts/system-test/cli_tests/provider_import.sh
    M scripts/system-test/helpers
    M scripts/system-test/katello-cli-tests.spec
    M selinux/katello-selinux/katello-selinux.spec
    M src/Gemfile
    M src/app/controllers/activation_keys_controller.rb
    M src/app/controllers/api/activation_keys_controller.rb
    M src/app/controllers/api/api_controller.rb
    A src/app/controllers/api/custom_info_controller.rb
    M src/app/controllers/api/environments_controller.rb
    M src/app/controllers/api/filters_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_controller.rb
    A src/app/controllers/application_info_controller.rb
    M src/app/controllers/environments_controller.rb
    M src/app/controllers/gpg_keys_controller.rb
    M src/app/controllers/organizations_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/repositories_controller.rb
    M src/app/controllers/subscriptions_controller.rb
    M src/app/controllers/system_group_events_controller.rb
    M src/app/controllers/system_groups_controller.rb
    M src/app/controllers/system_templates_controller.rb
    M src/app/controllers/systems_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    M src/app/helpers/application_helper.rb
    A src/app/helpers/application_info_helper.rb
    M src/app/helpers/breadcrumb_helper.rb
    A src/app/helpers/custom_info_helper.rb
    M src/app/helpers/systems_helper.rb
    M src/app/models/activation_key.rb
    A src/app/models/custom_info.rb
    M src/app/models/filter.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/glue/candlepin/environment.rb
    M src/app/models/glue/candlepin/owner.rb
    M src/app/models/glue/candlepin/owner_info.rb
    M src/app/models/glue/candlepin/product.rb
    M src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/provider.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    A src/app/models/katello_label_format_validator.rb
    M src/app/models/kt_environment.rb
    M src/app/models/organization.rb
    M src/app/models/ping.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/provider.rb
    M src/app/models/pulp_sync_status.rb
    M src/app/models/repository.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/task_status.rb
    M src/app/stylesheets/_katello_sprites.scss
    M src/app/stylesheets/katello.scss
    M src/app/stylesheets/sections/dashboard.scss
    M src/app/stylesheets/sections/systems.scss
    M src/app/views/activation_keys/_edit.html.haml
    M src/app/views/activation_keys/_system.html.haml
    M src/app/views/activation_keys/_systems.html.haml
    A src/app/views/application_info/about.html.haml
    M src/app/views/common/_footer.haml
    M src/app/views/dashboard/_sync.haml
    M src/app/views/environments/_edit.html.haml
    M src/app/views/environments/_new.html.haml
    M src/app/views/errata/_short_details.html.haml
    M src/app/views/organizations/_edit.html.haml
    M src/app/views/organizations/_new.html.haml
    M src/app/views/products/_edit.html.haml
    M src/app/views/products/_new.html.haml
    M src/app/views/providers/_edit.html.haml
    M src/app/views/providers/_products_repos.html.haml
    A src/app/views/providers/_remove_item.html.haml
    M src/app/views/repositories/_edit.html.haml
    M src/app/views/repositories/_new.html.haml
    M src/app/views/system_groups/events/_show.html.haml
    M src/app/views/systems/_edit.html.haml
    M src/app/views/systems/_list_system_show.html.haml
    M src/app/views/systems/_more_products.html.haml
    M src/app/views/systems/_products.html.haml
    M src/app/views/systems/_subscriptions.html.haml
    M src/app/views/user_sessions/_interstitial.js.haml
    M src/config/application.rb
    M src/config/assets.yml
    M src/config/initializers/inflections.rb
    M src/config/routes.rb
    M src/db/migrate/20120820203952_db_unique_indices.rb
    A src/db/migrate/20120822205849_create_custom_info.rb
    A src/db/migrate/20120911182817_add_labels_to_environment.rb
    A src/db/migrate/20120911182838_add_labels_to_product.rb
    A src/db/migrate/20120911182916_add_labels_to_repository.rb
    A src/db/migrate/20120912200417_rename_cp_key_to_label.rb
    M src/db/seeds.rb
    M src/doc/apipie_examples.yml
    M src/katello.spec
    M src/lib/navigation/organization.rb
    M src/lib/resources/pulp.rb
    A src/lib/util/manifest_reader.rb
    M src/lib/util/model_util.rb
    M src/locale/app.pot
    M src/locale/bn/app.po
    M src/locale/de/app.po
    M src/locale/en/app.po
    M src/locale/es/app.po
    M src/locale/fr/app.po
    M src/locale/gu/app.po
    M src/locale/hi/app.po
    M src/locale/it/app.po
    M src/locale/ja/app.po
    M src/locale/kn/app.po
    M src/locale/ko/app.po
    M src/locale/mr/app.po
    M src/locale/or/app.po
    M src/locale/pa/app.po
    M src/locale/pt_BR/app.po
    M src/locale/ru/app.po
    M src/locale/ta/app.po
    M src/locale/te/app.po
    M src/locale/zh_CN/app.po
    M src/locale/zh_TW/app.po
    M src/public/javascripts/auto_complete.js
    M src/public/javascripts/changeset_edit.js
    M src/public/javascripts/content_search.js
    M src/public/javascripts/gpg_key.js
    M src/public/javascripts/katello.js
    A src/public/javascripts/katello_object.js
    M src/public/javascripts/organization.js
    M src/public/javascripts/products_repos.js
    M src/public/javascripts/provider.js
    M src/public/javascripts/system_edit.js
    M src/public/javascripts/system_products.js
    M src/public/javascripts/system_subscriptions.js
    M src/script/backup.sh
    M src/script/katello-debug
    M src/script/restore.sh
    M src/spec/controllers/activation_keys_controller_spec.rb
    M src/spec/controllers/api/activation_keys_controller_spec.rb
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/changesets_controller_spec.rb
    A src/spec/controllers/api/custom_info_controller_spec.rb
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/environments_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    M src/spec/controllers/api/filters_controller_spec.rb
    M src/spec/controllers/api/organizations_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/permissions_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/subscriptions_controller_spec.rb
    M src/spec/controllers/api/sync_controller_spec.rb
    M src/spec/controllers/api/sync_plans_controller_spec.rb
    M src/spec/controllers/api/system_group_errata_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/api/systems_packages_controller_spec.rb
    M src/spec/controllers/api/templates_content_controller_spec.rb
    M src/spec/controllers/api/templates_controller_spec.rb
    M src/spec/controllers/api/uebercerts_controller_spec.rb
    M src/spec/controllers/changeset_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/controllers/distributions_controller_spec.rb
    M src/spec/controllers/environments_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/organizations_controller_spec.rb
    M src/spec/controllers/products_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/system_errata_controller_spec.rb
    M src/spec/controllers/system_events_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb
    M src/spec/controllers/system_group_events_controller_spec.rb
    M src/spec/controllers/system_group_packages_controller_spec.rb
    M src/spec/controllers/system_groups_controller_spec.rb
    M src/spec/controllers/system_packages_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/controllers/systems_controller_spec.rb
    M src/spec/controllers/users_controller_spec.rb
    A src/spec/helpers/application_info_helper_spec.rb
    A src/spec/helpers/custom_info_helper_spec.rb
    M src/spec/helpers/login_helper_methods.rb
    M src/spec/helpers/organization_helper_methods.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/product_test_data.rb
    M src/spec/helpers/repo_test_data.rb
    M src/spec/lib/model_util_spec.rb
    M src/spec/models/activation_key_spec.rb
    M src/spec/models/changeset_spec.rb
    A src/spec/models/custom_info_spec.rb
    M src/spec/models/environment_spec.rb
    M src/spec/models/errata_spec.rb
    M src/spec/models/gpg_key_spec.rb
    M src/spec/models/hypervisor_spec.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/permission_spec.rb
    M src/spec/models/pool_spec.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb
    M src/spec/models/pulp_task_status_spec.rb
    M src/spec/models/repo_spec.rb
    M src/spec/models/repository_spec.rb
    M src/spec/models/role_spec.rb
    M src/spec/models/sync_plan_spec.rb
    M src/spec/models/system_group_spec.rb
    M src/spec/models/system_spec.rb
    M src/spec/models/system_template_package_spec.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb
    M src/spec/models/user_spec.rb

  Log Message:
  -----------
  Merge branch 'pulpv2' of github.com:Katello/katello into pulpv2

Conflicts:
	src/app/models/repository.rb
	src/config/application.rb


  Commit: 085517d8232bb5c8ea6531b8d3837b84690b98a1
      https://github.com/Katello/katello/commit/085517d8232bb5c8ea6531b8d3837b84690b98a1
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M src/.gitignore
    M src/Gemfile
    M src/app/controllers/api/errata_controller.rb
    M src/app/controllers/api/packages_controller.rb
    M src/app/controllers/changesets_controller.rb
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/dashboard_controller.rb
    M src/app/controllers/errata_controller.rb
    M src/app/controllers/packages_controller.rb
    M src/app/controllers/promotions_controller.rb
    M src/app/controllers/system_errata_controller.rb
    M src/app/controllers/system_group_errata_controller.rb
    M src/app/helpers/dashboard_helper.rb
    M src/app/helpers/system_errata_helper.rb
    M src/app/helpers/systems_helper.rb
    A src/app/models/authorization/repository.rb
    M src/app/models/changeset_erratum.rb
    M src/app/models/deletion_changeset.rb
    A src/app/models/errata.rb
    A src/app/models/glue/elastic_search/errata.rb
    A src/app/models/glue/elastic_search/indexed_model.rb
    A src/app/models/glue/elastic_search/package.rb
    A src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/glue/pulp/simple_package.rb
    A src/app/models/package.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/repository.rb
    M src/app/models/system_group.rb
    M src/app/models/user.rb
    M src/config/initializers/app_config.rb
    M src/lib/tasks/test.rake
    A src/test/fixtures/environment_products.yml
    A src/test/fixtures/environments.yml
    A src/test/fixtures/filters.yml
    A src/test/fixtures/filters_repositories.yml
    A src/test/fixtures/gpg_keys.yml
    A src/test/fixtures/organizations.yml
    M src/test/fixtures/permissions.yml
    A src/test/fixtures/products.yml
    A src/test/fixtures/providers.yml
    A src/test/fixtures/repositories.yml
    M src/test/fixtures/roles.yml
    M src/test/fixtures/roles_users.yml
    R src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    R src/test/fixtures/vcr_cassettes/pulp_user.yml
    A src/test/glue/elasticsearch/errata_test.rb
    A src/test/glue/elasticsearch/package_test.rb
    A src/test/glue/elasticsearch/repository_test.rb
    A src/test/glue/pulp/errata_test.rb
    A src/test/glue/pulp/package_test.rb
    A src/test/glue/pulp/repository_test.rb
    A src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    A src/test/models/authorization/repository_authorization_test.rb
    A src/test/models/package_test.rb
    A src/test/models/repository_test.rb
    M src/test/models/user_test.rb
    A src/test/vcr_cassettes/glue_pulp_user.yml
    A src/test/vcr_cassettes/pulp_user.yml

  Log Message:
  -----------
  Merge pull request #781 from ehelms/pulpv2

Pulpv2 - Initial splitting out of Pulp, Elastic Search and Authorizations for the \
Repository model.


  Commit: c7456df5e340a9e000b344e6743686be48199c0f
      https://github.com/Katello/katello/commit/c7456df5e340a9e000b344e6743686be48199c0f
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/promotion_changeset.rb

  Log Message:
  -----------
  pulpv2 - fixing issue where promoted repos would not have metadata regenerated


  Commit: dad450cc39d40313137dc40a62378b0c175d2f0f
      https://github.com/Katello/katello/commit/dad450cc39d40313137dc40a62378b0c175d2f0f
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/promotion_changeset.rb

  Log Message:
  -----------
  Merge pull request #782 from jlsherrill/pulpv2

pulpv2 - fixing issue where promoted repos would not have metadata regen...


  Commit: 06be00feb22fd8d4b370688b1c93551d3cf5f3ce
      https://github.com/Katello/katello/commit/06be00feb22fd8d4b370688b1c93551d3cf5f3ce
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M .gitignore
    A .tx/config
    M cli/katello-cli.spec
    M cli/po/keys.pot
    A cli/src/katello/client/api/custom_info.py
    M cli/src/katello/client/api/environment.py
    M cli/src/katello/client/api/filter.py
    M cli/src/katello/client/api/organization.py
    M cli/src/katello/client/api/product.py
    M cli/src/katello/client/api/repo.py
    M cli/src/katello/client/core/activation_key.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/permission.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/system.py
    A cli/src/katello/client/core/system_custom_info.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/utils/printer.py
    A cli/test/katello/tests/core/filter/filter_update_test.py
    M cli/test/katello/tests/core/organization/organization_data.py
    M cli/test/katello/tests/core/organization/organization_info_test.py
    M cli/test/katello/tests/core/organization/organization_subscription_list_test.py
    M cli/test/katello/tests/core/product/product_create_test.py
    M cli/test/katello/tests/core/repo/repo_discovery_test.py
    M katello-configure/bin/katello-upgrade
    M katello-configure/default-answer-file
    M katello-configure/katello-configure.spec
    M katello-configure/lib/puppet/parser/functions/katello_config_value.rb
    M katello-configure/modules/candlepin/manifests/config.pp
    M katello-configure/modules/candlepin/manifests/service.pp
    M katello-configure/modules/certs/manifests/config.pp
    M katello-configure/modules/certs/manifests/params.pp
    M katello-configure/modules/elasticsearch/manifests/config.pp
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/manifests/params.pp
    M katello-configure/modules/mongodb/manifests/config.pp
    M katello-configure/modules/postgres/manifests/service.pp
    M katello-configure/modules/postgres/manifests/sqlexec.pp
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/upgrade-scripts/default/0002_update_pulp.sh
    A katello-utils/.gitignore
    A katello-utils/bin/katello-cat-manifest
    A katello-utils/bin/katello-disconnected
    A katello-utils/katello-utils.spec
    A katello-utils/man/katello-disconnected.pod
    A katello-utils/test/smoke1/fake-manifest-syncable.zip
    A katello-utils/test/smoke1/test
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/packages/katello
    M rel-eng/packages/katello-cli
    M rel-eng/packages/katello-cli-tests
    M rel-eng/packages/katello-configure
    M rel-eng/packages/katello-selinux
    A rel-eng/packages/katello-utils
    R scripts/catmf
    M scripts/cli_generator/generate.py
    M scripts/system-test/cli_tests/_base_cleanup.sh
    M scripts/system-test/cli_tests/provider_import.sh
    M scripts/system-test/helpers
    M scripts/system-test/katello-cli-tests.spec
    M selinux/katello-selinux/katello-selinux.spec
    M src/.gitignore
    M src/Gemfile
    M src/app/controllers/activation_keys_controller.rb
    M src/app/controllers/api/activation_keys_controller.rb
    M src/app/controllers/api/api_controller.rb
    A src/app/controllers/api/custom_info_controller.rb
    M src/app/controllers/api/environments_controller.rb
    M src/app/controllers/api/errata_controller.rb
    M src/app/controllers/api/filters_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/packages_controller.rb
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_controller.rb
    A src/app/controllers/application_info_controller.rb
    M src/app/controllers/changesets_controller.rb
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/dashboard_controller.rb
    M src/app/controllers/environments_controller.rb
    M src/app/controllers/errata_controller.rb
    M src/app/controllers/gpg_keys_controller.rb
    M src/app/controllers/organizations_controller.rb
    M src/app/controllers/packages_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/promotions_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/repositories_controller.rb
    M src/app/controllers/subscriptions_controller.rb
    M src/app/controllers/system_errata_controller.rb
    M src/app/controllers/system_group_errata_controller.rb
    M src/app/controllers/system_group_events_controller.rb
    M src/app/controllers/system_groups_controller.rb
    M src/app/controllers/system_templates_controller.rb
    M src/app/controllers/systems_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    M src/app/helpers/application_helper.rb
    A src/app/helpers/application_info_helper.rb
    M src/app/helpers/breadcrumb_helper.rb
    A src/app/helpers/custom_info_helper.rb
    M src/app/helpers/dashboard_helper.rb
    M src/app/helpers/system_errata_helper.rb
    M src/app/helpers/systems_helper.rb
    M src/app/models/activation_key.rb
    A src/app/models/authorization/repository.rb
    M src/app/models/changeset_erratum.rb
    A src/app/models/custom_info.rb
    M src/app/models/deletion_changeset.rb
    A src/app/models/errata.rb
    M src/app/models/filter.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/glue/candlepin/environment.rb
    M src/app/models/glue/candlepin/owner.rb
    M src/app/models/glue/candlepin/owner_info.rb
    M src/app/models/glue/candlepin/product.rb
    A src/app/models/glue/elastic_search/errata.rb
    A src/app/models/glue/elastic_search/indexed_model.rb
    A src/app/models/glue/elastic_search/package.rb
    A src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/provider.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/glue/pulp/simple_package.rb
    A src/app/models/katello_label_format_validator.rb
    M src/app/models/kt_environment.rb
    M src/app/models/organization.rb
    A src/app/models/package.rb
    M src/app/models/ping.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/provider.rb
    M src/app/models/pulp_sync_status.rb
    M src/app/models/repository.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb
    M src/app/stylesheets/_katello_sprites.scss
    M src/app/stylesheets/katello.scss
    M src/app/stylesheets/sections/dashboard.scss
    M src/app/stylesheets/sections/systems.scss
    M src/app/views/activation_keys/_edit.html.haml
    M src/app/views/activation_keys/_system.html.haml
    M src/app/views/activation_keys/_systems.html.haml
    A src/app/views/application_info/about.html.haml
    M src/app/views/common/_footer.haml
    M src/app/views/dashboard/_sync.haml
    M src/app/views/environments/_edit.html.haml
    M src/app/views/environments/_new.html.haml
    M src/app/views/errata/_short_details.html.haml
    M src/app/views/organizations/_edit.html.haml
    M src/app/views/organizations/_new.html.haml
    M src/app/views/products/_edit.html.haml
    M src/app/views/products/_new.html.haml
    M src/app/views/providers/_edit.html.haml
    M src/app/views/providers/_products_repos.html.haml
    A src/app/views/providers/_remove_item.html.haml
    M src/app/views/repositories/_edit.html.haml
    M src/app/views/repositories/_new.html.haml
    M src/app/views/system_groups/events/_show.html.haml
    M src/app/views/systems/_edit.html.haml
    M src/app/views/systems/_list_system_show.html.haml
    M src/app/views/systems/_more_products.html.haml
    M src/app/views/systems/_products.html.haml
    M src/app/views/systems/_subscriptions.html.haml
    M src/app/views/user_sessions/_interstitial.js.haml
    M src/config/application.rb
    M src/config/assets.yml
    M src/config/initializers/app_config.rb
    M src/config/initializers/inflections.rb
    M src/config/routes.rb
    M src/db/migrate/20120820203952_db_unique_indices.rb
    A src/db/migrate/20120822205849_create_custom_info.rb
    A src/db/migrate/20120911182817_add_labels_to_environment.rb
    A src/db/migrate/20120911182838_add_labels_to_product.rb
    A src/db/migrate/20120911182916_add_labels_to_repository.rb
    A src/db/migrate/20120912200417_rename_cp_key_to_label.rb
    M src/db/seeds.rb
    M src/doc/apipie_examples.yml
    M src/katello.spec
    M src/lib/navigation/organization.rb
    M src/lib/resources/pulp.rb
    M src/lib/tasks/test.rake
    A src/lib/util/manifest_reader.rb
    M src/lib/util/model_util.rb
    M src/locale/app.pot
    M src/locale/bn/app.po
    M src/locale/de/app.po
    M src/locale/en/app.po
    M src/locale/es/app.po
    M src/locale/fr/app.po
    M src/locale/gu/app.po
    M src/locale/hi/app.po
    M src/locale/it/app.po
    M src/locale/ja/app.po
    M src/locale/kn/app.po
    M src/locale/ko/app.po
    M src/locale/mr/app.po
    M src/locale/or/app.po
    M src/locale/pa/app.po
    M src/locale/pt_BR/app.po
    M src/locale/ru/app.po
    M src/locale/ta/app.po
    M src/locale/te/app.po
    M src/locale/zh_CN/app.po
    M src/locale/zh_TW/app.po
    M src/public/javascripts/auto_complete.js
    M src/public/javascripts/changeset_edit.js
    M src/public/javascripts/content_search.js
    M src/public/javascripts/gpg_key.js
    M src/public/javascripts/katello.js
    A src/public/javascripts/katello_object.js
    M src/public/javascripts/organization.js
    M src/public/javascripts/products_repos.js
    M src/public/javascripts/provider.js
    M src/public/javascripts/system_edit.js
    M src/public/javascripts/system_products.js
    M src/public/javascripts/system_subscriptions.js
    M src/script/backup.sh
    M src/script/katello-debug
    M src/script/restore.sh
    M src/spec/controllers/activation_keys_controller_spec.rb
    M src/spec/controllers/api/activation_keys_controller_spec.rb
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/changesets_controller_spec.rb
    A src/spec/controllers/api/custom_info_controller_spec.rb
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/environments_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    M src/spec/controllers/api/filters_controller_spec.rb
    M src/spec/controllers/api/organizations_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/permissions_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/subscriptions_controller_spec.rb
    M src/spec/controllers/api/sync_controller_spec.rb
    M src/spec/controllers/api/sync_plans_controller_spec.rb
    M src/spec/controllers/api/system_group_errata_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/api/systems_packages_controller_spec.rb
    M src/spec/controllers/api/templates_content_controller_spec.rb
    M src/spec/controllers/api/templates_controller_spec.rb
    M src/spec/controllers/api/uebercerts_controller_spec.rb
    M src/spec/controllers/changeset_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/controllers/distributions_controller_spec.rb
    M src/spec/controllers/environments_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/organizations_controller_spec.rb
    M src/spec/controllers/products_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/system_errata_controller_spec.rb
    M src/spec/controllers/system_events_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb
    M src/spec/controllers/system_group_events_controller_spec.rb
    M src/spec/controllers/system_group_packages_controller_spec.rb
    M src/spec/controllers/system_groups_controller_spec.rb
    M src/spec/controllers/system_packages_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/controllers/systems_controller_spec.rb
    M src/spec/controllers/users_controller_spec.rb
    A src/spec/helpers/application_info_helper_spec.rb
    A src/spec/helpers/custom_info_helper_spec.rb
    M src/spec/helpers/login_helper_methods.rb
    M src/spec/helpers/organization_helper_methods.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/product_test_data.rb
    M src/spec/helpers/repo_test_data.rb
    M src/spec/lib/model_util_spec.rb
    M src/spec/models/activation_key_spec.rb
    M src/spec/models/changeset_spec.rb
    A src/spec/models/custom_info_spec.rb
    M src/spec/models/environment_spec.rb
    M src/spec/models/errata_spec.rb
    M src/spec/models/gpg_key_spec.rb
    M src/spec/models/hypervisor_spec.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/permission_spec.rb
    M src/spec/models/pool_spec.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb
    M src/spec/models/pulp_task_status_spec.rb
    M src/spec/models/repo_spec.rb
    M src/spec/models/repository_spec.rb
    M src/spec/models/role_spec.rb
    M src/spec/models/sync_plan_spec.rb
    M src/spec/models/system_group_spec.rb
    M src/spec/models/system_spec.rb
    M src/spec/models/system_template_package_spec.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb
    M src/spec/models/user_spec.rb
    A src/test/fixtures/environment_products.yml
    A src/test/fixtures/environments.yml
    A src/test/fixtures/filters.yml
    A src/test/fixtures/filters_repositories.yml
    A src/test/fixtures/gpg_keys.yml
    A src/test/fixtures/organizations.yml
    M src/test/fixtures/permissions.yml
    A src/test/fixtures/products.yml
    A src/test/fixtures/providers.yml
    A src/test/fixtures/repositories.yml
    M src/test/fixtures/roles.yml
    M src/test/fixtures/roles_users.yml
    R src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    R src/test/fixtures/vcr_cassettes/pulp_user.yml
    A src/test/glue/elasticsearch/errata_test.rb
    A src/test/glue/elasticsearch/package_test.rb
    A src/test/glue/elasticsearch/repository_test.rb
    A src/test/glue/pulp/errata_test.rb
    A src/test/glue/pulp/package_test.rb
    A src/test/glue/pulp/repository_test.rb
    A src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    A src/test/models/authorization/repository_authorization_test.rb
    A src/test/models/package_test.rb
    A src/test/models/repository_test.rb
    M src/test/models/user_test.rb
    A src/test/vcr_cassettes/glue_pulp_user.yml
    A src/test/vcr_cassettes/pulp_user.yml

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/pulpv2' into fork-pulpv2

Conflicts:
	src/app/models/glue/pulp/consumer.rb


  Commit: 9d7a9b7de5c3f0c9725d5959abc527f1e5fb02c7
      https://github.com/Katello/katello/commit/9d7a9b7de5c3f0c9725d5959abc527f1e5fb02c7
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    R src/test/fixtures/environment_products.yml
    R src/test/fixtures/environments.yml
    R src/test/fixtures/filters.yml
    R src/test/fixtures/filters_repositories.yml
    R src/test/fixtures/gpg_keys.yml
    A src/test/fixtures/models/environment_products.yml
    A src/test/fixtures/models/environments.yml
    A src/test/fixtures/models/filters.yml
    A src/test/fixtures/models/filters_repositories.yml
    A src/test/fixtures/models/gpg_keys.yml
    A src/test/fixtures/models/organizations.yml
    A src/test/fixtures/models/permissions.yml
    A src/test/fixtures/models/products.yml
    A src/test/fixtures/models/providers.yml
    A src/test/fixtures/models/repositories.yml
    A src/test/fixtures/models/resource_types.yml
    A src/test/fixtures/models/roles.yml
    A src/test/fixtures/models/roles_users.yml
    A src/test/fixtures/models/users.yml
    R src/test/fixtures/organizations.yml
    R src/test/fixtures/permissions.yml
    R src/test/fixtures/products.yml
    R src/test/fixtures/providers.yml
    R src/test/fixtures/repositories.yml
    R src/test/fixtures/resource_types.yml
    R src/test/fixtures/roles.yml
    R src/test/fixtures/roles_users.yml
    R src/test/fixtures/users.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    A src/test/fixtures/vcr_cassettes/pulp_user.yml
    A src/test/fixtures/zoo5/.treeinfo
    A src/test/fixtures/zoo5/CHANGESET
    A src/test/fixtures/zoo5/PULP_MANIFEST
    A src/test/fixtures/zoo5/cheetah-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/create.sh
    A src/test/fixtures/zoo5/elephant-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/empty.iso
    A src/test/fixtures/zoo5/giraffe-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/images/test1.img
    A src/test/fixtures/zoo5/images/test2.img
    A src/test/fixtures/zoo5/lion-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/monkey-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/penguin-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/repodata/06661e2a9839cf0beebcf409410ca4f93c09081f4e772fd0d03e1faf62705a11-comps.xml
  A src/test/fixtures/zoo5/repodata/0c4d57a68f9a3b13dabc6f8b01ca8958aa796167cececee04717edfc26d02f2d-other.xml.gz
  A src/test/fixtures/zoo5/repodata/298ce23f48b3613e030d19f3d9c2ff2df31c2f08479bdf94cebb87c208e48c0e-filelists.xml.gz
  A src/test/fixtures/zoo5/repodata/32c0e38317aade0c057b173ff62344e912e1bd650409c6ac31aecee78e3413af-comps.xml.gz
  A src/test/fixtures/zoo5/repodata/34d954906c7ce7aa2254e24d7be0a9049e0a2f436add023ca056123a2d48e30e-updateinfo.xml.gz
  A src/test/fixtures/zoo5/repodata/63aedd074d9f0daf7c6be8c61f91d76a962bb6ceda86b9abd2140f154c320fa2-other.sqlite.bz2
  A src/test/fixtures/zoo5/repodata/69d65cdebffc6199d3adb3e38b06ca9abaae6c1c7366805099987b28f182178d-filelists.sqlite.bz2
  A src/test/fixtures/zoo5/repodata/799241a518a4a6b11a68f8e6fbdb719875f87832f60accc0851ced0d6a0497c6-updateinfo.xml.gz
  A src/test/fixtures/zoo5/repodata/a4ea9fcdce31dc8673c7a9ba66c086bd6a16e1eff717e3896dd1cac444a1423c-primary.xml.gz
  A src/test/fixtures/zoo5/repodata/fb9b9508e148368d0edf7e03dc905b343937fd958e6531cce6380933d18c3455-primary.sqlite.bz2
  A src/test/fixtures/zoo5/repodata/repomd.xml
    A src/test/fixtures/zoo5/squirrel-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/updateinfo.xml
    A src/test/fixtures/zoo5/walrus-0.3-0.8.noarch.rpm

  Log Message:
  -----------
  PulpV2 - Re-organizes location of test fixtures.


  Commit: afb5da1420153308fd64fb596960820c7f8f5439
      https://github.com/Katello/katello/commit/afb5da1420153308fd64fb596960820c7f8f5439
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    R src/test/integration/fixtures/repositories/zoo5/.treeinfo
    R src/test/integration/fixtures/repositories/zoo5/CHANGESET
    R src/test/integration/fixtures/repositories/zoo5/PULP_MANIFEST
    R src/test/integration/fixtures/repositories/zoo5/cheetah-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/create.sh
    R src/test/integration/fixtures/repositories/zoo5/elephant-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/empty.iso
    R src/test/integration/fixtures/repositories/zoo5/giraffe-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/images/test1.img
    R src/test/integration/fixtures/repositories/zoo5/images/test2.img
    R src/test/integration/fixtures/repositories/zoo5/lion-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/monkey-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/penguin-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/repodata/06661e2a9839cf0beebcf409410ca4f93c09081f4e772fd0d03e1faf62705a11-comps.xml
  R src/test/integration/fixtures/repositories/zoo5/repodata/0c4d57a68f9a3b13dabc6f8b01ca8958aa796167cececee04717edfc26d02f2d-other.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/298ce23f48b3613e030d19f3d9c2ff2df31c2f08479bdf94cebb87c208e48c0e-filelists.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/32c0e38317aade0c057b173ff62344e912e1bd650409c6ac31aecee78e3413af-comps.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/34d954906c7ce7aa2254e24d7be0a9049e0a2f436add023ca056123a2d48e30e-updateinfo.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/63aedd074d9f0daf7c6be8c61f91d76a962bb6ceda86b9abd2140f154c320fa2-other.sqlite.bz2
  R src/test/integration/fixtures/repositories/zoo5/repodata/69d65cdebffc6199d3adb3e38b06ca9abaae6c1c7366805099987b28f182178d-filelists.sqlite.bz2
  R src/test/integration/fixtures/repositories/zoo5/repodata/799241a518a4a6b11a68f8e6fbdb719875f87832f60accc0851ced0d6a0497c6-updateinfo.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/a4ea9fcdce31dc8673c7a9ba66c086bd6a16e1eff717e3896dd1cac444a1423c-primary.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/fb9b9508e148368d0edf7e03dc905b343937fd958e6531cce6380933d18c3455-primary.sqlite.bz2
  R src/test/integration/fixtures/repositories/zoo5/repodata/repomd.xml
    R src/test/integration/fixtures/repositories/zoo5/squirrel-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/updateinfo.xml
    R src/test/integration/fixtures/repositories/zoo5/walrus-0.3-0.8.noarch.rpm

  Log Message:
  -----------
  PulpV2 - Removal of zoo5 local repository from test integration directory.


  Commit: 68fe19515a337c3e92558a2028cdfe810f4602b6
      https://github.com/Katello/katello/commit/68fe19515a337c3e92558a2028cdfe810f4602b6
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  pulpv2 - fix errors on package/errata affecting promotion


  Commit: b7ba58aceeabf4aa6dc31f3c46ac844508838d2c
      https://github.com/Katello/katello/commit/b7ba58aceeabf4aa6dc31f3c46ac844508838d2c
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  Merge pull request #787 from bbuckingham/fork-pulpv2-promo_error

pulpv2 - fix errors on package/errata affecting promotion


  Commit: ed6f82c69a12aefbba5bd52bf9369130c6c45c68
      https://github.com/Katello/katello/commit/ed6f82c69a12aefbba5bd52bf9369130c6c45c68
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  pulpv2 - removing no longer avvailable distributor option


  Commit: 12bb7e7638e022f35a85f0bf3ee3bad1640be21b
      https://github.com/Katello/katello/commit/12bb7e7638e022f35a85f0bf3ee3bad1640be21b
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  Revert "pulpv2 - removing no longer avvailable distributor option"

This reverts commit ed6f82c69a12aefbba5bd52bf9369130c6c45c68.


  Commit: 43859f0b1b1ea69c1e4f136f5c6b6a6489424a56
      https://github.com/Katello/katello/commit/43859f0b1b1ea69c1e4f136f5c6b6a6489424a56
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  fixing generate_metadata to be true


  Commit: 5434b29a9415fdd88abc7c7fd021218fb9144420
      https://github.com/Katello/katello/commit/5434b29a9415fdd88abc7c7fd021218fb9144420
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-05 (Fri, 05 Oct 2012)

  Changed paths:
    M src/lib/tasks/test.rake

  Log Message:
  -----------
  PulpV2 - Adds ability to run a single test method by specifying method=


  Commit: 54ee8d50fd2d410f076a08c5b24f498627963130
      https://github.com/Katello/katello/commit/54ee8d50fd2d410f076a08c5b24f498627963130
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/promotion_changeset.rb

  Log Message:
  -----------
  Merge branch 'pulpv2' of github.com:Katello/katello into pulpv2


  Commit: 25cc57ea21b060cd8d62d69a65c42aa6e8c769c5
      https://github.com/Katello/katello/commit/25cc57ea21b060cd8d62d69a65c42aa6e8c769c5
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/pulp_sync_status.rb
    M src/app/models/repository.rb
    M src/test/fixtures/models/environments.yml
    M src/test/fixtures/models/organizations.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    A src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    A src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/repository_test.rb
    R src/test/vcr_cassettes/glue_pulp_user.yml
    R src/test/vcr_cassettes/pulp_user.yml

  Log Message:
  -----------
  PulpV2 - A slew of glue layer tests for repository and some associated cleanup.


  Commit: 3eb8448a6b68c3f58a678b9cc0f230c09a6ab32a
      https://github.com/Katello/katello/commit/3eb8448a6b68c3f58a678b9cc0f230c09a6ab32a
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M src/app/controllers/api/packages_controller.rb
    M src/app/models/deletion_changeset.rb
    M src/app/models/glue/candlepin/environment.rb
    M src/app/models/glue/pulp/distribution.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/ping.rb
    M src/app/models/system_template_distribution.rb
    M src/lib/resources/pulp.rb
    M src/script/reset-oauth

  Log Message:
  -----------
  Merge branch 'pulpv2' of github.com:Katello/katello into pulpv2

Conflicts:
	src/app/models/glue/pulp/repo.rb


  Commit: eece46d59e9ce811c6545bd9ba5268eac89501b7
      https://github.com/Katello/katello/commit/eece46d59e9ce811c6545bd9ba5268eac89501b7
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M src/app/models/repository.rb
    M src/test/models/repository_test.rb

  Log Message:
  -----------
  PulpV2 - Adds previously removed environment_id function to repository model.


  Commit: cdc409c11bfe9a1f0ed9f94c61ff1852d6cfe655
      https://github.com/Katello/katello/commit/cdc409c11bfe9a1f0ed9f94c61ff1852d6cfe655
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    R src/test/integration/fixtures/vcr_cassettes/pulp_consumer.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_consumer_group.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_consumer_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_distribution.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_errata.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_filter.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_filter_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_package.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_package_group.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_package_group_category.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_ping.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_repository.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_repository_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_repository_sync.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_roles.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_task.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_task_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_user.yml
    R src/test/integration/pulp/helpers/consumer_helper.rb
    R src/test/integration/pulp/helpers/filter_helper.rb
    R src/test/integration/pulp/helpers/repository_helper.rb
    R src/test/integration/pulp/pulp_consumer_group_test.rb
    R src/test/integration/pulp/pulp_consumer_test.rb
    R src/test/integration/pulp/pulp_distribution_test.rb
    R src/test/integration/pulp/pulp_errata_test.rb
    R src/test/integration/pulp/pulp_filter_test.rb
    R src/test/integration/pulp/pulp_package_group_category_test.rb
    R src/test/integration/pulp/pulp_package_group_test.rb
    R src/test/integration/pulp/pulp_package_test.rb
    R src/test/integration/pulp/pulp_ping_test.rb
    R src/test/integration/pulp/pulp_repository_test.rb
    R src/test/integration/pulp/pulp_roles_test.rb
    R src/test/integration/pulp/pulp_task_test.rb
    R src/test/integration/pulp/pulp_user_test.rb
    R src/test/integration/pulp/test_runner.rb
    R src/test/integration/pulp/vcr_pulp_setup.rb
    R src/test/unit/glue/pulp/user_test.rb
    R src/test/unit/user_test.rb

  Log Message:
  -----------
  PulpV2 - Removes old integration tests that are no longer needed since \
lib/resources/pulp.rb has been moved to a stand alone gem.


  Commit: aa392c835456ca51085586c6ec49853ba9683834
      https://github.com/Katello/katello/commit/aa392c835456ca51085586c6ec49853ba9683834
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M src/test/minitest_helper.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  PulpV2 - Test cleanup and adds a generic function to call and disable glue layers.


  Commit: a2ac9f12c740585877cd238fe0f178a79860850d
      https://github.com/Katello/katello/commit/a2ac9f12c740585877cd238fe0f178a79860850d
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M src/app/models/user.rb

  Log Message:
  -----------
  PulpV2 - Fixes bug found in prevention of the deletion of last super user.


  Commit: 047f4066d44402f99b8a9ddc8fd8976fddf8c66b
      https://github.com/Katello/katello/commit/047f4066d44402f99b8a9ddc8fd8976fddf8c66b
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M src/test/models/authorization/repository_authorization_test.rb
    A src/test/models/repository_base.rb
    M src/test/models/repository_test.rb
    A src/test/models/user_base.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  PulpV2 - Test re-factoring by breaking out the base modules for tests into their \
own files to allow easier sharing.


  Commit: 8b19e158824dcee1079f60021768cb48eec2226a
      https://github.com/Katello/katello/commit/8b19e158824dcee1079f60021768cb48eec2226a
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Log Message:
  -----------
  Merge branch 'pulpv2' of github.com:Katello/katello into pulpv2


  Commit: 6c0f958965bef73e8ae22f07eee019de0c6dde73
      https://github.com/Katello/katello/commit/6c0f958965bef73e8ae22f07eee019de0c6dde73
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/pulpv2' into fork-pulpv2


  Commit: 678e1ff648534852e7901ceaf1eee008ab079176
      https://github.com/Katello/katello/commit/678e1ff648534852e7901ceaf1eee008ab079176
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  Merge pull request #809 from jlsherrill/pulpv2

Pulpv2 - fixing promotion


  Commit: 0530ce75a9dc84033979fd3f500bb07dcf465703
      https://github.com/Katello/katello/commit/0530ce75a9dc84033979fd3f500bb07dcf465703
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/pulpv2' into fork-pulpv2


  Commit: 3aa544dfa23e98ef3185d95e8ea414d24fd3d17a
      https://github.com/Katello/katello/commit/3aa544dfa23e98ef3185d95e8ea414d24fd3d17a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M src/app/controllers/api/packages_controller.rb
    M src/app/models/glue/pulp/distribution.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/system_template_distribution.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - migrating package/errata/pkg groups/distributions to runcible


  Commit: a4fc592a3a198839fc9f69cf067cabf1df8c31e4
      https://github.com/Katello/katello/commit/a4fc592a3a198839fc9f69cf067cabf1df8c31e4
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M src/script/reset-oauth

  Log Message:
  -----------
  Changed paths for reset-oauth script


  Commit: ee0b75e6c3407fc2af27e89e34f9db9bcf17ef8a
      https://github.com/Katello/katello/commit/ee0b75e6c3407fc2af27e89e34f9db9bcf17ef8a
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M src/script/reset-oauth

  Log Message:
  -----------
  Merge pull request #813 from parthaa/small-fix-reset-oauth

Changed paths for reset-oauth script


  Commit: bf307931407610a0f0332812f35408cfb935e117
      https://github.com/Katello/katello/commit/bf307931407610a0f0332812f35408cfb935e117
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M src/app/models/glue/candlepin/environment.rb

  Log Message:
  -----------
  pulpv2 - fixing intermittent issue

NoMethodError Exception: undefined method enabled for #<Class:0x7fd9de5741c0>


  Commit: c37e293ccd3742226860dffdd3ee5696b50dafaa
      https://github.com/Katello/katello/commit/c37e293ccd3742226860dffdd3ee5696b50dafaa
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M src/app/models/deletion_changeset.rb
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  pulpv2 - converting errata/package deletion after bad merge made it return


  Commit: 557c88ae6ed197466c6948dea742dadab29d94e6
      https://github.com/Katello/katello/commit/557c88ae6ed197466c6948dea742dadab29d94e6
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  pulpv2 - moving distribution deletion


  Commit: 2b438fc0dfd9ee2912d878134cbf10dd73ae5003
      https://github.com/Katello/katello/commit/2b438fc0dfd9ee2912d878134cbf10dd73ae5003
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - removing unused pulp code


  Commit: 4134d23ed4717605ae9904bcf79d97c034e80344
      https://github.com/Katello/katello/commit/4134d23ed4717605ae9904bcf79d97c034e80344
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M src/app/models/ping.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - removing PulpPing and relying on the call directly


  Commit: ebcbc207250167f9e771a9e41d3c0e562baa5a9e
      https://github.com/Katello/katello/commit/ebcbc207250167f9e771a9e41d3c0e562baa5a9e
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M src/app/controllers/api/packages_controller.rb
    M src/app/models/deletion_changeset.rb
    M src/app/models/glue/candlepin/environment.rb
    M src/app/models/glue/pulp/distribution.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/ping.rb
    M src/app/models/system_template_distribution.rb
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  Merge pull request #816 from jlsherrill/pulpv2

Pulpv2 - removing pulp.rb code and migrating errata/rpms/package groups/etc... to \
runcible


  Commit: 733894304a37336c39a1959304a51b0ae9367e48
      https://github.com/Katello/katello/commit/733894304a37336c39a1959304a51b0ae9367e48
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/pulp_sync_status.rb
    M src/app/models/repository.rb
    M src/lib/tasks/test.rake
    R src/test/fixtures/environment_products.yml
    R src/test/fixtures/environments.yml
    R src/test/fixtures/filters.yml
    R src/test/fixtures/filters_repositories.yml
    R src/test/fixtures/gpg_keys.yml
    A src/test/fixtures/models/environment_products.yml
    A src/test/fixtures/models/environments.yml
    A src/test/fixtures/models/filters.yml
    A src/test/fixtures/models/filters_repositories.yml
    A src/test/fixtures/models/gpg_keys.yml
    A src/test/fixtures/models/organizations.yml
    A src/test/fixtures/models/permissions.yml
    A src/test/fixtures/models/products.yml
    A src/test/fixtures/models/providers.yml
    A src/test/fixtures/models/repositories.yml
    A src/test/fixtures/models/resource_types.yml
    A src/test/fixtures/models/roles.yml
    A src/test/fixtures/models/roles_users.yml
    A src/test/fixtures/models/users.yml
    R src/test/fixtures/organizations.yml
    R src/test/fixtures/permissions.yml
    R src/test/fixtures/products.yml
    R src/test/fixtures/providers.yml
    R src/test/fixtures/repositories.yml
    R src/test/fixtures/resource_types.yml
    R src/test/fixtures/roles.yml
    R src/test/fixtures/roles_users.yml
    R src/test/fixtures/users.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    A src/test/fixtures/vcr_cassettes/pulp_user.yml
    A src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    A src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    A src/test/fixtures/zoo5/.treeinfo
    A src/test/fixtures/zoo5/CHANGESET
    A src/test/fixtures/zoo5/PULP_MANIFEST
    A src/test/fixtures/zoo5/cheetah-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/create.sh
    A src/test/fixtures/zoo5/elephant-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/empty.iso
    A src/test/fixtures/zoo5/giraffe-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/images/test1.img
    A src/test/fixtures/zoo5/images/test2.img
    A src/test/fixtures/zoo5/lion-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/monkey-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/penguin-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/repodata/06661e2a9839cf0beebcf409410ca4f93c09081f4e772fd0d03e1faf62705a11-comps.xml
  A src/test/fixtures/zoo5/repodata/0c4d57a68f9a3b13dabc6f8b01ca8958aa796167cececee04717edfc26d02f2d-other.xml.gz
  A src/test/fixtures/zoo5/repodata/298ce23f48b3613e030d19f3d9c2ff2df31c2f08479bdf94cebb87c208e48c0e-filelists.xml.gz
  A src/test/fixtures/zoo5/repodata/32c0e38317aade0c057b173ff62344e912e1bd650409c6ac31aecee78e3413af-comps.xml.gz
  A src/test/fixtures/zoo5/repodata/34d954906c7ce7aa2254e24d7be0a9049e0a2f436add023ca056123a2d48e30e-updateinfo.xml.gz
  A src/test/fixtures/zoo5/repodata/63aedd074d9f0daf7c6be8c61f91d76a962bb6ceda86b9abd2140f154c320fa2-other.sqlite.bz2
  A src/test/fixtures/zoo5/repodata/69d65cdebffc6199d3adb3e38b06ca9abaae6c1c7366805099987b28f182178d-filelists.sqlite.bz2
  A src/test/fixtures/zoo5/repodata/799241a518a4a6b11a68f8e6fbdb719875f87832f60accc0851ced0d6a0497c6-updateinfo.xml.gz
  A src/test/fixtures/zoo5/repodata/a4ea9fcdce31dc8673c7a9ba66c086bd6a16e1eff717e3896dd1cac444a1423c-primary.xml.gz
  A src/test/fixtures/zoo5/repodata/fb9b9508e148368d0edf7e03dc905b343937fd958e6531cce6380933d18c3455-primary.sqlite.bz2
  A src/test/fixtures/zoo5/repodata/repomd.xml
    A src/test/fixtures/zoo5/squirrel-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/updateinfo.xml
    A src/test/fixtures/zoo5/walrus-0.3-0.8.noarch.rpm
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    R src/test/integration/fixtures/repositories/zoo5/.treeinfo
    R src/test/integration/fixtures/repositories/zoo5/CHANGESET
    R src/test/integration/fixtures/repositories/zoo5/PULP_MANIFEST
    R src/test/integration/fixtures/repositories/zoo5/cheetah-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/create.sh
    R src/test/integration/fixtures/repositories/zoo5/elephant-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/empty.iso
    R src/test/integration/fixtures/repositories/zoo5/giraffe-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/images/test1.img
    R src/test/integration/fixtures/repositories/zoo5/images/test2.img
    R src/test/integration/fixtures/repositories/zoo5/lion-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/monkey-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/penguin-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/repodata/06661e2a9839cf0beebcf409410ca4f93c09081f4e772fd0d03e1faf62705a11-comps.xml
  R src/test/integration/fixtures/repositories/zoo5/repodata/0c4d57a68f9a3b13dabc6f8b01ca8958aa796167cececee04717edfc26d02f2d-other.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/298ce23f48b3613e030d19f3d9c2ff2df31c2f08479bdf94cebb87c208e48c0e-filelists.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/32c0e38317aade0c057b173ff62344e912e1bd650409c6ac31aecee78e3413af-comps.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/34d954906c7ce7aa2254e24d7be0a9049e0a2f436add023ca056123a2d48e30e-updateinfo.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/63aedd074d9f0daf7c6be8c61f91d76a962bb6ceda86b9abd2140f154c320fa2-other.sqlite.bz2
  R src/test/integration/fixtures/repositories/zoo5/repodata/69d65cdebffc6199d3adb3e38b06ca9abaae6c1c7366805099987b28f182178d-filelists.sqlite.bz2
  R src/test/integration/fixtures/repositories/zoo5/repodata/799241a518a4a6b11a68f8e6fbdb719875f87832f60accc0851ced0d6a0497c6-updateinfo.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/a4ea9fcdce31dc8673c7a9ba66c086bd6a16e1eff717e3896dd1cac444a1423c-primary.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/fb9b9508e148368d0edf7e03dc905b343937fd958e6531cce6380933d18c3455-primary.sqlite.bz2
  R src/test/integration/fixtures/repositories/zoo5/repodata/repomd.xml
    R src/test/integration/fixtures/repositories/zoo5/squirrel-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/updateinfo.xml
    R src/test/integration/fixtures/repositories/zoo5/walrus-0.3-0.8.noarch.rpm
    M src/test/minitest_helper.rb
    M src/test/models/repository_test.rb
    R src/test/vcr_cassettes/glue_pulp_user.yml
    R src/test/vcr_cassettes/pulp_user.yml

  Log Message:
  -----------
  Merge pull request #817 from ehelms/pulpv2

Pulpv2 - Slew of glue layer tests, code cleanup.


  Commit: 1e758b2506a0067310dd63199ab08903752ec64e
      https://github.com/Katello/katello/commit/1e758b2506a0067310dd63199ab08903752ec64e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    A src/app/models/distribution.rb
    M src/app/models/glue/pulp/distribution.rb
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  pulpv2 - migrating distribution to new model


  Commit: db4e50a59688bdbbabf487f1c84f9df0767aadd8
      https://github.com/Katello/katello/commit/db4e50a59688bdbbabf487f1c84f9df0767aadd8
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M src/test/fixtures/models/providers.yml
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/repository_test.rb

  Log Message:
  -----------
  pulpv2 - fixing tests


  Commit: 13cac24e7745b80da6194736e65b7ac04ec61bfb
      https://github.com/Katello/katello/commit/13cac24e7745b80da6194736e65b7ac04ec61bfb
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/task_status.rb

  Log Message:
  -----------
  pulpv2 - consumer - updates profile, repo binding and actions

This commit contains chgs to use pulp v2 apis for:
- profile upload/retrieval
- package install/update/uninstall (from katello)
- package group install/uninstall (from katello)
- errata install (from katello)

Note: katello-agent will require updates for the last 3... those
changes are coming...


  Commit: ce78d6bb00134edaa076389b11fca0c84b8c6a27
      https://github.com/Katello/katello/commit/ce78d6bb00134edaa076389b11fca0c84b8c6a27
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M src/app/controllers/api/packages_controller.rb
    M src/app/models/deletion_changeset.rb
    M src/app/models/glue/candlepin/environment.rb
    M src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/pulp/distribution.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/ping.rb
    M src/app/models/pulp_sync_status.rb
    M src/app/models/repository.rb
    M src/app/models/system_template_distribution.rb
    M src/lib/resources/pulp.rb
    M src/lib/tasks/test.rake
    M src/script/reset-oauth
    R src/test/fixtures/environment_products.yml
    R src/test/fixtures/environments.yml
    R src/test/fixtures/filters.yml
    R src/test/fixtures/filters_repositories.yml
    R src/test/fixtures/gpg_keys.yml
    A src/test/fixtures/models/environment_products.yml
    A src/test/fixtures/models/environments.yml
    A src/test/fixtures/models/filters.yml
    A src/test/fixtures/models/filters_repositories.yml
    A src/test/fixtures/models/gpg_keys.yml
    A src/test/fixtures/models/organizations.yml
    A src/test/fixtures/models/permissions.yml
    A src/test/fixtures/models/products.yml
    A src/test/fixtures/models/providers.yml
    A src/test/fixtures/models/repositories.yml
    A src/test/fixtures/models/resource_types.yml
    A src/test/fixtures/models/roles.yml
    A src/test/fixtures/models/roles_users.yml
    A src/test/fixtures/models/users.yml
    R src/test/fixtures/organizations.yml
    R src/test/fixtures/permissions.yml
    R src/test/fixtures/products.yml
    R src/test/fixtures/providers.yml
    R src/test/fixtures/repositories.yml
    R src/test/fixtures/resource_types.yml
    R src/test/fixtures/roles.yml
    R src/test/fixtures/roles_users.yml
    R src/test/fixtures/users.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    A src/test/fixtures/vcr_cassettes/pulp_user.yml
    A src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    A src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    A src/test/fixtures/zoo5/.treeinfo
    A src/test/fixtures/zoo5/CHANGESET
    A src/test/fixtures/zoo5/PULP_MANIFEST
    A src/test/fixtures/zoo5/cheetah-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/create.sh
    A src/test/fixtures/zoo5/elephant-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/empty.iso
    A src/test/fixtures/zoo5/giraffe-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/images/test1.img
    A src/test/fixtures/zoo5/images/test2.img
    A src/test/fixtures/zoo5/lion-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/monkey-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/penguin-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/repodata/06661e2a9839cf0beebcf409410ca4f93c09081f4e772fd0d03e1faf62705a11-comps.xml
  A src/test/fixtures/zoo5/repodata/0c4d57a68f9a3b13dabc6f8b01ca8958aa796167cececee04717edfc26d02f2d-other.xml.gz
  A src/test/fixtures/zoo5/repodata/298ce23f48b3613e030d19f3d9c2ff2df31c2f08479bdf94cebb87c208e48c0e-filelists.xml.gz
  A src/test/fixtures/zoo5/repodata/32c0e38317aade0c057b173ff62344e912e1bd650409c6ac31aecee78e3413af-comps.xml.gz
  A src/test/fixtures/zoo5/repodata/34d954906c7ce7aa2254e24d7be0a9049e0a2f436add023ca056123a2d48e30e-updateinfo.xml.gz
  A src/test/fixtures/zoo5/repodata/63aedd074d9f0daf7c6be8c61f91d76a962bb6ceda86b9abd2140f154c320fa2-other.sqlite.bz2
  A src/test/fixtures/zoo5/repodata/69d65cdebffc6199d3adb3e38b06ca9abaae6c1c7366805099987b28f182178d-filelists.sqlite.bz2
  A src/test/fixtures/zoo5/repodata/799241a518a4a6b11a68f8e6fbdb719875f87832f60accc0851ced0d6a0497c6-updateinfo.xml.gz
  A src/test/fixtures/zoo5/repodata/a4ea9fcdce31dc8673c7a9ba66c086bd6a16e1eff717e3896dd1cac444a1423c-primary.xml.gz
  A src/test/fixtures/zoo5/repodata/fb9b9508e148368d0edf7e03dc905b343937fd958e6531cce6380933d18c3455-primary.sqlite.bz2
  A src/test/fixtures/zoo5/repodata/repomd.xml
    A src/test/fixtures/zoo5/squirrel-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/updateinfo.xml
    A src/test/fixtures/zoo5/walrus-0.3-0.8.noarch.rpm
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    R src/test/integration/fixtures/repositories/zoo5/.treeinfo
    R src/test/integration/fixtures/repositories/zoo5/CHANGESET
    R src/test/integration/fixtures/repositories/zoo5/PULP_MANIFEST
    R src/test/integration/fixtures/repositories/zoo5/cheetah-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/create.sh
    R src/test/integration/fixtures/repositories/zoo5/elephant-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/empty.iso
    R src/test/integration/fixtures/repositories/zoo5/giraffe-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/images/test1.img
    R src/test/integration/fixtures/repositories/zoo5/images/test2.img
    R src/test/integration/fixtures/repositories/zoo5/lion-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/monkey-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/penguin-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/repodata/06661e2a9839cf0beebcf409410ca4f93c09081f4e772fd0d03e1faf62705a11-comps.xml
  R src/test/integration/fixtures/repositories/zoo5/repodata/0c4d57a68f9a3b13dabc6f8b01ca8958aa796167cececee04717edfc26d02f2d-other.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/298ce23f48b3613e030d19f3d9c2ff2df31c2f08479bdf94cebb87c208e48c0e-filelists.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/32c0e38317aade0c057b173ff62344e912e1bd650409c6ac31aecee78e3413af-comps.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/34d954906c7ce7aa2254e24d7be0a9049e0a2f436add023ca056123a2d48e30e-updateinfo.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/63aedd074d9f0daf7c6be8c61f91d76a962bb6ceda86b9abd2140f154c320fa2-other.sqlite.bz2
  R src/test/integration/fixtures/repositories/zoo5/repodata/69d65cdebffc6199d3adb3e38b06ca9abaae6c1c7366805099987b28f182178d-filelists.sqlite.bz2
  R src/test/integration/fixtures/repositories/zoo5/repodata/799241a518a4a6b11a68f8e6fbdb719875f87832f60accc0851ced0d6a0497c6-updateinfo.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/a4ea9fcdce31dc8673c7a9ba66c086bd6a16e1eff717e3896dd1cac444a1423c-primary.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/fb9b9508e148368d0edf7e03dc905b343937fd958e6531cce6380933d18c3455-primary.sqlite.bz2
  R src/test/integration/fixtures/repositories/zoo5/repodata/repomd.xml
    R src/test/integration/fixtures/repositories/zoo5/squirrel-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/updateinfo.xml
    R src/test/integration/fixtures/repositories/zoo5/walrus-0.3-0.8.noarch.rpm
    M src/test/minitest_helper.rb
    M src/test/models/repository_test.rb
    R src/test/vcr_cassettes/glue_pulp_user.yml
    R src/test/vcr_cassettes/pulp_user.yml

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/pulpv2' into fork-pulpv2


  Commit: c6fd7fe11b2c9686f98c232c6ad757a44932f49b
      https://github.com/Katello/katello/commit/c6fd7fe11b2c9686f98c232c6ad757a44932f49b
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M src/app/controllers/system_packages_controller.rb

  Log Message:
  -----------
  pulpv2 - system packages - remove 'todo'


  Commit: 3eb36f32eb94fc912f7bf18171614b355b27b6e3
      https://github.com/Katello/katello/commit/3eb36f32eb94fc912f7bf18171614b355b27b6e3
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M src/app/models/glue/elastic_search/repository.rb
    M src/app/models/repository.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/repository_test.rb

  Log Message:
  -----------
  fixing broken minitests


  Commit: dd9c54d24edb98f77b2b51324cf2344d70efd8ac
      https://github.com/Katello/katello/commit/dd9c54d24edb98f77b2b51324cf2344d70efd8ac
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M src/app/models/user.rb
    R src/test/integration/fixtures/vcr_cassettes/pulp_consumer.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_consumer_group.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_consumer_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_distribution.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_errata.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_filter.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_filter_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_package.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_package_group.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_package_group_category.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_ping.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_repository.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_repository_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_repository_sync.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_roles.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_task.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_task_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_user.yml
    R src/test/integration/pulp/helpers/consumer_helper.rb
    R src/test/integration/pulp/helpers/filter_helper.rb
    R src/test/integration/pulp/helpers/repository_helper.rb
    R src/test/integration/pulp/pulp_consumer_group_test.rb
    R src/test/integration/pulp/pulp_consumer_test.rb
    R src/test/integration/pulp/pulp_distribution_test.rb
    R src/test/integration/pulp/pulp_errata_test.rb
    R src/test/integration/pulp/pulp_filter_test.rb
    R src/test/integration/pulp/pulp_package_group_category_test.rb
    R src/test/integration/pulp/pulp_package_group_test.rb
    R src/test/integration/pulp/pulp_package_test.rb
    R src/test/integration/pulp/pulp_ping_test.rb
    R src/test/integration/pulp/pulp_repository_test.rb
    R src/test/integration/pulp/pulp_roles_test.rb
    R src/test/integration/pulp/pulp_task_test.rb
    R src/test/integration/pulp/pulp_user_test.rb
    R src/test/integration/pulp/test_runner.rb
    R src/test/integration/pulp/vcr_pulp_setup.rb
    M src/test/minitest_helper.rb
    M src/test/models/authorization/repository_authorization_test.rb
    A src/test/models/repository_base.rb
    M src/test/models/repository_test.rb
    A src/test/models/user_base.rb
    M src/test/models/user_test.rb
    R src/test/unit/glue/pulp/user_test.rb
    R src/test/unit/user_test.rb

  Log Message:
  -----------
  Merge pull request #827 from ehelms/pulpv2

Pulpv2 - Test cleanup and re-factoring.


  Commit: c83220df881ff31b8572034a601a4968848734fb
      https://github.com/Katello/katello/commit/c83220df881ff31b8572034a601a4968848734fb
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M src/app/models/user.rb
    R src/test/integration/fixtures/vcr_cassettes/pulp_consumer.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_consumer_group.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_consumer_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_distribution.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_errata.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_filter.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_filter_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_package.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_package_group.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_package_group_category.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_ping.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_repository.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_repository_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_repository_sync.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_roles.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_task.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_task_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_user.yml
    R src/test/integration/pulp/helpers/consumer_helper.rb
    R src/test/integration/pulp/helpers/filter_helper.rb
    R src/test/integration/pulp/helpers/repository_helper.rb
    R src/test/integration/pulp/pulp_consumer_group_test.rb
    R src/test/integration/pulp/pulp_consumer_test.rb
    R src/test/integration/pulp/pulp_distribution_test.rb
    R src/test/integration/pulp/pulp_errata_test.rb
    R src/test/integration/pulp/pulp_filter_test.rb
    R src/test/integration/pulp/pulp_package_group_category_test.rb
    R src/test/integration/pulp/pulp_package_group_test.rb
    R src/test/integration/pulp/pulp_package_test.rb
    R src/test/integration/pulp/pulp_ping_test.rb
    R src/test/integration/pulp/pulp_repository_test.rb
    R src/test/integration/pulp/pulp_roles_test.rb
    R src/test/integration/pulp/pulp_task_test.rb
    R src/test/integration/pulp/pulp_user_test.rb
    R src/test/integration/pulp/test_runner.rb
    R src/test/integration/pulp/vcr_pulp_setup.rb
    M src/test/minitest_helper.rb
    M src/test/models/authorization/repository_authorization_test.rb
    A src/test/models/repository_base.rb
    M src/test/models/repository_test.rb
    A src/test/models/user_base.rb
    M src/test/models/user_test.rb
    R src/test/unit/glue/pulp/user_test.rb
    R src/test/unit/user_test.rb

  Log Message:
  -----------
  merge conflict


  Commit: 18723262d525b4fbf3e122b179a06d999ed26b1d
      https://github.com/Katello/katello/commit/18723262d525b4fbf3e122b179a06d999ed26b1d
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M src/test/fixtures/models/roles.yml
    M src/test/fixtures/models/users.yml
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  changing alfred to no_perms_user


  Commit: 6071b9381850ba734c89b84c6070177af2e4d4cf
      https://github.com/Katello/katello/commit/6071b9381850ba734c89b84c6070177af2e4d4cf
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M src/app/models/activation_key.rb
    A src/app/models/authorization/activation_key.rb
    A src/test/fixtures/models/activation_keys.yml
    A src/test/models/authorization/activation_key_authorization_test.rb
    M src/test/models/repository_test.rb
    M src/test/test_helper.rb

  Log Message:
  -----------
  pulpv2 - moving activation key auth to new file and testing


  Commit: edaa7648d9459873a35a7c9efc66e1324856733c
      https://github.com/Katello/katello/commit/edaa7648d9459873a35a7c9efc66e1324856733c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    A src/app/models/authorization/filter.rb
    M src/app/models/changeset.rb
    M src/app/models/filter.rb
    M src/test/models/authorization/activation_key_authorization_test.rb
    A src/test/models/authorization/filter_authorization_test.rb
    M src/test/models/authorization/repository_authorization_test.rb

  Log Message:
  -----------
  pulpv2 - splitting filter auth into its own file


  Commit: 9d2621d3d2d2004ecafcccf05fef4c7ef5432be1
      https://github.com/Katello/katello/commit/9d2621d3d2d2004ecafcccf05fef4c7ef5432be1
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    A src/app/models/authorization/gpg_key.rb
    M src/app/models/gpg_key.rb
    M src/test/models/authorization/activation_key_authorization_test.rb
    A src/test/models/authorization/gpg_key_authorization_test.rb

  Log Message:
  -----------
  spliting authentication for gpg keys


  Commit: f61fa5bec9cb67849dd569af862fd46d8ba14980
      https://github.com/Katello/katello/commit/f61fa5bec9cb67849dd569af862fd46d8ba14980
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M src/app/models/notice.rb

  Log Message:
  -----------
  removing auth from notice.rb which is not needed


  Commit: 67a25f56950ec558a911b450f7962f92fb876ee7
      https://github.com/Katello/katello/commit/67a25f56950ec558a911b450f7962f92fb876ee7
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    A src/app/models/authorization/organization.rb
    M src/app/models/organization.rb
    A src/test/models/authorization/organization_authorization_test.rb

  Log Message:
  -----------
  splitting out auth methods for organization


  Commit: e444fbc4706c07fe8e00874b6d62e309ad02d6ed
      https://github.com/Katello/katello/commit/e444fbc4706c07fe8e00874b6d62e309ad02d6ed
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    A src/app/models/authorization/product.rb
    M src/app/models/product.rb
    M src/app/models/provider.rb
    A src/test/models/authorization/product_authorization_test.rb

  Log Message:
  -----------
  splitting auth for products


  Commit: 97307e4bfaf5cbd3e5e91083839ae2f4404cccaa
      https://github.com/Katello/katello/commit/97307e4bfaf5cbd3e5e91083839ae2f4404cccaa
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M src/test/models/authorization/activation_key_authorization_test.rb
    M src/test/models/authorization/filter_authorization_test.rb
    M src/test/models/authorization/gpg_key_authorization_test.rb
    M src/test/models/authorization/organization_authorization_test.rb
    M src/test/models/authorization/product_authorization_test.rb

  Log Message:
  -----------
  fixing wrong requires


  Commit: de07c853654485d0d41754f637fd75398e567b42
      https://github.com/Katello/katello/commit/de07c853654485d0d41754f637fd75398e567b42
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M src/app/models/authorization/product.rb
    A src/app/models/authorization/provider.rb
    M src/app/models/provider.rb
    A src/test/models/authorization/provider_authorization_test.rb

  Log Message:
  -----------
  spliting off provider auth functions


  Commit: a37456691da84c6136de59b33e231bda27bd6f62
      https://github.com/Katello/katello/commit/a37456691da84c6136de59b33e231bda27bd6f62
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M src/test/models/authorization/activation_key_authorization_test.rb

  Log Message:
  -----------
  removing UserBaseTest requirement


  Commit: 1d6afd32696f4687256fb6a5ed03055e42e50aa7
      https://github.com/Katello/katello/commit/1d6afd32696f4687256fb6a5ed03055e42e50aa7
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    A src/app/models/authorization/environment.rb
    M src/app/models/kt_environment.rb
    A src/test/models/authorization/environment_authorization_test.rb

  Log Message:
  -----------
  splitting auth out of environment


  Commit: 54757af3d2f0db8b91b655d93c5d95eb51a2e073
      https://github.com/Katello/katello/commit/54757af3d2f0db8b91b655d93c5d95eb51a2e073
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    A src/app/models/authorization/role.rb
    M src/app/models/role.rb
    A src/test/models/authorization/role_authorization_test.rb

  Log Message:
  -----------
  splitting auth out of roles


  Commit: 9d39193bdb8a8c5ee5e4fef1cff89153ed2e9f16
      https://github.com/Katello/katello/commit/9d39193bdb8a8c5ee5e4fef1cff89153ed2e9f16
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    A src/app/models/authorization/system.rb
    M src/app/models/system.rb
    A src/test/fixtures/models/systems.yml
    A src/test/models/authorization/system_authorization_test.rb
    A src/test/models/system_base.rb

  Log Message:
  -----------
  splitting auth from systems


  Commit: a5a684b0066f5c70cc0ebce936d0cc5b36c3605c
      https://github.com/Katello/katello/commit/a5a684b0066f5c70cc0ebce936d0cc5b36c3605c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M src/test/models/system_base.rb

  Log Message:
  -----------
  fixing system base


  Commit: 3448ddff51d4509fa400a0088b38d5dd86848a38
      https://github.com/Katello/katello/commit/3448ddff51d4509fa400a0088b38d5dd86848a38
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M src/test/minitest_helper.rb

  Log Message:
  -----------
  fixing class reloading with underscore


  Commit: b0edc3e8de77028126300fafb8bee692e8986618
      https://github.com/Katello/katello/commit/b0edc3e8de77028126300fafb8bee692e8986618
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    A src/app/models/authorization/system_group.rb
    M src/app/models/system_group.rb
    A src/test/fixtures/models/system_groups.yml
    A src/test/fixtures/models/system_system_groups.yml
    M src/test/fixtures/models/systems.yml
    A src/test/models/authorization/system_group_authorization_test.rb

  Log Message:
  -----------
  splitting auth out of system groups


  Commit: 32558d8d05fd76784fde758875f31183a6328c42
      https://github.com/Katello/katello/commit/32558d8d05fd76784fde758875f31183a6328c42
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    A src/app/models/authorization/system_template.rb
    M src/app/models/system_template.rb
    A src/test/fixtures/models/system_templates.yml
    A src/test/models/authorization/system_template_authorization_test.rb

  Log Message:
  -----------
  splitting auth out of system templates


  Commit: 21d49262948d8f2770f890619e6277c3c3b50d6b
      https://github.com/Katello/katello/commit/21d49262948d8f2770f890619e6277c3c3b50d6b
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    A src/app/models/authorization/user.rb
    M src/app/models/user.rb
    A src/test/models/authorization/user_authorization_test.rb

  Log Message:
  -----------
  splitting out auth from user.rb


  Commit: b232ecd498b060fea4b4b92a9ef0113e50c7565a
      https://github.com/Katello/katello/commit/b232ecd498b060fea4b4b92a9ef0113e50c7565a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    R src/app/models/authorization.rb
    M src/app/models/changeset_dependency.rb
    M src/app/models/changeset_erratum.rb
    M src/app/models/changeset_package.rb
    M src/app/models/changeset_user.rb
    M src/app/models/environment_system_group.rb
    M src/app/models/filter_package.rb
    M src/app/models/job.rb
    M src/app/models/key_pool.rb
    M src/app/models/key_system_group.rb
    M src/app/models/login_credential.rb
    M src/app/models/permission_tag.rb
    M src/app/models/system_system_group.rb
    M src/app/models/system_template_package.rb
    M src/app/models/task_status.rb
    M src/app/models/user_notice.rb
    A src/app/models/virtual_tag.rb

  Log Message:
  -----------
  removing traces of old authorization module


  Commit: 88914162caa946cbcb9f8338159476358e8989c0
      https://github.com/Katello/katello/commit/88914162caa946cbcb9f8338159476358e8989c0
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-14 (Sun, 14 Oct 2012)

  Changed paths:
    A src/app/models/distribution.rb
    M src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/pulp/distribution.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/repository.rb
    M src/test/fixtures/models/providers.yml
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb

  Log Message:
  -----------
  Merge pull request #834 from jlsherrill/pulpv2

Pulpv2 - model test fixes


  Commit: 6b9211d5fff2a16667b8ad856aef3723ce93cd82
      https://github.com/Katello/katello/commit/6b9211d5fff2a16667b8ad856aef3723ce93cd82
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    A src/app/models/authorization/enforcement.rb
    M src/app/models/user.rb

  Log Message:
  -----------
  moving enforcement code out of user.rb


  Commit: 54241afb9c814fa69ad27fa96b84ef698f5e42ab
      https://github.com/Katello/katello/commit/54241afb9c814fa69ad27fa96b84ef698f5e42ab
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Log Message:
  -----------
  Merge branch 'pulpv2' of https://github.com/Katello/katello into pulpv2


  Commit: 3e6284bc0891542dd289fb08276831a92d5ed766
      https://github.com/Katello/katello/commit/3e6284bc0891542dd289fb08276831a92d5ed766
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    R src/spec/models/repo_spec.rb
    R src/spec/models/repository_spec.rb

  Log Message:
  -----------
  removing repo specs


  Commit: 6c16c8cf7648521a6dd7781e9148ae9bb27b3af1
      https://github.com/Katello/katello/commit/6c16c8cf7648521a6dd7781e9148ae9bb27b3af1
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M src/app/models/authorization/enforcement.rb

  Log Message:
  -----------
  adding missing license


  Commit: bef2bcd823e07ce15297d379705644eeca1667aa
      https://github.com/Katello/katello/commit/bef2bcd823e07ce15297d379705644eeca1667aa
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M src/spec/controllers/api/filters_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/helpers/repo_test_data.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb
    M src/spec/views/distributions/_filelist.html.haml_spec.rb
    M src/spec/views/distributions/_show.html.haml_spec.rb

  Log Message:
  -----------
  test fixes


  Commit: 1b83c1a24bfa31d65f9d0eb763b2ec0257e22825
      https://github.com/Katello/katello/commit/1b83c1a24bfa31d65f9d0eb763b2ec0257e22825
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M src/app/models/activation_key.rb
    R src/app/models/authorization.rb
    A src/app/models/authorization/activation_key.rb
    A src/app/models/authorization/enforcement.rb
    A src/app/models/authorization/environment.rb
    A src/app/models/authorization/filter.rb
    A src/app/models/authorization/gpg_key.rb
    A src/app/models/authorization/organization.rb
    A src/app/models/authorization/product.rb
    A src/app/models/authorization/provider.rb
    A src/app/models/authorization/role.rb
    A src/app/models/authorization/system.rb
    A src/app/models/authorization/system_group.rb
    A src/app/models/authorization/system_template.rb
    A src/app/models/authorization/user.rb
    M src/app/models/changeset.rb
    M src/app/models/changeset_dependency.rb
    M src/app/models/changeset_erratum.rb
    M src/app/models/changeset_package.rb
    M src/app/models/changeset_user.rb
    M src/app/models/environment_system_group.rb
    M src/app/models/filter.rb
    M src/app/models/filter_package.rb
    M src/app/models/gpg_key.rb
    M src/app/models/job.rb
    M src/app/models/key_pool.rb
    M src/app/models/key_system_group.rb
    M src/app/models/kt_environment.rb
    M src/app/models/login_credential.rb
    M src/app/models/notice.rb
    M src/app/models/organization.rb
    M src/app/models/permission_tag.rb
    M src/app/models/product.rb
    M src/app/models/provider.rb
    M src/app/models/role.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/system_system_group.rb
    M src/app/models/system_template.rb
    M src/app/models/system_template_package.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb
    M src/app/models/user_notice.rb
    A src/app/models/virtual_tag.rb
    R src/spec/models/repo_spec.rb
    R src/spec/models/repository_spec.rb
    A src/test/fixtures/models/activation_keys.yml
    M src/test/fixtures/models/roles.yml
    A src/test/fixtures/models/system_groups.yml
    A src/test/fixtures/models/system_system_groups.yml
    A src/test/fixtures/models/system_templates.yml
    A src/test/fixtures/models/systems.yml
    M src/test/fixtures/models/users.yml
    M src/test/minitest_helper.rb
    A src/test/models/authorization/activation_key_authorization_test.rb
    A src/test/models/authorization/environment_authorization_test.rb
    A src/test/models/authorization/filter_authorization_test.rb
    A src/test/models/authorization/gpg_key_authorization_test.rb
    A src/test/models/authorization/organization_authorization_test.rb
    A src/test/models/authorization/product_authorization_test.rb
    A src/test/models/authorization/provider_authorization_test.rb
    M src/test/models/authorization/repository_authorization_test.rb
    A src/test/models/authorization/role_authorization_test.rb
    A src/test/models/authorization/system_authorization_test.rb
    A src/test/models/authorization/system_group_authorization_test.rb
    A src/test/models/authorization/system_template_authorization_test.rb
    A src/test/models/authorization/user_authorization_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb
    A src/test/models/system_base.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb
    M src/test/test_helper.rb

  Log Message:
  -----------
  Merge pull request #851 from jlsherrill/pulpv2

Pulpv2 - splitting authorization out of models


  Commit: fd489f4470c783f044e0e32332d71b62fd68e9d2
      https://github.com/Katello/katello/commit/fd489f4470c783f044e0e32332d71b62fd68e9d2
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/task_status.rb

  Log Message:
  -----------
  Merge pull request #831 from bbuckingham/fork-pulpv2

pulpv2 - initial code for consumers


  Commit: a43f7e3cc943b8d90c3b4384b3570e12736cf870
      https://github.com/Katello/katello/commit/a43f7e3cc943b8d90c3b4384b3570e12736cf870
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M src/app/models/activation_key.rb
    M src/app/models/authorization/system.rb
    M src/app/models/changeset.rb
    M src/app/models/filter.rb
    A src/app/models/glue/elastic_search/activation_key.rb
    A src/app/models/glue/elastic_search/changeset.rb
    A src/app/models/glue/elastic_search/filter.rb
    A src/app/models/glue/elastic_search/gpg_key.rb
    R src/app/models/glue/elastic_search/indexed_model.rb
    A src/app/models/glue/elastic_search/job.rb
    A src/app/models/glue/elastic_search/notice.rb
    A src/app/models/glue/elastic_search/organization.rb
    A src/app/models/glue/elastic_search/pool.rb
    A src/app/models/glue/elastic_search/product.rb
    A src/app/models/glue/elastic_search/provider.rb
    M src/app/models/glue/elastic_search/repository.rb
    A src/app/models/glue/elastic_search/role.rb
    A src/app/models/glue/elastic_search/sync_plan.rb
    A src/app/models/glue/elastic_search/system.rb
    A src/app/models/glue/elastic_search/system_group.rb
    A src/app/models/glue/elastic_search/task_status.rb
    A src/app/models/glue/elastic_search/user.rb
    M src/app/models/gpg_key.rb
    M src/app/models/job.rb
    M src/app/models/notice.rb
    M src/app/models/organization.rb
    M src/app/models/pool.rb
    M src/app/models/product.rb
    M src/app/models/provider.rb
    M src/app/models/role.rb
    M src/app/models/sync_plan.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb

  Log Message:
  -----------
  splitting Elastic search code out of all models


  Commit: 96f3173b8f0c66e8c1fcd1dc2ffda065cf56c884
      https://github.com/Katello/katello/commit/96f3173b8f0c66e8c1fcd1dc2ffda065cf56c884
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M agent/katello-agent.spec
    M certs-tools/certs/checksum.py
    M certs-tools/certs/fileutils.py
    M certs-tools/certs/rhn_rpm.py
    M certs-tools/certs/timeLib.py
    M certs-tools/katello-certs-tools.spec
    M certs-tools/setup.py
    M cli/katello-cli.spec
    M cli/po/de.po
    M cli/po/es.po
    M cli/po/fr.po
    M cli/po/it.po
    M cli/po/ja.po
    M cli/po/ko.po
    M cli/po/pa.po
    M cli/po/pt.po
    M cli/po/ru.po
    M cli/po/ta.po
    M cli/po/te.po
    M cli/po/zh_CN.po
    M cli/po/zh_TW.po
    M cli/src/katello/client/api/base.py
    M cli/src/katello/client/api/utils.py
    M cli/src/katello/client/cli/base.py
    M cli/src/katello/client/constants.py
    M cli/src/katello/client/core/activation_key.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/provider.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/user_role.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/i18n.py
    M cli/src/katello/client/server.py
    M cli/src/katello/client/shell.py
    M cli/src/katello/client/utils/encoding.py
    M cli/src/katello/client/utils/printer.py
    M katello-configure/bin/katello-upgrade
    M katello-configure/katello-configure.spec
    M katello-configure/modules/candlepin/manifests/config.pp
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/manifests/params.pp
    M katello-configure/modules/postgres/manifests/config.pp
    M katello-configure/modules/postgres/manifests/createdb.pp
    M katello-configure/modules/postgres/manifests/createuser.pp
    M katello-configure/modules/postgres/manifests/dropdb.pp
    M katello-configure/modules/postgres/manifests/init.pp
    M katello-configure/modules/postgres/manifests/service.pp
    R katello-configure/modules/postgres/manifests/sqlexec.pp
    M katello-configure/modules/postgres/templates/pg_hba.conf.erb
    M katello-configure/upgrade-scripts/default/0004_migrate_katello_db.sh
    M katello-utils/katello-utils.spec
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/koji-missing-builds.py
    M rel-eng/packages/katello
    M rel-eng/packages/katello-agent
    M rel-eng/packages/katello-certs-tools
    M rel-eng/packages/katello-cli
    M rel-eng/packages/katello-cli-tests
    M rel-eng/packages/katello-configure
    M rel-eng/packages/katello-repos
    M repos/katello-candlepin.repo
    M repos/katello-foreman.repo
    M repos/katello-pulp.repo
    M repos/katello-repos.spec
    M repos/katello.repo
    M scripts/cli_generator/generate.py
    M scripts/cli_generator/templates/api.py
    M scripts/cli_generator/templates/command.py
    M scripts/katello_remove.sh
    M scripts/system-test/cli-system-test
    M scripts/system-test/cli_tests/system.sh
    M scripts/system-test/cli_tests/template.sh
    M scripts/system-test/katello-cli-tests.spec
    M scripts/test/katello-stack
    M selinux/katello-selinux/katello-selinux.spec
    M src/Gemfile
    M src/app/controllers/activation_keys_controller.rb
    M src/app/controllers/api/activation_keys_controller.rb
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/candlepin_proxies_controller.rb
    M src/app/controllers/api/changesets_content_controller.rb
    M src/app/controllers/api/changesets_controller.rb
    M src/app/controllers/api/custom_info_controller.rb
    M src/app/controllers/api/distributions_controller.rb
    M src/app/controllers/api/environments_controller.rb
    M src/app/controllers/api/errata_controller.rb
    M src/app/controllers/api/filters_controller.rb
    M src/app/controllers/api/gpg_keys_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/packages_controller.rb
    M src/app/controllers/api/permissions_controller.rb
    M src/app/controllers/api/products_controller.rb
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/proxies_controller.rb
    M src/app/controllers/api/pulp_proxies_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/roles_controller.rb
    M src/app/controllers/api/subscriptions_controller.rb
    M src/app/controllers/api/sync_controller.rb
    M src/app/controllers/api/sync_plans_controller.rb
    M src/app/controllers/api/system_group_errata_controller.rb
    M src/app/controllers/api/system_group_packages_controller.rb
    M src/app/controllers/api/system_groups_controller.rb
    M src/app/controllers/api/system_packages_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/templates_content_controller.rb
    M src/app/controllers/api/templates_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/changesets_controller.rb
    M src/app/controllers/environments_controller.rb
    M src/app/controllers/gpg_keys_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/subscriptions_controller.rb
    M src/app/controllers/sync_management_controller.rb
    M src/app/controllers/system_group_errata_controller.rb
    M src/app/controllers/system_group_packages_controller.rb
    M src/app/controllers/system_groups_controller.rb
    M src/app/controllers/systems_controller.rb
    M src/app/helpers/promotions_helper.rb
    M src/app/helpers/sync_management_helper.rb
    M src/app/helpers/sync_schedules_helper.rb
    M src/app/helpers/systems_helper.rb
    M src/app/models/activation_key.rb
    A src/app/models/candlepin/content.rb
    A src/app/models/candlepin/product_content.rb
    M src/app/models/deletion_changeset.rb
    M src/app/models/errors.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/glue/candlepin/content.rb
    M src/app/models/glue/candlepin/environment.rb
    M src/app/models/glue/candlepin/owner.rb
    M src/app/models/glue/candlepin/product.rb
    R src/app/models/glue/candlepin/product_content.rb
    M src/app/models/glue/elastic_search/errata.rb
    M src/app/models/glue/elastic_search/system.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/ping.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/provider.rb
    M src/app/models/repository.rb
    M src/app/models/role.rb
    M src/app/models/system.rb
    M src/app/models/system_system_group.rb
    M src/app/models/system_template_distribution.rb
    M src/app/models/system_template_pack_group.rb
    M src/app/models/system_template_package.rb
    M src/app/models/system_template_pg_category.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb
    M src/app/stylesheets/ie.scss
    M src/app/stylesheets/sections/content_search.scss
    M src/app/stylesheets/sections/contents.scss
    M src/app/stylesheets/sections/systems.scss
    M src/app/views/changesets/_new.html.haml
    M src/app/views/changesets/_warning.html.haml
    M src/app/views/common/400.html.haml
    M src/app/views/common/_footer.haml
    M src/app/views/common/_panel.html.haml
    M src/app/views/content_search/_browser_box.html.haml
    M src/app/views/content_search/_product_hover.html.haml
    M src/app/views/content_search/_repo_hover.html.haml
    M src/app/views/promotions/_detail.html.haml
    M src/app/views/promotions/show.html.haml
    M src/app/views/subscriptions/_edit.html.haml
    M src/app/views/subscriptions/_list_subscription_show.html.haml
    A src/app/views/sync_management/_controls.html.haml
    M src/app/views/sync_management/_product.html.haml
    A src/app/views/sync_management/_products.html.haml
    M src/app/views/sync_management/_repo.html.haml
    A src/app/views/sync_management/_sync_plans.html.haml
    M src/app/views/sync_management/index.html.haml
    A src/app/views/sync_management/manage.html.haml
    M src/app/views/user_mailer/logins.text.haml
    M src/config/database.yml
    M src/config/initializers/app_config.rb
    M src/config/routes.rb
    M src/db/migrate/20110304123436_create_permissions.rb
    M src/db/migrate/20110427180336_changeset_packages.rb
    M src/db/migrate/20110429140623_changeset_errata.rb
    M src/db/migrate/20110517193547_add_changeset_promotion_date.rb
    M src/db/migrate/20110602143210_add_changeset_status.rb
    M src/db/migrate/20110930150406_system_template_packages.rb
    M src/db/migrate/20111111141238_remove_repo_release.rb
    M src/db/migrate/20120822205849_create_custom_info.rb
    M src/db/migrate/20120911182916_add_labels_to_repository.rb
    M src/katello.spec
    M src/lib/navigation/administration.rb
    M src/lib/notifications/notifier.rb
    M src/lib/resources/candlepin.rb
    M src/lib/resources/pulp.rb
    A src/lib/util/data.rb
    M src/lib/util/threadsession.rb
    M src/locale/bn/app.po
    M src/locale/de/app.po
    M src/locale/es/app.po
    M src/locale/fr/app.po
    M src/locale/gu/app.po
    M src/locale/hi/app.po
    M src/locale/it/app.po
    M src/locale/ja/app.po
    M src/locale/kn/app.po
    M src/locale/ko/app.po
    M src/locale/mr/app.po
    M src/locale/or/app.po
    M src/locale/pa/app.po
    M src/locale/pt_BR/app.po
    M src/locale/ru/app.po
    M src/locale/ta/app.po
    M src/locale/te/app.po
    M src/locale/zh_CN/app.po
    M src/locale/zh_TW/app.po
    M src/public/javascripts/content_search.js
    M src/public/javascripts/katello.js
    M src/public/javascripts/notices.js
    M src/public/javascripts/promotion.js
    M src/public/javascripts/systems.js
    M src/public/javascripts/widgets/comparison_grid.js
    M src/public/javascripts/widgets/path_selector.js
    A src/script/check-gettext.rb
    M src/script/katello-reset-dbs
    M src/script/katello-service
    M src/spec/controllers/gpg_keys_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/sync_management_controller_spec.rb
    M src/spec/helpers/product_test_data.rb
    A src/spec/models/glue/candlepin/repository_orchestration_spec.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb
    A src/spec/models/repository_spec.rb
    M src/spec/spec_helper.rb

  Log Message:
  -----------
  merge conflict


  Commit: 34712a7a28146972dd390e51566e72c98b12ecf9
      https://github.com/Katello/katello/commit/34712a7a28146972dd390e51566e72c98b12ecf9
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M src/app/models/activation_key.rb
    M src/app/models/authorization/system.rb
    M src/app/models/changeset.rb
    M src/app/models/filter.rb
    A src/app/models/glue/elastic_search/activation_key.rb
    A src/app/models/glue/elastic_search/changeset.rb
    A src/app/models/glue/elastic_search/filter.rb
    A src/app/models/glue/elastic_search/gpg_key.rb
    R src/app/models/glue/elastic_search/indexed_model.rb
    A src/app/models/glue/elastic_search/job.rb
    A src/app/models/glue/elastic_search/notice.rb
    A src/app/models/glue/elastic_search/organization.rb
    A src/app/models/glue/elastic_search/pool.rb
    A src/app/models/glue/elastic_search/product.rb
    A src/app/models/glue/elastic_search/provider.rb
    M src/app/models/glue/elastic_search/repository.rb
    A src/app/models/glue/elastic_search/role.rb
    A src/app/models/glue/elastic_search/sync_plan.rb
    A src/app/models/glue/elastic_search/system.rb
    A src/app/models/glue/elastic_search/system_group.rb
    A src/app/models/glue/elastic_search/task_status.rb
    A src/app/models/glue/elastic_search/user.rb
    M src/app/models/gpg_key.rb
    M src/app/models/job.rb
    M src/app/models/notice.rb
    M src/app/models/organization.rb
    M src/app/models/pool.rb
    M src/app/models/product.rb
    M src/app/models/provider.rb
    M src/app/models/role.rb
    M src/app/models/sync_plan.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb
    M src/spec/controllers/api/filters_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/helpers/repo_test_data.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb
    M src/spec/views/distributions/_filelist.html.haml_spec.rb
    M src/spec/views/distributions/_show.html.haml_spec.rb

  Log Message:
  -----------
  Merge pull request #864 from jlsherrill/pulpv2

Pulpv2 - Splitting out of elastic search.


  Commit: 2c98b52a1095e5fd6ed44f38f9bb4052ee5f0120
      https://github.com/Katello/katello/commit/2c98b52a1095e5fd6ed44f38f9bb4052ee5f0120
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb

  Log Message:
  -----------
  Consumer changes to deal with update runcible code


  Commit: fe38c0358598840d6e5ccfefb4e98308756d4dca
      https://github.com/Katello/katello/commit/fe38c0358598840d6e5ccfefb4e98308756d4dca
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M src/app/models/glue/elastic_search/task_status.rb

  Log Message:
  -----------
  fixing bad class reference


  Commit: f9a9bbfbf58924f6f7a38601145290ce267ac659
      https://github.com/Katello/katello/commit/f9a9bbfbf58924f6f7a38601145290ce267ac659
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb
    M rel-eng/packages/katello
    M scripts/system-test/cli_tests/rhsm.sh
    M src/Gemfile
    M src/config/database.yml
    M src/katello.spec
    M src/public/javascripts/notices.js
    M src/script/check-gettext.rb

  Log Message:
  -----------
  merge conflict


  Commit: d87782e8b334e286917c39f3a0f55b28461c6b96
      https://github.com/Katello/katello/commit/d87782e8b334e286917c39f3a0f55b28461c6b96
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M src/test/minitest_helper.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  minitest fixes


  Commit: af4e55b8e825c4e96448c9677f6ce3d40c81c5df
      https://github.com/Katello/katello/commit/af4e55b8e825c4e96448c9677f6ce3d40c81c5df
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M src/app/models/glue/elastic_search/task_status.rb
    M src/test/minitest_helper.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Merge pull request #870 from jlsherrill/pulpv2

Pulpv2 - minitest fixes and Class reference issue


  Commit: f515089d0caf4565dfb4861694cebaa52ea1f72e
      https://github.com/Katello/katello/commit/f515089d0caf4565dfb4861694cebaa52ea1f72e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M src/test/minitest_helper.rb

  Log Message:
  -----------
  cache reloaded models to speed up tests


  Commit: dea55014bd186542e6ba03a33cc29f9c27e89abe
      https://github.com/Katello/katello/commit/dea55014bd186542e6ba03a33cc29f9c27e89abe
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M src/Gemfile
    A src/test/factories/environment_factory.rb
    A src/test/factories/environment_product_factory.rb
    A src/test/factories/organization_factory.rb
    A src/test/factories/product_factory.rb
    A src/test/factories/provider_factory.rb
    A src/test/factories/repository_factory.rb
    A src/test/factories/role_factory.rb
    A src/test/factories/user_factory.rb

  Log Message:
  -----------
  PulpV2 - Adds factory_girl to Gemfile and adds a base set of factories with traits.


  Commit: 7198bd1c6bd0006c68fce3d80e37f7704539e736
      https://github.com/Katello/katello/commit/7198bd1c6bd0006c68fce3d80e37f7704539e736
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M src/test/minitest_helper.rb

  Log Message:
  -----------
  PulpV2 - Adds ability to turn logging on for RestClient calls in glue layer.  Adds \
ability to run a single suite.


  Commit: 99f09d311f53c049a471c90f1523544b678758b1
      https://github.com/Katello/katello/commit/99f09d311f53c049a471c90f1523544b678758b1
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  PulpV2 - Cleans up models tests and adds usage of factories where appropriate.  \
Fixes up glue layer to use factories.


  Commit: 0dbc11e0a88f337b339eee2013597d1b3f7cda10
      https://github.com/Katello/katello/commit/0dbc11e0a88f337b339eee2013597d1b3f7cda10
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M src/app/models/glue/elastic_search/task_status.rb
    M src/test/minitest_helper.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Merge branch 'pulpv2' of github.com:Katello/katello into pulpv2


  Commit: 7baafecda54284b27d8b41e93825f3eda81341db
      https://github.com/Katello/katello/commit/7baafecda54284b27d8b41e93825f3eda81341db
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-22 (Mon, 22 Oct 2012)

  Changed paths:
    M src/Gemfile
    A src/test/factories/environment_factory.rb
    A src/test/factories/environment_product_factory.rb
    A src/test/factories/organization_factory.rb
    A src/test/factories/product_factory.rb
    A src/test/factories/provider_factory.rb
    A src/test/factories/repository_factory.rb
    A src/test/factories/role_factory.rb
    A src/test/factories/user_factory.rb
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Merge pull request #872 from ehelms/pulpv2

Pulpv2 - Adds fixes and clean-ups to tests and an initial set of factories.


  Commit: 5c8e5f77f736ce890191475bbd635df08252a20f
      https://github.com/Katello/katello/commit/5c8e5f77f736ce890191475bbd635df08252a20f
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-22 (Mon, 22 Oct 2012)

  Changed paths:
    M src/test/minitest_helper.rb

  Log Message:
  -----------
  renaming class variable to something more unique


  Commit: b1524bed82fab3e154d85b8692bbb1052b1891e6
      https://github.com/Katello/katello/commit/b1524bed82fab3e154d85b8692bbb1052b1891e6
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-22 (Mon, 22 Oct 2012)

  Changed paths:
    M src/app/models/system.rb

  Log Message:
  -----------
  fixing includes for glue layer


  Commit: 2ae0071a1fe1adb276effe7e65580c9a048573cc
      https://github.com/Katello/katello/commit/2ae0071a1fe1adb276effe7e65580c9a048573cc
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-22 (Mon, 22 Oct 2012)

  Changed paths:
    M src/test/fixtures/models/roles_users.yml
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  migrating user tests to minitest


  Commit: 7bde2ee720d2772620d42212c4a693ccefbed07b
      https://github.com/Katello/katello/commit/7bde2ee720d2772620d42212c4a693ccefbed07b
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-22 (Mon, 22 Oct 2012)

  Changed paths:
    R src/spec/models/user_spec.rb

  Log Message:
  -----------
  removing user spec


  Commit: 022a8fafb12e1a1cfb94bf7d4b4cb85f645e4fc5
      https://github.com/Katello/katello/commit/022a8fafb12e1a1cfb94bf7d4b4cb85f645e4fc5
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-22 (Mon, 22 Oct 2012)

  Changed paths:
    M src/Gemfile
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/task_status.rb
    M src/script/run_spec
    A src/test/factories/environment_factory.rb
    A src/test/factories/environment_product_factory.rb
    A src/test/factories/organization_factory.rb
    A src/test/factories/product_factory.rb
    A src/test/factories/provider_factory.rb
    A src/test/factories/repository_factory.rb
    A src/test/factories/role_factory.rb
    A src/test/factories/user_factory.rb
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  merge conflict fix


  Commit: 483ddd4d437538ef8b79c50439c856f6a8ac4a45
      https://github.com/Katello/katello/commit/483ddd4d437538ef8b79c50439c856f6a8ac4a45
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-22 (Mon, 22 Oct 2012)

  Changed paths:
    M src/test/models/user_test.rb

  Log Message:
  -----------
  fixing broken user tests


  Commit: a22d212a02eec899c67ee587d1e696432a725e7f
      https://github.com/Katello/katello/commit/a22d212a02eec899c67ee587d1e696432a725e7f
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-22 (Mon, 22 Oct 2012)

  Changed paths:
    M src/test/minitest_helper.rb

  Log Message:
  -----------
  do not run FactoryGirl.reload if not needed


  Commit: eff9d742c0ac15f98b0f51bac5c782ec2927fcbd
      https://github.com/Katello/katello/commit/eff9d742c0ac15f98b0f51bac5c782ec2927fcbd
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/lib/util/errata.rb
    M src/spec/controllers/api/custom_info_controller_spec.rb
    M src/spec/controllers/api/subscriptions_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/api/systems_packages_controller_spec.rb
    M src/spec/controllers/system_events_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb
    M src/spec/controllers/system_group_events_controller_spec.rb
    M src/spec/controllers/system_group_packages_controller_spec.rb
    M src/spec/helpers/system_helper_methods.rb
    M src/spec/models/activation_key_spec.rb
    M src/spec/models/custom_info_spec.rb
    M src/spec/models/system_spec.rb

  Log Message:
  -----------
  pulpv2 - fix existing rspecs, failing after updates to pulp v2


  Commit: 8f624ac435e94729ede3d03bc9d68555a147ac72
      https://github.com/Katello/katello/commit/8f624ac435e94729ede3d03bc9d68555a147ac72
  Author: David Davis <daviddavis@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/Gemfile

  Log Message:
  -----------
  Updating the factory_girl gem requirement


  Commit: 1a49d3be4264af9c54a8c9fdbfcb364d4f7e3f58
      https://github.com/Katello/katello/commit/1a49d3be4264af9c54a8c9fdbfcb364d4f7e3f58
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    A src/app/models/glue/elastic_search/environment.rb
    M src/app/models/kt_environment.rb

  Log Message:
  -----------
  splitting some missed environment elastic search code


  Commit: 3f7f85f82abad9a9f10ac75d46e84d2fcf7db3cb
      https://github.com/Katello/katello/commit/3f7f85f82abad9a9f10ac75d46e84d2fcf7db3cb
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/test/minitest_helper.rb

  Log Message:
  -----------
  backing up resource types similarly to our spec tests


  Commit: e6e4053c024210cd8d706c2669e20effec81d013
      https://github.com/Katello/katello/commit/e6e4053c024210cd8d706c2669e20effec81d013
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/test/fixtures/models/roles_users.yml

  Log Message:
  -----------
  giving the no_perms user his own role in fixtures


  Commit: 79578a9bea72a11190fd0e6c53de56be98759997
      https://github.com/Katello/katello/commit/79578a9bea72a11190fd0e6c53de56be98759997
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    A src/test/auth_helper.rb

  Log Message:
  -----------
  adding auth helper from spec tests


  Commit: 8becb99a20f3659fba70236299dcb150a6bdefd9
      https://github.com/Katello/katello/commit/8becb99a20f3659fba70236299dcb150a6bdefd9
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  adding new user spec test


  Commit: e52ce2dfbaf563616d0c9c0f5b1c86d205cd33e9
      https://github.com/Katello/katello/commit/e52ce2dfbaf563616d0c9c0f5b1c86d205cd33e9
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/lib/util/errata.rb
    M src/spec/controllers/api/custom_info_controller_spec.rb
    M src/spec/controllers/api/subscriptions_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/api/systems_packages_controller_spec.rb
    M src/spec/controllers/system_events_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb
    M src/spec/controllers/system_group_events_controller_spec.rb
    M src/spec/controllers/system_group_packages_controller_spec.rb
    M src/spec/helpers/system_helper_methods.rb
    M src/spec/models/activation_key_spec.rb
    M src/spec/models/custom_info_spec.rb
    M src/spec/models/system_spec.rb

  Log Message:
  -----------
  Merge pull request #899 from bbuckingham/fork-pulpv2-tests

pulpv2 - fix existing rspecs, failing after updates to pulp v2


  Commit: ae67615941a49ded0baa3a2ad05851f695181307
      https://github.com/Katello/katello/commit/ae67615941a49ded0baa3a2ad05851f695181307
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/lib/util/errata.rb
    M src/spec/controllers/api/custom_info_controller_spec.rb
    M src/spec/controllers/api/subscriptions_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/api/systems_packages_controller_spec.rb
    M src/spec/controllers/system_events_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb
    M src/spec/controllers/system_group_events_controller_spec.rb
    M src/spec/controllers/system_group_packages_controller_spec.rb
    M src/spec/helpers/system_helper_methods.rb
    M src/spec/models/activation_key_spec.rb
    M src/spec/models/custom_info_spec.rb
    M src/spec/models/system_spec.rb

  Log Message:
  -----------
  Merge branch 'pulpv2' of https://github.com/Katello/katello into pulpv2


  Commit: b44d3ef77e053c62621f4a557614c9e515c5f48b
      https://github.com/Katello/katello/commit/b44d3ef77e053c62621f4a557614c9e515c5f48b
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/script/run_spec

  Log Message:
  -----------
  fixing run_spec change


  Commit: 761f05693c761401601b0fd4079465e01703217e
      https://github.com/Katello/katello/commit/761f05693c761401601b0fd4079465e01703217e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    R src/test/auth_helper.rb
    M src/test/minitest_helper.rb
    M src/test/models/user_test.rb
    A src/test/support/auth_support.rb

  Log Message:
  -----------
  PR comment fixes


  Commit: d4d4bab39324343b096f4560a39d9740935c4ed9
      https://github.com/Katello/katello/commit/d4d4bab39324343b096f4560a39d9740935c4ed9
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/lib/tasks/test.rake
    M src/test/factories/environment_factory.rb
    M src/test/factories/environment_product_factory.rb
    M src/test/factories/organization_factory.rb
    M src/test/factories/product_factory.rb
    M src/test/factories/provider_factory.rb
    M src/test/factories/repository_factory.rb
    M src/test/fixtures/models/filters.yml
    M src/test/fixtures/models/repositories.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_distributions.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/package_test.rb
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb

  Log Message:
  -----------
  PulpV2 - Contains changes to get repository glue layer tests completely working in \
live and none modes.  Updates to test rakefile to allow running of all model/glue \
tests or each individually.


  Commit: e8e65e961a967817d93463dbc421f83af0de6fb8
      https://github.com/Katello/katello/commit/e8e65e961a967817d93463dbc421f83af0de6fb8
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/test/support/auth_support.rb

  Log Message:
  -----------
  removing uneeded auth methods


  Commit: 3097d57693cf1393d154cd29e4f34093323f1bb6
      https://github.com/Katello/katello/commit/3097d57693cf1393d154cd29e4f34093323f1bb6
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/test/models/authorization/user_authorization_test.rb
    M src/test/models/user_test.rb
    M src/test/support/auth_support.rb

  Log Message:
  -----------
  moving allowed_organizations to auth module for user

moving tests as well


  Commit: a0d03a1a4610f5b62c916e2292ac5f52e9c15400
      https://github.com/Katello/katello/commit/a0d03a1a4610f5b62c916e2292ac5f52e9c15400
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    A src/app/models/glue/elastic_search/environment.rb
    M src/app/models/kt_environment.rb
    M src/app/models/system.rb
    R src/spec/models/user_spec.rb
    M src/test/fixtures/models/roles_users.yml
    M src/test/minitest_helper.rb
    M src/test/models/authorization/user_authorization_test.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb
    A src/test/support/auth_support.rb

  Log Message:
  -----------
  Merge pull request #904 from jlsherrill/pulpv2

Pulpv2 - migrating all user model tests to minitest


  Commit: 2892e10c2d239da449454d2499c20013d3634cb9
      https://github.com/Katello/katello/commit/2892e10c2d239da449454d2499c20013d3634cb9
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/app/models/authorization/user.rb
    M src/app/models/user.rb

  Log Message:
  -----------
  moving auth method to auth user module


  Commit: d3c76990c6a2c9859197cc30533bf6b16c13484a
      https://github.com/Katello/katello/commit/d3c76990c6a2c9859197cc30533bf6b16c13484a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/app/models/glue/candlepin/environment.rb
    M src/app/models/support.rb
    M src/spec/models/distribution_spec.rb
    M src/spec/models/environment_spec.rb
    M src/spec/models/errata_spec.rb

  Log Message:
  -----------
  a few model spec fixes


  Commit: 18e49938eebf38f3cbed028a6a3bad2e3378e58f
      https://github.com/Katello/katello/commit/18e49938eebf38f3cbed028a6a3bad2e3378e58f
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/app/models/glue/elastic_search/environment.rb

  Log Message:
  -----------
  environment does not need indexed model


  Commit: 4bd152de43c2e4dce914d22ab44587b268e43c25
      https://github.com/Katello/katello/commit/4bd152de43c2e4dce914d22ab44587b268e43c25
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M src/Gemfile

  Log Message:
  -----------
  Merge pull request #902 from daviddavis/pulpv2

Updating the factory_girl gem requirement


  Commit: d10b0b6a238cfbf72500abb0bd56f59968957e0e
      https://github.com/Katello/katello/commit/d10b0b6a238cfbf72500abb0bd56f59968957e0e
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M src/app/models/system_template.rb
    M src/app/models/system_template_distribution.rb
    M src/spec/controllers/api/filters_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/controllers/distributions_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/packages_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/sync_management_controller_spec.rb
    M src/spec/controllers/system_packages_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/helpers/product_helper_methods.rb
    R src/spec/helpers/repo_helper_methods.rb
    M src/spec/helpers/repo_test_data.rb
    A src/spec/helpers/repository_helper_methods.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb
    M src/spec/spec_helper.rb

  Log Message:
  -----------
  pulpv2 - rspec, more fixes from migration


  Commit: 5edbe16b0a23a86c107c51264ac606ffcf5416dd
      https://github.com/Katello/katello/commit/5edbe16b0a23a86c107c51264ac606ffcf5416dd
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M src/app/models/system_template.rb
    M src/app/models/system_template_distribution.rb
    M src/spec/controllers/api/filters_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/controllers/distributions_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/packages_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/sync_management_controller_spec.rb
    M src/spec/controllers/system_packages_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/helpers/product_helper_methods.rb
    R src/spec/helpers/repo_helper_methods.rb
    M src/spec/helpers/repo_test_data.rb
    A src/spec/helpers/repository_helper_methods.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb
    M src/spec/spec_helper.rb

  Log Message:
  -----------
  Merge pull request #912 from bbuckingham/fork-pulpv2-tests

pulpv2 - rspec, more fixes from migration


  Commit: 46ec9d58f5589e96da7ec875bbc14aa7ea0ac33f
      https://github.com/Katello/katello/commit/46ec9d58f5589e96da7ec875bbc14aa7ea0ac33f
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M src/Gemfile
    M src/app/models/system_template.rb
    M src/app/models/system_template_distribution.rb
    M src/spec/controllers/api/filters_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/controllers/distributions_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/packages_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/sync_management_controller_spec.rb
    M src/spec/controllers/system_packages_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/helpers/product_helper_methods.rb
    R src/spec/helpers/repo_helper_methods.rb
    M src/spec/helpers/repo_test_data.rb
    A src/spec/helpers/repository_helper_methods.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb
    M src/spec/spec_helper.rb

  Log Message:
  -----------
  Merge branch 'pulpv2' of https://github.com/Katello/katello into pulpv2


  Commit: d84fbaa1f7a1f5f7f41a440129970221aba1a1ff
      https://github.com/Katello/katello/commit/d84fbaa1f7a1f5f7f41a440129970221aba1a1ff
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M src/app/models/authorization/user.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/indexed_model.rb
    M src/app/models/system_template_distribution.rb
    M src/app/models/system_template_pack_group.rb
    M src/spec/helpers/repo_test_data.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb

  Log Message:
  -----------
  more model spec fixes


  Commit: 8e8303a2ba7d4b9b47e7488dc478c75c5767634c
      https://github.com/Katello/katello/commit/8e8303a2ba7d4b9b47e7488dc478c75c5767634c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M src/app/models/system_template.rb

  Log Message:
  -----------
  use uri for tdl


  Commit: 0b7936125822c1faa9be27ffea89289c22127467
      https://github.com/Katello/katello/commit/0b7936125822c1faa9be27ffea89289c22127467
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M src/spec/models/changeset_spec.rb

  Log Message:
  -----------
  changeset spec fixes


  Commit: 925dc5b6ec50d32336b55795b1341094525b7c14
      https://github.com/Katello/katello/commit/925dc5b6ec50d32336b55795b1341094525b7c14
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/repo_test_data.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb

  Log Message:
  -----------
  fixing proivder and product specs


  Commit: b07ad89573c194c5d77a33d95756efd0b7cd16a4
      https://github.com/Katello/katello/commit/b07ad89573c194c5d77a33d95756efd0b7cd16a4
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb

  Log Message:
  -----------
  Merge pull request #866 from parthaa/consumer-new-pulp

Consumer changes to deal with update runcible code


  Commit: 93ce58ff7f53b35cad40dc62e72ceb790134c288
      https://github.com/Katello/katello/commit/93ce58ff7f53b35cad40dc62e72ceb790134c288
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/lib/tasks/test.rake
    M src/test/factories/environment_factory.rb
    M src/test/factories/environment_product_factory.rb
    M src/test/factories/organization_factory.rb
    M src/test/factories/product_factory.rb
    M src/test/factories/provider_factory.rb
    M src/test/factories/repository_factory.rb
    M src/test/fixtures/models/filters.yml
    M src/test/fixtures/models/repositories.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_distributions.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/package_test.rb
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb

  Log Message:
  -----------
  Merge pull request #905 from ehelms/pulpv2

PulpV2 - Contains changes to get repository glue layer tests completely ...


  Commit: 19e229940ef5462ab9fe34fbc1b8f4743d698984
      https://github.com/Katello/katello/commit/19e229940ef5462ab9fe34fbc1b8f4743d698984
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M src/app/models/pulp_task_status.rb
    M src/spec/helpers/product_test_data.rb
    M src/spec/models/permission_spec.rb
    M src/spec/models/pulp_task_status_spec.rb

  Log Message:
  -----------
  more spec model fixes


  Commit: 50578698b1e096d625728eb9b9698db395af7667
      https://github.com/Katello/katello/commit/50578698b1e096d625728eb9b9698db395af7667
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M src/spec/models/system_spec.rb

  Log Message:
  -----------
  fixing system model spec


  Commit: 3ecb1cb01cdfed58c48a3ea0e15ab44916e3691c
      https://github.com/Katello/katello/commit/3ecb1cb01cdfed58c48a3ea0e15ab44916e3691c
  Author: Jeff Ortel <jortel@redhat.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M agent/katello-agent.spec
    M agent/src/katello/agent/katelloplugin.py

  Log Message:
  -----------
  Refit agent for pulp v2.


  Commit: f28bf8037fe3e5d6beb660ade9b40cfca9fdc43b
      https://github.com/Katello/katello/commit/f28bf8037fe3e5d6beb660ade9b40cfca9fdc43b
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  better uri building


  Commit: ec7f8a976252cae99b19cfcc9601e796735e0a82
      https://github.com/Katello/katello/commit/ec7f8a976252cae99b19cfcc9601e796735e0a82
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/repo.rb
    M src/lib/tasks/test.rake
    M src/test/factories/environment_factory.rb
    M src/test/factories/environment_product_factory.rb
    M src/test/factories/organization_factory.rb
    M src/test/factories/product_factory.rb
    M src/test/factories/provider_factory.rb
    M src/test/factories/repository_factory.rb
    M src/test/fixtures/models/filters.yml
    M src/test/fixtures/models/repositories.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_distributions.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/package_test.rb
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb

  Log Message:
  -----------
  merge conflict


  Commit: 10d2b8f45c06321e06e8f42268536a6a7394c540
      https://github.com/Katello/katello/commit/10d2b8f45c06321e06e8f42268536a6a7394c540
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M src/app/models/glue/candlepin/environment.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/system_template_pack_group.rb

  Log Message:
  -----------
  fixing spacing


  Commit: 3e54f8da0b3bb52611e5fceb00124673fb2c4b61
      https://github.com/Katello/katello/commit/3e54f8da0b3bb52611e5fceb00124673fb2c4b61
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M src/Gemfile
    M src/app/models/authorization/user.rb
    A src/app/models/glue/elastic_search/environment.rb
    M src/app/models/glue/elastic_search/task_status.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/indexed_model.rb
    M src/app/models/kt_environment.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/support.rb
    M src/app/models/system.rb
    M src/app/models/system_template_distribution.rb
    M src/app/models/system_template_pack_group.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb
    M src/lib/tasks/test.rake
    M src/lib/util/errata.rb
    M src/spec/controllers/api/custom_info_controller_spec.rb
    M src/spec/controllers/api/filters_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/api/subscriptions_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/api/systems_packages_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/controllers/distributions_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/packages_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/sync_management_controller_spec.rb
    M src/spec/controllers/system_events_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb
    M src/spec/controllers/system_group_events_controller_spec.rb
    M src/spec/controllers/system_group_packages_controller_spec.rb
    M src/spec/controllers/system_packages_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/product_test_data.rb
    R src/spec/helpers/repo_helper_methods.rb
    M src/spec/helpers/repo_test_data.rb
    A src/spec/helpers/repository_helper_methods.rb
    M src/spec/helpers/system_helper_methods.rb
    M src/spec/models/activation_key_spec.rb
    M src/spec/models/changeset_spec.rb
    M src/spec/models/custom_info_spec.rb
    M src/spec/models/distribution_spec.rb
    M src/spec/models/environment_spec.rb
    M src/spec/models/errata_spec.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/permission_spec.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb
    M src/spec/models/pulp_task_status_spec.rb
    M src/spec/models/system_spec.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb
    R src/spec/models/user_spec.rb
    M src/spec/spec_helper.rb
    A src/test/factories/environment_factory.rb
    A src/test/factories/environment_product_factory.rb
    A src/test/factories/organization_factory.rb
    A src/test/factories/product_factory.rb
    A src/test/factories/provider_factory.rb
    A src/test/factories/repository_factory.rb
    A src/test/factories/role_factory.rb
    A src/test/factories/user_factory.rb
    M src/test/fixtures/models/filters.yml
    M src/test/fixtures/models/repositories.yml
    M src/test/fixtures/models/roles_users.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_distributions.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/package_test.rb
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/authorization/user_authorization_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb
    A src/test/support/auth_support.rb

  Log Message:
  -----------
  merge conflict


  Commit: e8eb4f90c7a5f03d99ab8a9b14c27cb3b4045b35
      https://github.com/Katello/katello/commit/e8eb4f90c7a5f03d99ab8a9b14c27cb3b4045b35
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M cli/katello-cli.spec
    A cli/src/katello/client/api/architecture.py
    A cli/src/katello/client/api/config_template.py
    M cli/src/katello/client/api/custom_info.py
    A cli/src/katello/client/api/domain.py
    A cli/src/katello/client/api/organization_system_info_keys.py
    M cli/src/katello/client/api/product.py
    M cli/src/katello/client/api/provider.py
    M cli/src/katello/client/api/utils.py
    M cli/src/katello/client/cli/base.py
    M cli/src/katello/client/constants.py
    A cli/src/katello/client/core/architecture.py
    M cli/src/katello/client/core/base.py
    M cli/src/katello/client/core/changeset.py
    A cli/src/katello/client/core/config_template.py
    M cli/src/katello/client/core/distribution.py
    A cli/src/katello/client/core/domain.py
    M cli/src/katello/client/core/errata.py
    M cli/src/katello/client/core/gpg_key.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/package.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/provider.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/system_custom_info.py
    M cli/src/katello/client/core/system_group.py
    M cli/src/katello/client/core/template.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/server.py
    M cli/src/katello/client/utils/printer.py
    M cli/test/katello/tests/core/action_test_utils.py
    A cli/test/katello/tests/core/architecture/__init__.py
    A cli/test/katello/tests/core/architecture/architecture_base_test.py
    A cli/test/katello/tests/core/architecture/architecture_create_test.py
    A cli/test/katello/tests/core/architecture/architecture_data.py
    A cli/test/katello/tests/core/architecture/architecture_delete_test.py
    A cli/test/katello/tests/core/architecture/architecture_info_test.py
    A cli/test/katello/tests/core/architecture/architecture_list_test.py
    A cli/test/katello/tests/core/architecture/architecture_update_test.py
    M cli/test/katello/tests/core/errata/errata_list_test.py
    M cli/test/katello/tests/core/organization/organization_data.py
    M cli/test/katello/tests/core/product/product_cancel_sync_test.py
    M cli/test/katello/tests/core/product/product_delete_test.py
    M cli/test/katello/tests/core/product/product_promote_test.py
    M cli/test/katello/tests/core/product/product_status_test.py
    M cli/test/katello/tests/core/product/product_sync_test.py
    M cli/test/katello/tests/core/repo/repo_add_remove_filter_test.py
    M cli/test/katello/tests/core/repo/repo_delete_test.py
    M cli/test/katello/tests/core/repo/repo_list_filters_test.py
    M cli/test/katello/tests/core/repo/repo_list_test.py
    M cli/test/katello/tests/core/repo/repo_status_test.py
    M cli/test/katello/tests/utils/utils_test.py
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/manifests/init.pp
    M katello-configure/modules/foreman/manifests/params.pp
    M katello-configure/modules/katello/manifests/init.pp
    M katello-configure/modules/katello/templates/etc/katello/katello.yml.erb
    M katello-configure/upgrade-scripts/default/0004_migrate_katello_db.sh
    A katello-configure/upgrade-scripts/upgrade/0002_create_foreman_users.rb
    M katello-utils/katello-utils.spec
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/packages/katello-cli
    M rel-eng/packages/katello-utils
    A rel-eng/push-packages-to-fedora.sh
    A scripts/devsetup
    M scripts/katello_remove.sh
    M scripts/run-tests.sh
    A scripts/system-test/cli_tests/architecture.sh
    A scripts/system-test/cli_tests/config_template.sh
    A scripts/system-test/cli_tests/domain.sh
    M src/Gemfile
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/changesets_content_controller.rb
    M src/app/controllers/api/custom_info_controller.rb
    A src/app/controllers/api/foreman/architectures_controller.rb
    A src/app/controllers/api/foreman/config_templates_controller.rb
    A src/app/controllers/api/foreman/domains_controller.rb
    A src/app/controllers/api/foreman/simple_crud_controller.rb
    A src/app/controllers/api/organization_system_info_keys_controller.rb
    M src/app/controllers/api/ping_controller.rb
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/proxies_controller.rb
    R src/app/controllers/api/puppetclasses_controller.rb
    M src/app/controllers/api/root_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/tasks_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/application_info_controller.rb
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/environments_controller.rb
    M src/app/controllers/subscriptions_controller.rb
    M src/app/controllers/system_errata_controller.rb
    M src/app/controllers/systems_controller.rb
    R src/app/helpers/api/puppetclasses_helper.rb
    M src/app/helpers/application_info_helper.rb
    M src/app/helpers/content_search_helper.rb
    R src/app/helpers/custom_info_helper.rb
    M src/app/helpers/filters_helper.rb
    M src/app/helpers/katello_form_builder.rb
    M src/app/helpers/layout_helper.rb
    R src/app/helpers/puppetclasses_helper.rb
    M src/app/helpers/subscriptions_helper.rb
    M src/app/models/custom_info.rb
    A src/app/models/foreman/architecture.rb
    A src/app/models/foreman/config_template.rb
    A src/app/models/foreman/domain.rb
    A src/app/models/foreman/user.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/glue/candlepin/owner.rb
    M src/app/models/glue/candlepin/pool.rb
    M src/app/models/glue/candlepin/product.rb
    M src/app/models/glue/elastic_search/pool.rb
    M src/app/models/glue/elastic_search/system.rb
    A src/app/models/glue/foreman/user.rb
    M src/app/models/glue/provider.rb
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/gpg_key.rb
    M src/app/models/indexed_model.rb
    M src/app/models/organization.rb
    M src/app/models/pool.rb
    M src/app/models/provider.rb
    R src/app/models/puppetclasses.rb
    M src/app/models/repository.rb
    M src/app/models/resource_type.rb
    M src/app/models/system.rb
    M src/app/models/system_template.rb
    M src/app/models/user.rb
    M src/app/models/username_validator.rb
    M src/app/stylesheets/sections/contents.scss
    M src/app/views/providers/redhat/_import_history.html.haml
    R src/app/views/puppetclasses/index.html.haml
    M src/app/views/subscriptions/_edit.html.haml
    M src/app/views/subscriptions/_history.html.haml
    M src/app/views/subscriptions/_history_items.html.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/systems/_edit.html.haml
    M src/app/views/systems/_subs.html.haml
    M src/config/application.rb
    M src/config/initializers/app_config.rb
    M src/config/initializers/warden.rb
    M src/config/katello.yml
    M src/config/routes.rb
    A src/db/migrate/20120808134658_add_foreman_id_to_user.rb
    A src/db/migrate/20120924211134_add_system_info_key_to_organizations.rb
    A src/db/migrate/20121010193516_custom_info_rework.rb
    M src/db/seeds.rb
    M src/katello.spec
    M src/lib/monkeys/fix_string_interpolate.rb
    M src/lib/profiling.rb
    A src/lib/resources/abstract_model.rb
    M src/lib/resources/cdn.rb
    M src/lib/resources/foreman.rb
    A src/lib/resources/foreman_model.rb
    M src/lib/string.rb
    M src/lib/tasks/hudson.rake
    M src/lib/util/cdn_var_substitutor.rb
    M src/lib/util/db_setup_check.rb
    M src/lib/util/model_util.rb
    M src/public/javascripts/content_search.js
    M src/public/javascripts/routes.js
    M src/public/javascripts/subscription.js
    M src/public/javascripts/system_groups.js
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/custom_info_controller_spec.rb
    A src/spec/controllers/api/organization_system_info_keys_controller_spec.rb
    M src/spec/controllers/api/organizations_controller_spec.rb
    A src/spec/controllers/api/ping_controller_spec.rb
    R src/spec/controllers/api/puppetclasses_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/system_group_packages_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/products_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/subscriptions_controller_data.rb
    M src/spec/controllers/subscriptions_controller_spec.rb
    M src/spec/controllers/sync_management_controller_spec.rb
    M src/spec/controllers/sync_plans_controller_spec.rb
    M src/spec/controllers/sync_schedules_controller_spec.rb
    M src/spec/controllers/system_groups_controller_spec.rb
    M src/spec/helpers/application_info_helper_spec.rb
    M src/spec/helpers/authorization_helper_methods.rb
    M src/spec/helpers/content_search_helper_spec.rb
    R src/spec/helpers/custom_info_helper_spec.rb
    M src/spec/helpers/filters_helper_spec.rb
    M src/spec/helpers/organization_helper_methods.rb
    M src/spec/helpers/product_helper_methods.rb
    R src/spec/helpers/puppetclasses_helper_spec.rb
    M src/spec/helpers/search_helper_methods.rb
    M src/spec/helpers/sync_plans_helper_spec.rb
    M src/spec/helpers/sync_schedules_helper_spec.rb
    M src/spec/helpers/system_helper_methods.rb
    M src/spec/helpers/system_test_data.rb
    M src/spec/helpers/user_helper_methods.rb
    M src/spec/lib/cdn_spec.rb
    M src/spec/lib/model_util_spec.rb
    A src/spec/lib/resources/foreman_model_spec.rb
    M src/spec/models/changeset_spec.rb
    M src/spec/models/custom_info_spec.rb
    A src/spec/models/glue/foreman/user_spec.rb
    M src/spec/models/hypervisor_spec.rb
    M src/spec/models/lazy_accessor_spec.rb
    M src/spec/models/ldap_group_role_spec.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/orchestration_spec.rb
    M src/spec/models/permission_spec.rb
    M src/spec/models/sync_plan_spec.rb
    M src/spec/models/system_spec.rb
    M src/spec/models/task_status_spec.rb
    M src/spec/spec_helper.rb
    M src/spec/support/custom_matchers.rb
    A src/spec/support/foreman_user_disablement.rb
    M src/spec/support/monkey_rspec_trac_creation_line_of_mocks.rb

  Log Message:
  -----------
  merge conflict


  Commit: 33e56588f4863aa637756e951c4fc56fbf7ffd1c
      https://github.com/Katello/katello/commit/33e56588f4863aa637756e951c4fc56fbf7ffd1c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb
    M src/spec/models/repository_spec.rb

  Log Message:
  -----------
  merge conflict and test fix


  Commit: 0cb5b7f87b22e24de31efef36e103aff7108351c
      https://github.com/Katello/katello/commit/0cb5b7f87b22e24de31efef36e103aff7108351c
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M src/app/models/authorization/user.rb
    M src/app/models/glue/elastic_search/environment.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/indexed_model.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/support.rb
    M src/app/models/system_template.rb
    M src/app/models/system_template_distribution.rb
    M src/app/models/system_template_pack_group.rb
    M src/app/models/user.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/product_test_data.rb
    M src/spec/helpers/repo_test_data.rb
    M src/spec/models/changeset_spec.rb
    M src/spec/models/distribution_spec.rb
    M src/spec/models/environment_spec.rb
    M src/spec/models/errata_spec.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/permission_spec.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb
    M src/spec/models/pulp_task_status_spec.rb
    M src/spec/models/system_spec.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb

  Log Message:
  -----------
  Merge pull request #922 from jlsherrill/pulpv2

Pulpv2 - fixing most (if not all) model spec tests


  Commit: dfedd627f70775fa08496870d13d0d9ac11a7bdb
      https://github.com/Katello/katello/commit/dfedd627f70775fa08496870d13d0d9ac11a7bdb
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M agent/katello-agent.spec
    M certs-tools/certs/checksum.py
    M certs-tools/certs/fileutils.py
    M certs-tools/certs/rhn_rpm.py
    M certs-tools/certs/timeLib.py
    M certs-tools/katello-certs-tools.spec
    M certs-tools/setup.py
    M cli/katello-cli.spec
    M cli/po/de.po
    M cli/po/es.po
    M cli/po/fr.po
    M cli/po/it.po
    M cli/po/ja.po
    M cli/po/ko.po
    M cli/po/pa.po
    M cli/po/pt.po
    M cli/po/ru.po
    M cli/po/ta.po
    M cli/po/te.po
    M cli/po/zh_CN.po
    M cli/po/zh_TW.po
    A cli/src/katello/client/api/architecture.py
    M cli/src/katello/client/api/base.py
    A cli/src/katello/client/api/config_template.py
    M cli/src/katello/client/api/custom_info.py
    A cli/src/katello/client/api/domain.py
    A cli/src/katello/client/api/organization_system_info_keys.py
    M cli/src/katello/client/api/product.py
    M cli/src/katello/client/api/provider.py
    M cli/src/katello/client/api/utils.py
    M cli/src/katello/client/cli/base.py
    M cli/src/katello/client/constants.py
    M cli/src/katello/client/core/activation_key.py
    A cli/src/katello/client/core/architecture.py
    M cli/src/katello/client/core/base.py
    M cli/src/katello/client/core/changeset.py
    A cli/src/katello/client/core/config_template.py
    M cli/src/katello/client/core/distribution.py
    A cli/src/katello/client/core/domain.py
    M cli/src/katello/client/core/errata.py
    M cli/src/katello/client/core/gpg_key.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/package.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/provider.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/system_custom_info.py
    M cli/src/katello/client/core/system_group.py
    M cli/src/katello/client/core/template.py
    M cli/src/katello/client/core/user_role.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/i18n.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/server.py
    M cli/src/katello/client/shell.py
    M cli/src/katello/client/utils/encoding.py
    M cli/src/katello/client/utils/printer.py
    M cli/test/katello/tests/core/action_test_utils.py
    A cli/test/katello/tests/core/architecture/__init__.py
    A cli/test/katello/tests/core/architecture/architecture_base_test.py
    A cli/test/katello/tests/core/architecture/architecture_create_test.py
    A cli/test/katello/tests/core/architecture/architecture_data.py
    A cli/test/katello/tests/core/architecture/architecture_delete_test.py
    A cli/test/katello/tests/core/architecture/architecture_info_test.py
    A cli/test/katello/tests/core/architecture/architecture_list_test.py
    A cli/test/katello/tests/core/architecture/architecture_update_test.py
    M cli/test/katello/tests/core/errata/errata_list_test.py
    M cli/test/katello/tests/core/organization/organization_data.py
    M cli/test/katello/tests/core/product/product_cancel_sync_test.py
    M cli/test/katello/tests/core/product/product_delete_test.py
    M cli/test/katello/tests/core/product/product_promote_test.py
    M cli/test/katello/tests/core/product/product_status_test.py
    M cli/test/katello/tests/core/product/product_sync_test.py
    M cli/test/katello/tests/core/repo/repo_add_remove_filter_test.py
    M cli/test/katello/tests/core/repo/repo_delete_test.py
    M cli/test/katello/tests/core/repo/repo_list_filters_test.py
    M cli/test/katello/tests/core/repo/repo_list_test.py
    M cli/test/katello/tests/core/repo/repo_status_test.py
    M cli/test/katello/tests/utils/utils_test.py
    M katello-configure/bin/katello-upgrade
    M katello-configure/katello-configure.spec
    M katello-configure/modules/candlepin/manifests/config.pp
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/manifests/init.pp
    M katello-configure/modules/foreman/manifests/params.pp
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/manifests/init.pp
    M katello-configure/modules/katello/manifests/params.pp
    M katello-configure/modules/katello/templates/etc/katello/katello.yml.erb
    M katello-configure/modules/postgres/manifests/config.pp
    M katello-configure/modules/postgres/manifests/createdb.pp
    M katello-configure/modules/postgres/manifests/createuser.pp
    M katello-configure/modules/postgres/manifests/dropdb.pp
    M katello-configure/modules/postgres/manifests/init.pp
    M katello-configure/modules/postgres/manifests/service.pp
    R katello-configure/modules/postgres/manifests/sqlexec.pp
    M katello-configure/modules/postgres/templates/pg_hba.conf.erb
    M katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb
    M katello-configure/upgrade-scripts/default/0004_migrate_katello_db.sh
    A katello-configure/upgrade-scripts/upgrade/0002_create_foreman_users.rb
    M katello-utils/katello-utils.spec
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/koji-missing-builds.py
    M rel-eng/packages/katello
    M rel-eng/packages/katello-agent
    M rel-eng/packages/katello-certs-tools
    M rel-eng/packages/katello-cli
    M rel-eng/packages/katello-cli-tests
    M rel-eng/packages/katello-configure
    M rel-eng/packages/katello-repos
    M rel-eng/packages/katello-utils
    A rel-eng/push-packages-to-fedora.sh
    M repos/katello-candlepin.repo
    M repos/katello-foreman.repo
    M repos/katello-pulp.repo
    M repos/katello-repos.spec
    M repos/katello.repo
    M scripts/cli_generator/generate.py
    M scripts/cli_generator/templates/api.py
    M scripts/cli_generator/templates/command.py
    A scripts/devsetup
    M scripts/katello_remove.sh
    M scripts/run-tests.sh
    M scripts/system-test/cli-system-test
    A scripts/system-test/cli_tests/architecture.sh
    A scripts/system-test/cli_tests/config_template.sh
    A scripts/system-test/cli_tests/domain.sh
    M scripts/system-test/cli_tests/rhsm.sh
    M scripts/system-test/cli_tests/system.sh
    M scripts/system-test/cli_tests/template.sh
    M scripts/system-test/katello-cli-tests.spec
    M scripts/test/katello-stack
    M selinux/katello-selinux/katello-selinux.spec
    M src/Gemfile
    M src/app/controllers/activation_keys_controller.rb
    M src/app/controllers/api/activation_keys_controller.rb
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/candlepin_proxies_controller.rb
    M src/app/controllers/api/changesets_content_controller.rb
    M src/app/controllers/api/changesets_controller.rb
    M src/app/controllers/api/custom_info_controller.rb
    M src/app/controllers/api/distributions_controller.rb
    M src/app/controllers/api/environments_controller.rb
    M src/app/controllers/api/errata_controller.rb
    M src/app/controllers/api/filters_controller.rb
    A src/app/controllers/api/foreman/architectures_controller.rb
    A src/app/controllers/api/foreman/config_templates_controller.rb
    A src/app/controllers/api/foreman/domains_controller.rb
    A src/app/controllers/api/foreman/simple_crud_controller.rb
    M src/app/controllers/api/gpg_keys_controller.rb
    A src/app/controllers/api/organization_system_info_keys_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/packages_controller.rb
    M src/app/controllers/api/permissions_controller.rb
    M src/app/controllers/api/ping_controller.rb
    M src/app/controllers/api/products_controller.rb
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/proxies_controller.rb
    M src/app/controllers/api/pulp_proxies_controller.rb
    R src/app/controllers/api/puppetclasses_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/roles_controller.rb
    M src/app/controllers/api/root_controller.rb
    M src/app/controllers/api/subscriptions_controller.rb
    M src/app/controllers/api/sync_controller.rb
    M src/app/controllers/api/sync_plans_controller.rb
    M src/app/controllers/api/system_group_errata_controller.rb
    M src/app/controllers/api/system_group_packages_controller.rb
    M src/app/controllers/api/system_groups_controller.rb
    M src/app/controllers/api/system_packages_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/tasks_controller.rb
    M src/app/controllers/api/templates_content_controller.rb
    M src/app/controllers/api/templates_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/application_info_controller.rb
    M src/app/controllers/changesets_controller.rb
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/environments_controller.rb
    M src/app/controllers/gpg_keys_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/subscriptions_controller.rb
    M src/app/controllers/sync_management_controller.rb
    M src/app/controllers/system_errata_controller.rb
    M src/app/controllers/system_group_errata_controller.rb
    M src/app/controllers/system_group_packages_controller.rb
    M src/app/controllers/system_groups_controller.rb
    M src/app/controllers/systems_controller.rb
    R src/app/helpers/api/puppetclasses_helper.rb
    M src/app/helpers/application_info_helper.rb
    M src/app/helpers/content_search_helper.rb
    R src/app/helpers/custom_info_helper.rb
    M src/app/helpers/filters_helper.rb
    M src/app/helpers/katello_form_builder.rb
    M src/app/helpers/layout_helper.rb
    M src/app/helpers/promotions_helper.rb
    R src/app/helpers/puppetclasses_helper.rb
    M src/app/helpers/subscriptions_helper.rb
    M src/app/helpers/sync_management_helper.rb
    M src/app/helpers/sync_schedules_helper.rb
    M src/app/helpers/systems_helper.rb
    M src/app/models/activation_key.rb
    A src/app/models/candlepin/content.rb
    A src/app/models/candlepin/product_content.rb
    M src/app/models/custom_info.rb
    M src/app/models/deletion_changeset.rb
    M src/app/models/errors.rb
    A src/app/models/foreman/architecture.rb
    A src/app/models/foreman/config_template.rb
    A src/app/models/foreman/domain.rb
    A src/app/models/foreman/user.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/glue/candlepin/content.rb
    M src/app/models/glue/candlepin/environment.rb
    M src/app/models/glue/candlepin/owner.rb
    M src/app/models/glue/candlepin/pool.rb
    M src/app/models/glue/candlepin/product.rb
    R src/app/models/glue/candlepin/product_content.rb
    M src/app/models/glue/elastic_search/errata.rb
    M src/app/models/glue/elastic_search/pool.rb
    M src/app/models/glue/elastic_search/system.rb
    A src/app/models/glue/foreman/user.rb
    M src/app/models/glue/provider.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/gpg_key.rb
    M src/app/models/indexed_model.rb
    M src/app/models/organization.rb
    M src/app/models/ping.rb
    M src/app/models/pool.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/provider.rb
    R src/app/models/puppetclasses.rb
    M src/app/models/repository.rb
    M src/app/models/resource_type.rb
    M src/app/models/role.rb
    M src/app/models/system.rb
    M src/app/models/system_system_group.rb
    M src/app/models/system_template.rb
    M src/app/models/system_template_distribution.rb
    M src/app/models/system_template_pack_group.rb
    M src/app/models/system_template_package.rb
    M src/app/models/system_template_pg_category.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb
    M src/app/models/username_validator.rb
    M src/app/stylesheets/ie.scss
    M src/app/stylesheets/sections/content_search.scss
    M src/app/stylesheets/sections/contents.scss
    M src/app/stylesheets/sections/systems.scss
    M src/app/views/changesets/_new.html.haml
    M src/app/views/changesets/_warning.html.haml
    M src/app/views/common/400.html.haml
    M src/app/views/common/_footer.haml
    M src/app/views/common/_panel.html.haml
    M src/app/views/content_search/_browser_box.html.haml
    M src/app/views/content_search/_product_hover.html.haml
    M src/app/views/content_search/_repo_hover.html.haml
    M src/app/views/promotions/_detail.html.haml
    M src/app/views/promotions/show.html.haml
    M src/app/views/providers/redhat/_import_history.html.haml
    R src/app/views/puppetclasses/index.html.haml
    M src/app/views/subscriptions/_edit.html.haml
    M src/app/views/subscriptions/_history.html.haml
    M src/app/views/subscriptions/_history_items.html.haml
    M src/app/views/subscriptions/_list_subscription_show.html.haml
    M src/app/views/subscriptions/_new.html.haml
    A src/app/views/sync_management/_controls.html.haml
    M src/app/views/sync_management/_product.html.haml
    A src/app/views/sync_management/_products.html.haml
    M src/app/views/sync_management/_repo.html.haml
    A src/app/views/sync_management/_sync_plans.html.haml
    M src/app/views/sync_management/index.html.haml
    A src/app/views/sync_management/manage.html.haml
    M src/app/views/systems/_edit.html.haml
    M src/app/views/systems/_subs.html.haml
    M src/app/views/user_mailer/logins.text.haml
    M src/config/application.rb
    M src/config/database.yml
    M src/config/initializers/app_config.rb
    M src/config/initializers/warden.rb
    M src/config/katello.yml
    M src/config/routes.rb
    M src/db/migrate/20110304123436_create_permissions.rb
    M src/db/migrate/20110427180336_changeset_packages.rb
    M src/db/migrate/20110429140623_changeset_errata.rb
    M src/db/migrate/20110517193547_add_changeset_promotion_date.rb
    M src/db/migrate/20110602143210_add_changeset_status.rb
    M src/db/migrate/20110930150406_system_template_packages.rb
    M src/db/migrate/20111111141238_remove_repo_release.rb
    A src/db/migrate/20120808134658_add_foreman_id_to_user.rb
    M src/db/migrate/20120822205849_create_custom_info.rb
    M src/db/migrate/20120911182916_add_labels_to_repository.rb
    A src/db/migrate/20120924211134_add_system_info_key_to_organizations.rb
    A src/db/migrate/20121010193516_custom_info_rework.rb
    M src/db/seeds.rb
    M src/katello.spec
    M src/lib/monkeys/fix_string_interpolate.rb
    M src/lib/navigation/administration.rb
    M src/lib/notifications/notifier.rb
    M src/lib/profiling.rb
    A src/lib/resources/abstract_model.rb
    M src/lib/resources/candlepin.rb
    M src/lib/resources/cdn.rb
    M src/lib/resources/foreman.rb
    A src/lib/resources/foreman_model.rb
    M src/lib/resources/pulp.rb
    M src/lib/string.rb
    M src/lib/tasks/hudson.rake
    M src/lib/util/cdn_var_substitutor.rb
    A src/lib/util/data.rb
    M src/lib/util/db_setup_check.rb
    M src/lib/util/model_util.rb
    M src/lib/util/threadsession.rb
    M src/locale/bn/app.po
    M src/locale/de/app.po
    M src/locale/es/app.po
    M src/locale/fr/app.po
    M src/locale/gu/app.po
    M src/locale/hi/app.po
    M src/locale/it/app.po
    M src/locale/ja/app.po
    M src/locale/kn/app.po
    M src/locale/ko/app.po
    M src/locale/mr/app.po
    M src/locale/or/app.po
    M src/locale/pa/app.po
    M src/locale/pt_BR/app.po
    M src/locale/ru/app.po
    M src/locale/ta/app.po
    M src/locale/te/app.po
    M src/locale/zh_CN/app.po
    M src/locale/zh_TW/app.po
    M src/public/javascripts/content_search.js
    M src/public/javascripts/katello.js
    M src/public/javascripts/notices.js
    M src/public/javascripts/promotion.js
    M src/public/javascripts/routes.js
    M src/public/javascripts/subscription.js
    M src/public/javascripts/system_groups.js
    M src/public/javascripts/systems.js
    M src/public/javascripts/widgets/comparison_grid.js
    M src/public/javascripts/widgets/path_selector.js
    A src/script/check-gettext.rb
    M src/script/katello-reset-dbs
    M src/script/katello-service
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/custom_info_controller_spec.rb
    A src/spec/controllers/api/organization_system_info_keys_controller_spec.rb
    M src/spec/controllers/api/organizations_controller_spec.rb
    A src/spec/controllers/api/ping_controller_spec.rb
    R src/spec/controllers/api/puppetclasses_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/system_group_packages_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/gpg_keys_controller_spec.rb
    M src/spec/controllers/products_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/subscriptions_controller_data.rb
    M src/spec/controllers/subscriptions_controller_spec.rb
    M src/spec/controllers/sync_management_controller_spec.rb
    M src/spec/controllers/sync_plans_controller_spec.rb
    M src/spec/controllers/sync_schedules_controller_spec.rb
    M src/spec/controllers/system_groups_controller_spec.rb
    M src/spec/helpers/application_info_helper_spec.rb
    M src/spec/helpers/authorization_helper_methods.rb
    M src/spec/helpers/content_search_helper_spec.rb
    R src/spec/helpers/custom_info_helper_spec.rb
    M src/spec/helpers/filters_helper_spec.rb
    M src/spec/helpers/organization_helper_methods.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/product_test_data.rb
    R src/spec/helpers/puppetclasses_helper_spec.rb
    M src/spec/helpers/search_helper_methods.rb
    M src/spec/helpers/sync_plans_helper_spec.rb
    M src/spec/helpers/sync_schedules_helper_spec.rb
    M src/spec/helpers/system_helper_methods.rb
    M src/spec/helpers/system_test_data.rb
    M src/spec/helpers/user_helper_methods.rb
    M src/spec/lib/cdn_spec.rb
    M src/spec/lib/model_util_spec.rb
    A src/spec/lib/resources/foreman_model_spec.rb
    M src/spec/models/changeset_spec.rb
    M src/spec/models/custom_info_spec.rb
    A src/spec/models/glue/candlepin/repository_orchestration_spec.rb
    A src/spec/models/glue/foreman/user_spec.rb
    M src/spec/models/hypervisor_spec.rb
    M src/spec/models/lazy_accessor_spec.rb
    M src/spec/models/ldap_group_role_spec.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/orchestration_spec.rb
    M src/spec/models/permission_spec.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb
    A src/spec/models/repository_spec.rb
    M src/spec/models/sync_plan_spec.rb
    M src/spec/models/system_spec.rb
    M src/spec/models/task_status_spec.rb
    M src/spec/spec_helper.rb
    M src/spec/support/custom_matchers.rb
    A src/spec/support/foreman_user_disablement.rb
    M src/spec/support/monkey_rspec_trac_creation_line_of_mocks.rb

  Log Message:
  -----------
  Merge pull request #926 from jlsherrill/pulpv2-merge

Pulpv2 - merging in master


  Commit: 931c8988d660e4d657201a346c77ddb26919ad9e
      https://github.com/Katello/katello/commit/931c8988d660e4d657201a346c77ddb26919ad9e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M src/spec/controllers/changeset_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/repository_helper_methods.rb

  Log Message:
  -----------
  fixing changeset, promotions, & changeset controllers


  Commit: bf3228921016f07e5006bacd25753998592687b4
      https://github.com/Katello/katello/commit/bf3228921016f07e5006bacd25753998592687b4
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Log Message:
  -----------
  Merge branch 'pulpv2' of https://github.com/Katello/katello into pulpv2-merge


  Commit: e9d816689498dcfc52fa0aabc51a157778a710bd
      https://github.com/Katello/katello/commit/e9d816689498dcfc52fa0aabc51a157778a710bd
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/repository.rb
    R src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_distributions.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    R src/test/fixtures/vcr_cassettes/pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/repository_base.rb
    M src/test/models/user_base.rb

  Log Message:
  -----------
  PulpV2 - Fixing tests to work the current pulp testing release and issues with \
cassette matching.


  Commit: 10b0f8abeb40d255cdb82e4b41e7f4dc47dd9397
      https://github.com/Katello/katello/commit/10b0f8abeb40d255cdb82e4b41e7f4dc47dd9397
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

  Changed paths:
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/sync_controller_spec.rb

  Log Message:
  -----------
  pulpv2 - rspec, more controller fixes from migration


  Commit: 7121ade9127718a593bf16fb220f419a1382b1f2
      https://github.com/Katello/katello/commit/7121ade9127718a593bf16fb220f419a1382b1f2
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

  Changed paths:
    M src/spec/controllers/changeset_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/repository_helper_methods.rb

  Log Message:
  -----------
  Merge pull request #927 from jlsherrill/pulpv2

Pulpv2 - fixing some controller spec tests


  Commit: 6c471c7638e67d2d2de4d5ae29648ccdb48b69b2
      https://github.com/Katello/katello/commit/6c471c7638e67d2d2de4d5ae29648ccdb48b69b2
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

  Changed paths:
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/sync_controller_spec.rb

  Log Message:
  -----------
  Merge pull request #930 from bbuckingham/fork-pulpv2-tests

pulpv2 - rspec, more controller fixes from migration


  Commit: 63552ffaf4ed7418fb66742f6ce6fa6927e353d3
      https://github.com/Katello/katello/commit/63552ffaf4ed7418fb66742f6ce6fa6927e353d3
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

  Changed paths:
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/sync_controller_spec.rb
    M src/spec/controllers/changeset_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/repository_helper_methods.rb

  Log Message:
  -----------
  Merge branch 'pulpv2' of github.com:Katello/katello into pulpv2


  Commit: 4a7b3295d741b97ecbfc8d49987c6c909b96a38e
      https://github.com/Katello/katello/commit/4a7b3295d741b97ecbfc8d49987c6c909b96a38e
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/repository.rb
    R src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_distributions.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    R src/test/fixtures/vcr_cassettes/pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/repository_base.rb
    M src/test/models/user_base.rb

  Log Message:
  -----------
  Merge pull request #935 from ehelms/pulpv2

Pulpv2 - Updates to fix broken tests.


  Commit: cb6067f731f15fa072583e3c92b2d397a9539f71
      https://github.com/Katello/katello/commit/cb6067f731f15fa072583e3c92b2d397a9539f71
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb
    M src/spec/controllers/api/organization_system_info_keys_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/helpers/system_helper_methods.rb

  Log Message:
  -----------
  pulpv2 - more rspec controller fixes


  Commit: 499478a4fbd9ea35a4ad82daf700ad01b583b21e
      https://github.com/Katello/katello/commit/499478a4fbd9ea35a4ad82daf700ad01b583b21e
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb
    M src/spec/controllers/api/organization_system_info_keys_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/helpers/system_helper_methods.rb

  Log Message:
  -----------
  Merge pull request #944 from bbuckingham/fork-pulpv2-tests

pulpv2 - more rspec controller fixes


  Commit: 927fa167629101bffb5074e31c387a2dae2976ff
      https://github.com/Katello/katello/commit/927fa167629101bffb5074e31c387a2dae2976ff
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repos.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/models/model_spec_helper.rb

  Log Message:
  -----------
  fixing repo gpg tests


  Commit: fe59c9a4fc1a04ccd699664e6b07a9322c0dc53c
      https://github.com/Katello/katello/commit/fe59c9a4fc1a04ccd699664e6b07a9322c0dc53c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb
    M src/spec/controllers/api/organization_system_info_keys_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/helpers/system_helper_methods.rb

  Log Message:
  -----------
  Merge branch 'pulpv2' of https://github.com/Katello/katello into pulpv2


  Commit: f20f6122d96d82f60b904691ec21e02787b4c31a
      https://github.com/Katello/katello/commit/f20f6122d96d82f60b904691ec21e02787b4c31a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repos.rb

  Log Message:
  -----------
  gpg repo creation fix


  Commit: dd3d518e1627bd4417d110ed0dbb225e144662ab
      https://github.com/Katello/katello/commit/dd3d518e1627bd4417d110ed0dbb225e144662ab
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
    M src/app/models/glue/candlepin/content.rb
    M src/app/models/glue/pulp/repos.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/models/model_spec_helper.rb

  Log Message:
  -----------
  migrating custom repo content creation to orchestration


  Commit: add527e6c52b886b8dddabe6574a492e64a8e367
      https://github.com/Katello/katello/commit/add527e6c52b886b8dddabe6574a492e64a8e367
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/views/dashboard/_errata.haml
    M src/lib/resources/pulp.rb
    M src/spec/models/system_group_spec.rb

  Log Message:
  -----------
  Initial cut of consumer group work


  Commit: 2de1b2df219313deecf521e162d6861bf784368c
      https://github.com/Katello/katello/commit/2de1b2df219313deecf521e162d6861bf784368c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
    M src/app/controllers/sync_schedules_controller.rb
    M src/spec/helpers/repository_helper_methods.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/product_spec.rb

  Log Message:
  -----------
  spec fixes


  Commit: 6d5e012361edd48a947b35d89f8011f7002913b2
      https://github.com/Katello/katello/commit/6d5e012361edd48a947b35d89f8011f7002913b2
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
    M katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb

  Log Message:
  -----------
  pulpv2 - fixing new oauth configuration


  Commit: c2585bae7a570f9daa77c0eed6fedfb75a301f1d
      https://github.com/Katello/katello/commit/c2585bae7a570f9daa77c0eed6fedfb75a301f1d
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
    M src/app/controllers/sync_schedules_controller.rb
    M src/app/models/glue/candlepin/content.rb
    M src/app/models/glue/pulp/repos.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/helpers/repository_helper_methods.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/product_spec.rb

  Log Message:
  -----------
  Merge pull request #951 from jlsherrill/pulpv2

Pulpv2 - converting content creation to orchestration


  Commit: a146860a6c6a8746a3c3fd84ddb1872945226550
      https://github.com/Katello/katello/commit/a146860a6c6a8746a3c3fd84ddb1872945226550
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
    M src/app/models/glue/elastic_search/pool.rb

  Log Message:
  -----------
  fixing pool elasticsearch bindings


  Commit: b3dd972ff056e905d1a0d3ad3a0104072b38d446
      https://github.com/Katello/katello/commit/b3dd972ff056e905d1a0d3ad3a0104072b38d446
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/upgrade-scripts/default/0002_update_pulp.sh

  Log Message:
  -----------
  pulpv2 - update usage of pulp-migrate to be pulp-manage-db

As of pulpv2 testing build pulp-server-0.0.334-1.fc16.noarch and
later, pulp-migrate has been replaced with pulp-manage-db.


  Commit: d77cc55e4f5534a169c987a3d6b86c57a848e972
      https://github.com/Katello/katello/commit/d77cc55e4f5534a169c987a3d6b86c57a848e972
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
    M src/script/katello-reset-dbs

  Log Message:
  -----------
  pulpv2 - update katello-reset-dbs to use pulp-manage-db

As of pulpv2 testing build pulp-server-0.0.334-1.fc16.noarch and
later, pulp-migrate has been replaced with pulp-manage-db.


  Commit: 12e7f59610eb0a7de068a5c637fa768774e3892e
      https://github.com/Katello/katello/commit/12e7f59610eb0a7de068a5c637fa768774e3892e
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/views/dashboard/_errata.haml
    M src/lib/resources/pulp.rb
    M src/spec/models/system_group_spec.rb

  Log Message:
  -----------
  Merge pull request #948 from parthaa/new-cons-group

Initial cut on consumer groups


  Commit: 82dda535e264ff6f2fac88634d8c542adb5e8def
      https://github.com/Katello/katello/commit/82dda535e264ff6f2fac88634d8c542adb5e8def
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/upgrade-scripts/default/0002_update_pulp.sh
    M src/script/katello-reset-dbs

  Log Message:
  -----------
  Merge pull request #953 from bbuckingham/fork-pulpv2-configure

pulpv2 - update usage of pulp-migrate to be pulp-manage-db


  Commit: 7601a53ef8b80c0b374cf7c5b6869c5d82e819ad
      https://github.com/Katello/katello/commit/7601a53ef8b80c0b374cf7c5b6869c5d82e819ad
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
    M src/app/models/glue/elastic_search/errata.rb
    M src/app/models/glue/elastic_search/package.rb
    M src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb

  Log Message:
  -----------
  pulpv2 - adding support for indexing packages and errata


  Commit: 2153258f47f17996e1df58f4b879c1199096cefc
      https://github.com/Katello/katello/commit/2153258f47f17996e1df58f4b879c1199096cefc
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
    M katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb
    M src/app/models/glue/elastic_search/pool.rb

  Log Message:
  -----------
  Merge pull request #954 from jlsherrill/pulpv2

Pulpv2 - oauth fixes and pool search fixes


  Commit: 5c621a73b2374ae9a54dcd206805c9ed9c7825a9
      https://github.com/Katello/katello/commit/5c621a73b2374ae9a54dcd206805c9ed9c7825a9
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-10-31 (Wed, 31 Oct 2012)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  pulpv2 - update katello.spec for pulp v2 refactorings

This commit contains a couple of small changes to the katello.spec
to handle some code refactoring that went in with the pulpv2 migration.

This includes the creation of:
app/models/authorization - included as part of katello rpm
app/models/glue/elastic_search - included as part of a new glue rpm
  katello-glue-elasticsearch


  Commit: 585cfbdacfe7fa7d4b24b61c2dc130f869494e39
      https://github.com/Katello/katello/commit/585cfbdacfe7fa7d4b24b61c2dc130f869494e39
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-10-31 (Wed, 31 Oct 2012)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  Merge pull request #967 from bbuckingham/fork-pulpv2-rpm

pulpv2 - update katello.spec for pulp v2 refactorings


  Commit: 9bee7d9f32216963314986ea30349b1f38cee246
      https://github.com/Katello/katello/commit/9bee7d9f32216963314986ea30349b1f38cee246
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-31 (Wed, 31 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  pulpv2 - updating repo to use new retrieve


  Commit: 549bbcad94b5db3dca8c9199ad7bcf5493b60f53
      https://github.com/Katello/katello/commit/549bbcad94b5db3dca8c9199ad7bcf5493b60f53
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-10-31 (Wed, 31 Oct 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  pulpv2 - making after sync work properly without task_id temporarily


  Commit: 7e39efbae919e81905cedf964a4edcf1b334ea0d
      https://github.com/Katello/katello/commit/7e39efbae919e81905cedf964a4edcf1b334ea0d
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-01 (Thu, 01 Nov 2012)

  Changed paths:
    M cli/src/katello/client/core/utils.py

  Log Message:
  -----------
  fixing task status for pulpv2


  Commit: fa9ded393f71b975a0b7e60209e4e638acf722bc
      https://github.com/Katello/katello/commit/fa9ded393f71b975a0b7e60209e4e638acf722bc
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-01 (Thu, 01 Nov 2012)

  Changed paths:
    M src/app/models/repository.rb

  Log Message:
  -----------
  fixing include order which caused repo deletion to fail


  Commit: 23ab7331297f5d7e1d79e3cb5d889d9d41061f04
      https://github.com/Katello/katello/commit/23ab7331297f5d7e1d79e3cb5d889d9d41061f04
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-01 (Thu, 01 Nov 2012)

  Changed paths:
    M src/app/models/authorization/system.rb

  Log Message:
  -----------
  fixing improper class name


  Commit: da52aac71bbf980845327bfee5508da1e462a7f9
      https://github.com/Katello/katello/commit/da52aac71bbf980845327bfee5508da1e462a7f9
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-01 (Thu, 01 Nov 2012)

  Changed paths:
    A .travis.yml
    A cli/etc/spacewalk-pylint.rc
    M cli/katello-cli.spec
    R cli/man/headpin.1
    A cli/man/headpin.pod
    M cli/src/katello/client/core/architecture.py
    M cli/src/katello/client/core/base.py
    M cli/src/katello/client/core/changeset.py
    M cli/src/katello/client/core/config_template.py
    M cli/src/katello/client/core/distribution.py
    M cli/src/katello/client/core/domain.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/errata.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/package.py
    M cli/src/katello/client/core/packagegroup.py
    M cli/src/katello/client/core/ping.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/system_group.py
    M cli/src/katello/client/core/template.py
    M cli/src/katello/client/core/user.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/utils/printer.py
    M cli/src/katello/client/utils/usage.py
    M cli/test/katello/tests/core/system/system_report_test.py
    A cli/test/katello/tests/utils/printer_strategies_test.py
    A cli/test/katello/tests/utils/printer_test.py
    A doc/fullcolor-icon.svg
    M katello-configure/bin/katello-configure
    M katello-configure/katello-configure.spec
    M katello-configure/lib/puppet/parser/functions/katello_create_read_password.rb
    M katello-configure/modules/foreman/manifests/service.pp
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/upgrade-scripts/default/0004_migrate_katello_db.sh
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    A scripts/ci/cli_pull_request_tests.sh
    A scripts/ci/katello_pull_request_tests.sh
    M scripts/devsetup
    A scripts/gemfile-lock-install
    M src/.gitignore
    M src/Gemfile
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_info_controller.rb
    M src/app/helpers/application_info_helper.rb
    M src/app/helpers/branding_helper.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/katello_label_format_validator.rb
    M src/app/models/katello_name_format_validator.rb
    M src/app/models/ping.rb
    M src/app/models/role.rb
    M src/app/models/user.rb
    M src/app/models/username_validator.rb
    M src/app/stylesheets/sections/dashboard.scss
    M src/app/views/common/_footer.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/config/application.rb
    M src/config/initializers/app_config.rb
    M src/db/migrate/20120924211134_add_system_info_key_to_organizations.rb
    R src/deploy/bundle-config
    M src/deploy/common/service-wait.sysconfig
    A src/gemfiles/Gemfile.f16.lock
    A src/gemfiles/Gemfile.f17.lock
    A src/gemfiles/Gemfile.lock
    A src/gemfiles/Gemfile.rhel6.lock
    M src/katello.spec
    M src/lib/notifications/notifier.rb
    M src/lib/resources/abstract_model.rb
    A src/lib/util/boot_util.rb
    M src/script/katello-refresh-cdn
    M src/script/service-wait
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/search_controller_spec.rb
    M src/spec/controllers/sync_plans_controller_spec.rb
    M src/spec/lib/resources/foreman_model_spec.rb
    M src/spec/models/organization_spec.rb

  Log Message:
  -----------
  Merge branch 'master' into pulp v2

Conflicts:
	src/config/application.rb
	src/katello.spec
	src/spec/models/user_spec.rb
	src/test/integration/pulp/vcr_pulp_setup.rb


  Commit: b4876384424ad523ea6b3d4da70de13cb01050da
      https://github.com/Katello/katello/commit/b4876384424ad523ea6b3d4da70de13cb01050da
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    A .travis.yml
    A cli/etc/spacewalk-pylint.rc
    M cli/katello-cli.spec
    R cli/man/headpin.1
    A cli/man/headpin.pod
    M cli/src/katello/client/core/architecture.py
    M cli/src/katello/client/core/base.py
    M cli/src/katello/client/core/changeset.py
    M cli/src/katello/client/core/config_template.py
    M cli/src/katello/client/core/distribution.py
    M cli/src/katello/client/core/domain.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/errata.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/package.py
    M cli/src/katello/client/core/packagegroup.py
    M cli/src/katello/client/core/ping.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/system_group.py
    M cli/src/katello/client/core/template.py
    M cli/src/katello/client/core/user.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/utils/printer.py
    M cli/src/katello/client/utils/usage.py
    M cli/test/katello/tests/core/system/system_report_test.py
    A cli/test/katello/tests/utils/printer_strategies_test.py
    A cli/test/katello/tests/utils/printer_test.py
    A doc/fullcolor-icon.svg
    M katello-configure/bin/katello-configure
    M katello-configure/katello-configure.spec
    M katello-configure/lib/puppet/parser/functions/katello_create_read_password.rb
    M katello-configure/modules/foreman/manifests/service.pp
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/upgrade-scripts/default/0004_migrate_katello_db.sh
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    A scripts/ci/cli_pull_request_tests.sh
    A scripts/ci/katello_pull_request_tests.sh
    M scripts/devsetup
    A scripts/gemfile-lock-install
    M src/.gitignore
    M src/Gemfile
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_info_controller.rb
    M src/app/helpers/application_info_helper.rb
    M src/app/helpers/branding_helper.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/katello_label_format_validator.rb
    M src/app/models/katello_name_format_validator.rb
    M src/app/models/ping.rb
    M src/app/models/role.rb
    M src/app/models/user.rb
    M src/app/models/username_validator.rb
    M src/app/stylesheets/sections/dashboard.scss
    M src/app/views/common/_footer.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/config/application.rb
    M src/config/initializers/app_config.rb
    M src/db/migrate/20120924211134_add_system_info_key_to_organizations.rb
    R src/deploy/bundle-config
    M src/deploy/common/service-wait.sysconfig
    A src/gemfiles/Gemfile.f16.lock
    A src/gemfiles/Gemfile.f17.lock
    A src/gemfiles/Gemfile.lock
    A src/gemfiles/Gemfile.rhel6.lock
    M src/katello.spec
    M src/lib/notifications/notifier.rb
    M src/lib/resources/abstract_model.rb
    A src/lib/util/boot_util.rb
    M src/script/katello-refresh-cdn
    M src/script/service-wait
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/search_controller_spec.rb
    M src/spec/controllers/sync_plans_controller_spec.rb
    M src/spec/lib/resources/foreman_model_spec.rb
    M src/spec/models/organization_spec.rb

  Log Message:
  -----------
  Merge pull request #984 from parthaa/masterToPulpV2

Master to pulp v2


  Commit: dd1817d5df5ebf1b63653ea975e8733adeaaa5ad
      https://github.com/Katello/katello/commit/dd1817d5df5ebf1b63653ea975e8733adeaaa5ad
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer_group.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/system_group_spec.rb

  Log Message:
  -----------
  Fixed some rspec errors


  Commit: 888ed8d43a6bb3172db8fd1aef70e19d25e8530a
      https://github.com/Katello/katello/commit/888ed8d43a6bb3172db8fd1aef70e19d25e8530a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    A .travis.yml
    A cli/etc/spacewalk-pylint.rc
    M cli/katello-cli.spec
    R cli/man/headpin.1
    A cli/man/headpin.pod
    M cli/src/katello/client/core/architecture.py
    M cli/src/katello/client/core/base.py
    M cli/src/katello/client/core/changeset.py
    M cli/src/katello/client/core/config_template.py
    M cli/src/katello/client/core/distribution.py
    M cli/src/katello/client/core/domain.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/errata.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/package.py
    M cli/src/katello/client/core/packagegroup.py
    M cli/src/katello/client/core/ping.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/system_group.py
    M cli/src/katello/client/core/template.py
    M cli/src/katello/client/core/user.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/utils/printer.py
    M cli/src/katello/client/utils/usage.py
    M cli/test/katello/tests/core/system/system_report_test.py
    A cli/test/katello/tests/utils/printer_strategies_test.py
    A cli/test/katello/tests/utils/printer_test.py
    A doc/fullcolor-icon.svg
    M katello-configure/bin/katello-configure
    M katello-configure/katello-configure.spec
    M katello-configure/lib/puppet/parser/functions/katello_create_read_password.rb
    M katello-configure/modules/foreman/manifests/service.pp
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/upgrade-scripts/default/0002_update_pulp.sh
    M katello-configure/upgrade-scripts/default/0004_migrate_katello_db.sh
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    A scripts/ci/cli_pull_request_tests.sh
    A scripts/ci/katello_pull_request_tests.sh
    M scripts/devsetup
    A scripts/gemfile-lock-install
    M src/.gitignore
    M src/Gemfile
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_info_controller.rb
    M src/app/helpers/application_info_helper.rb
    M src/app/helpers/branding_helper.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/models/katello_label_format_validator.rb
    M src/app/models/katello_name_format_validator.rb
    M src/app/models/ping.rb
    M src/app/models/role.rb
    M src/app/models/user.rb
    M src/app/models/username_validator.rb
    M src/app/stylesheets/sections/dashboard.scss
    M src/app/views/common/_footer.haml
    M src/app/views/dashboard/_errata.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/config/application.rb
    M src/config/initializers/app_config.rb
    M src/db/migrate/20120924211134_add_system_info_key_to_organizations.rb
    R src/deploy/bundle-config
    M src/deploy/common/service-wait.sysconfig
    A src/gemfiles/Gemfile.f16.lock
    A src/gemfiles/Gemfile.f17.lock
    A src/gemfiles/Gemfile.lock
    A src/gemfiles/Gemfile.rhel6.lock
    M src/katello.spec
    M src/lib/notifications/notifier.rb
    M src/lib/resources/abstract_model.rb
    M src/lib/resources/pulp.rb
    A src/lib/util/boot_util.rb
    M src/script/katello-refresh-cdn
    M src/script/katello-reset-dbs
    M src/script/service-wait
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/search_controller_spec.rb
    M src/spec/controllers/sync_plans_controller_spec.rb
    M src/spec/lib/resources/foreman_model_spec.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/system_group_spec.rb

  Log Message:
  -----------
  Merge branch 'pulpv2' of https://github.com/Katello/katello into pulpv2


  Commit: ff7e5668d052b6b39911dc05e432daa1c477dae7
      https://github.com/Katello/katello/commit/ff7e5668d052b6b39911dc05e432daa1c477dae7
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer_group.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/system_group_spec.rb

  Log Message:
  -----------
  Merge pull request #992 from parthaa/spec-fixes

Fixed some rspec errors


  Commit: 5be54b8eac242c136c8468cafbca3d65722d6b54
      https://github.com/Katello/katello/commit/5be54b8eac242c136c8468cafbca3d65722d6b54
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M scripts/ci/katello_pull_request_tests.sh
    M src/Gemfile
    M src/app/models/glue/pulp/repo.rb
    M src/lib/tasks/test.rake
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_distributions.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/authorization/user_authorization_test.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  PulpV2 - Updates to handle ruby 1.9.3 and adds inclusion of new tests into Travis \
config.


  Commit: e332051f2c60b8e03403acef6e73452dcdb54d6b
      https://github.com/Katello/katello/commit/e332051f2c60b8e03403acef6e73452dcdb54d6b
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M scripts/ci/katello_pull_request_tests.sh
    M src/lib/tasks/test.rake

  Log Message:
  -----------
  PulpV2 - Removes deletion of db:test:prepare call to return 'rake spec' \
functionality back to expected behavior.


  Commit: 63a33bef0a0fb7c8c305777610e2c47e8d22b51e
      https://github.com/Katello/katello/commit/63a33bef0a0fb7c8c305777610e2c47e8d22b51e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M src/app/models/changeset.rb
    M src/app/models/glue/pulp/package.rb

  Log Message:
  -----------
  pulpv2 - changeset package fixes


  Commit: 1be21e0cf1addfb6fc4a4c7031dc6ecdef0aed58
      https://github.com/Katello/katello/commit/1be21e0cf1addfb6fc4a4c7031dc6ecdef0aed58
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M src/app/models/glue/candlepin/content.rb

  Log Message:
  -----------
  only create content if the environment is library


  Commit: 1b5e23fe966a39ef7933b7d0f4e9089996c93086
      https://github.com/Katello/katello/commit/1b5e23fe966a39ef7933b7d0f4e9089996c93086
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M scripts/system-test/cli_tests/_base_cleanup.sh

  Log Message:
  -----------
  cli system test - just delete the provider

otherwise tests will fail as part of the demotion process
unless all tests are actually run


  Commit: 6490f935d15da7cd86544c0ffb8194a9da8808c8
      https://github.com/Katello/katello/commit/6490f935d15da7cd86544c0ffb8194a9da8808c8
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer_group.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/system_group_spec.rb

  Log Message:
  -----------
  Merge branch 'pulpv2' of https://github.com/Katello/katello into pulpv2


  Commit: 92dbb4d70e0f74ca00d8f44944055505eecf9386
      https://github.com/Katello/katello/commit/92dbb4d70e0f74ca00d8f44944055505eecf9386
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M src/config/katello.yml
    M src/test/minitest_helper.rb

  Log Message:
  -----------
  PulpV2 - Adds the pulp v2 API path to the katello config.


  Commit: 1c57b726842e4c6e76ed36ddd5b30b75bedda9b7
      https://github.com/Katello/katello/commit/1c57b726842e4c6e76ed36ddd5b30b75bedda9b7
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M src/test/glue/pulp/repository_test.rb

  Log Message:
  -----------
  PulpV2 - Switching distribution tests to match on path and not URI.


  Commit: fbd6e9fd002a409d27f99fb30ac16595e3b19daa
      https://github.com/Katello/katello/commit/fbd6e9fd002a409d27f99fb30ac16595e3b19daa
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M src/lib/tasks/test.rake

  Log Message:
  -----------
  fixing single test runs


  Commit: 0f8260dcf9315eafe66c32f3336ea5c25d0fb542
      https://github.com/Katello/katello/commit/0f8260dcf9315eafe66c32f3336ea5c25d0fb542
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M src/spec/models/changeset_spec.rb

  Log Message:
  -----------
  fixing changeset spec


  Commit: 24d03aa23a383fda75f5f0d1187263c67736ade0
      https://github.com/Katello/katello/commit/24d03aa23a383fda75f5f0d1187263c67736ade0
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/repository.rb

  Log Message:
  -----------
  reorganizing after_sync to fit in with separation


  Commit: b0564cebb0b8cfcf57c9c6761c2c9392901884db
      https://github.com/Katello/katello/commit/b0564cebb0b8cfcf57c9c6761c2c9392901884db
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M katello-configure/bin/katello-upgrade
    M katello-configure/man/katello-upgrade.pod
    M katello-configure/modules/certs/manifests/config.pp
    M katello-configure/modules/foreman/manifests/params.pp
    M katello-configure/modules/pulp/manifests/config.pp
    A katello-configure/upgrade-scripts/default/0005_katello_configure.sh
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M src/app/controllers/api/candlepin_proxies_controller.rb
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/templates_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/models/authorization/product.rb
    M src/app/models/glue/candlepin/product.rb
    M src/app/models/glue/elastic_search/product.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/product.rb
    M src/app/models/role.rb
    M src/config/application.rb
    M src/config/katello.yml
    M src/deploy/common/katello.sysconfig
    M src/lib/resources/candlepin.rb
    M src/spec/helpers/product_test_data.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/role_spec.rb

  Log Message:
  -----------
  merge conflict


  Commit: b41ca619482d7e9709ff58df4f332b1e683b8f3c
      https://github.com/Katello/katello/commit/b41ca619482d7e9709ff58df4f332b1e683b8f3c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb

  Log Message:
  -----------
  fixing bad translations


  Commit: 6bc765f493f9352c2562040d612008e93b172bf7
      https://github.com/Katello/katello/commit/6bc765f493f9352c2562040d612008e93b172bf7
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  adding test rake job to devel-test


  Commit: c2977cd6f7b29debcf10d017392541d869026e7c
      https://github.com/Katello/katello/commit/c2977cd6f7b29debcf10d017392541d869026e7c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  test


  Commit: 5b9f55cde658fcf5c1651d69755f46cbbaf831e2
      https://github.com/Katello/katello/commit/5b9f55cde658fcf5c1651d69755f46cbbaf831e2
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M src/gemfiles/Gemfile.f16.lock

  Log Message:
  -----------
  f16 gemfile update


  Commit: ef64f276be79b92b6bcf54ef10d7d426c273336c
      https://github.com/Katello/katello/commit/ef64f276be79b92b6bcf54ef10d7d426c273336c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  do not use apipie env


  Commit: 3ac9a0538c53afb5212e10aa1af16d62feb764c4
      https://github.com/Katello/katello/commit/3ac9a0538c53afb5212e10aa1af16d62feb764c4
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb

  Log Message:
  -----------
  PulpV2 - Updates to fix tests running with Pulp and running in none mode. Skips \
currently broken tests in Pulp to make Travis green for now.


  Commit: c905938649b3555247fb645e3a30cd63bce1d158
      https://github.com/Katello/katello/commit/c905938649b3555247fb645e3a30cd63bce1d158
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer_group.rb
    M src/lib/resources/pulp.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/system_group_spec.rb

  Log Message:
  -----------
  Changes for SystemGroup (dis)associate


  Commit: 2cb41b9fbf8c554b2acea542aded11bbee94b2b7
      https://github.com/Katello/katello/commit/2cb41b9fbf8c554b2acea542aded11bbee94b2b7
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M src/app/models/authorization/system.rb

  Log Message:
  -----------
  Fixed a SystemGroup namespace issue


  Commit: 53a4c5cecc8130523145710ba623189891428fe6
      https://github.com/Katello/katello/commit/53a4c5cecc8130523145710ba623189891428fe6
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M cli/src/katello/client/core/utils.py
    M scripts/system-test/cli_tests/_base_cleanup.sh
    M src/app/models/authorization/system.rb
    M src/app/models/changeset.rb
    M src/app/models/glue/candlepin/content.rb
    M src/app/models/glue/elastic_search/errata.rb
    M src/app/models/glue/elastic_search/package.rb
    M src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/repository.rb
    M src/lib/tasks/test.rake
    M src/spec/models/changeset_spec.rb

  Log Message:
  -----------
  Merge pull request #969 from jlsherrill/pulpv2

Pulpv2 - support indexing packages/errata and switching runcible method


  Commit: f9676637d9847024f07cdd71f303be64c1566506
      https://github.com/Katello/katello/commit/f9676637d9847024f07cdd71f303be64c1566506
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer_group.rb
    M src/lib/resources/pulp.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/system_group_spec.rb

  Log Message:
  -----------
  Merge pull request #1004 from parthaa/cons-group-associate

Consumer group associate/dissociate calls


  Commit: ca7052e3e0a0c299247562a229e1b9237e8d3219
      https://github.com/Katello/katello/commit/ca7052e3e0a0c299247562a229e1b9237e8d3219
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M scripts/ci/katello_pull_request_tests.sh
    M src/Gemfile
    M src/app/models/glue/pulp/repo.rb
    M src/config/katello.yml
    M src/lib/tasks/test.rake
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_distributions.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/authorization/user_authorization_test.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Merge pull request #1001 from ehelms/pulpv2

Pulpv2 - Fixes to work in 1.8.7 and 1.9.3 and updates to pass on Travis.


  Commit: b458776643a11f299b39e6cb7ead11de84c20646
      https://github.com/Katello/katello/commit/b458776643a11f299b39e6cb7ead11de84c20646
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-06 (Tue, 06 Nov 2012)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  spec fixes for building in pulpv2


  Commit: 5252870bb38a7160e07ce752109e31ccf6f26ed5
      https://github.com/Katello/katello/commit/5252870bb38a7160e07ce752109e31ccf6f26ed5
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-06 (Tue, 06 Nov 2012)

  Changed paths:
    M katello-configure/modules/katello/manifests/params.pp

  Log Message:
  -----------
  re-enable foreman


  Commit: 88c3b80ce81a71ba86435998c43fd7b52ceff553
      https://github.com/Katello/katello/commit/88c3b80ce81a71ba86435998c43fd7b52ceff553
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-07 (Wed, 07 Nov 2012)

  Changed paths:
    M src/app/models/authorization/organization.rb
    M src/app/models/authorization/product.rb
    M src/app/models/product.rb

  Log Message:
  -----------
  few small auth fixes and spacing fixes


  Commit: 67bc8727f35e01c6affd0a57fbd9db81aa523983
      https://github.com/Katello/katello/commit/67bc8727f35e01c6affd0a57fbd9db81aa523983
  Author: Partha Aji <parthaa@gmail.com>
  Date:   2012-11-07 (Wed, 07 Nov 2012)

  Changed paths:
    M katello-configure/bin/katello-upgrade
    M katello-configure/man/katello-upgrade.pod
    M katello-configure/modules/certs/manifests/config.pp
    M katello-configure/modules/foreman/manifests/params.pp
    M katello-configure/modules/katello/manifests/params.pp
    M katello-configure/modules/pulp/manifests/config.pp
    A katello-configure/upgrade-scripts/default/0005_katello_configure.sh
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M src/app/controllers/api/candlepin_proxies_controller.rb
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/templates_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/models/authorization/organization.rb
    M src/app/models/authorization/product.rb
    M src/app/models/glue/candlepin/product.rb
    M src/app/models/glue/elastic_search/product.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/product.rb
    M src/app/models/role.rb
    M src/config/application.rb
    M src/config/katello.yml
    M src/deploy/common/katello.sysconfig
    M src/gemfiles/Gemfile.f16.lock
    M src/katello.spec
    M src/lib/resources/candlepin.rb
    M src/spec/helpers/product_test_data.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/role_spec.rb

  Log Message:
  -----------
  Merge pull request #1013 from jlsherrill/pulpv2

Pulpv2 - master merge and a few fixes


  Commit: 2041d079f94e6f41b79aa0603157dc86dbfd6008
      https://github.com/Katello/katello/commit/2041d079f94e6f41b79aa0603157dc86dbfd6008
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-08 (Thu, 08 Nov 2012)

  Changed paths:
    M cli/src/katello/client/utils/printer.py
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/manifests/init.pp
    M katello-configure/modules/foreman/manifests/params.pp
    M katello-configure/modules/katello/manifests/init.pp
    M katello-configure/upgrade-scripts/default/0004_migrate_katello_db.sh
    A scripts/iso/README
    A scripts/iso/install_packages
    M scripts/test/repo_generation/create_erratum.sh
    M scripts/test/repo_generation/zoo/errata.txt
    M src/app/controllers/organizations_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/models/deletion_changeset.rb
    M src/app/models/glue/candlepin/product.rb
    M src/app/models/glue/pulp/repo.rb
    R src/app/models/login_credential.rb
    M src/app/models/product.rb
    R src/app/views/providers/redhat/_children.html.haml
    R src/app/views/providers/redhat/_import_history.html.haml
    R src/app/views/providers/redhat/_repo_whitelist.html.haml
    R src/app/views/providers/redhat/_subscription_details.html.haml
    R src/app/views/providers/redhat/show.html.haml
    M src/app/views/subscriptions/_history.html.haml
    M src/app/views/subscriptions/_history_items.html.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/systems/_subs.html.haml
    M src/config/application.rb
    M src/config/assets.yml
    M src/db/migrate/20120702175532_add_repository_library_id.rb
    M src/katello.spec
    M src/public/javascripts/provider.js
    R src/public/javascripts/provider_redhat.js
    M src/public/javascripts/systems.js

  Log Message:
  -----------
  Fixed some merge Conflicts

Conflicts:
	src/app/models/glue/pulp/repo.rb
	src/app/models/login_credential.rb
	src/app/models/product.rb
	src/app/models/repository.rb


  Commit: 16b99449eafb32cb6d845da071c1b776c6bfccf2
      https://github.com/Katello/katello/commit/16b99449eafb32cb6d845da071c1b776c6bfccf2
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-08 (Thu, 08 Nov 2012)

  Changed paths:
    M src/app/stylesheets/katello.scss
    M src/app/views/systems/_edit.html.haml

  Log Message:
  -----------
  Merge branch 'master' into merge-to-pulp


  Commit: d7548418487ff19c69357d8df4a3d64503db908a
      https://github.com/Katello/katello/commit/d7548418487ff19c69357d8df4a3d64503db908a
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-08 (Thu, 08 Nov 2012)

  Changed paths:
    M src/app/models/product.rb

  Log Message:
  -----------
  Fixed a method name typo


  Commit: fd67a544a0405e6b5e67c6cef5e0982ec2b62e1a
      https://github.com/Katello/katello/commit/fd67a544a0405e6b5e67c6cef5e0982ec2b62e1a
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-08 (Thu, 08 Nov 2012)

  Changed paths:
    M scripts/ci/katello_pull_request_tests.sh

  Log Message:
  -----------
  PulpV2 - Adds check on return code of rspec tests to fail properly if there are \
errors.


  Commit: bae2d2157fd1bec05e037c37521e687954ae3593
      https://github.com/Katello/katello/commit/bae2d2157fd1bec05e037c37521e687954ae3593
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-11-09 (Fri, 09 Nov 2012)

  Changed paths:
    M cli/src/katello/client/utils/printer.py
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/manifests/init.pp
    M katello-configure/modules/foreman/manifests/params.pp
    M katello-configure/modules/katello/manifests/init.pp
    M katello-configure/upgrade-scripts/default/0004_migrate_katello_db.sh
    A scripts/iso/README
    A scripts/iso/install_packages
    M scripts/test/repo_generation/create_erratum.sh
    M scripts/test/repo_generation/zoo/errata.txt
    M src/app/controllers/organizations_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/models/deletion_changeset.rb
    M src/app/models/glue/candlepin/product.rb
    M src/app/models/glue/pulp/repo.rb
    R src/app/models/login_credential.rb
    M src/app/models/product.rb
    M src/app/stylesheets/katello.scss
    R src/app/views/providers/redhat/_children.html.haml
    R src/app/views/providers/redhat/_import_history.html.haml
    R src/app/views/providers/redhat/_repo_whitelist.html.haml
    R src/app/views/providers/redhat/_subscription_details.html.haml
    R src/app/views/providers/redhat/show.html.haml
    M src/app/views/subscriptions/_history.html.haml
    M src/app/views/subscriptions/_history_items.html.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/systems/_edit.html.haml
    M src/app/views/systems/_subs.html.haml
    M src/config/application.rb
    M src/config/assets.yml
    M src/db/migrate/20120702175532_add_repository_library_id.rb
    M src/katello.spec
    M src/public/javascripts/provider.js
    R src/public/javascripts/provider_redhat.js
    M src/public/javascripts/systems.js

  Log Message:
  -----------
  Merge pull request #1024 from parthaa/master-merge-to-pulpv2

Master merge to pulpv2


  Commit: 8f01aca4d1e4f38670497e2cc5fd96167b7a88ae
      https://github.com/Katello/katello/commit/8f01aca4d1e4f38670497e2cc5fd96167b7a88ae
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-11-09 (Fri, 09 Nov 2012)

  Changed paths:
    M scripts/ci/katello_pull_request_tests.sh

  Log Message:
  -----------
  Merge pull request #1026 from ehelms/pulpv2

PulpV2 - Adds check on return code of rspec tests to fail properly if th...


  Commit: 1694f201cda2f89cbaeca4065ff4022b48f1daf9
      https://github.com/Katello/katello/commit/1694f201cda2f89cbaeca4065ff4022b48f1daf9
  Author: David Davis <daviddavis@redhat.com>
  Date:   2012-11-09 (Fri, 09 Nov 2012)

  Changed paths:
    M src/test/models/authorization/system_group_authorization_test.rb

  Log Message:
  -----------
  Pulp v2 - Fixing bad require in test


  Commit: 577d1451fda7c3c6414838ce86846ebcfca0ebe6
      https://github.com/Katello/katello/commit/577d1451fda7c3c6414838ce86846ebcfca0ebe6
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-09 (Fri, 09 Nov 2012)

  Changed paths:
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M scripts/iso/install_packages
    M src/app/models/role.rb
    M src/app/models/system.rb
    M src/app/views/systems/_new.html.haml
    M src/db/migrate/20120702175532_add_repository_library_id.rb
    M src/spec/models/system_spec.rb

  Log Message:
  -----------
  Merge branch 'master' into pulpv2

Conflicts:
	src/spec/models/user_spec.rb


  Commit: f7cd15f06f684682a9f857522141723c9b59acf8
      https://github.com/Katello/katello/commit/f7cd15f06f684682a9f857522141723c9b59acf8
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-09 (Fri, 09 Nov 2012)

  Changed paths:
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M scripts/iso/install_packages
    M src/app/models/role.rb
    M src/app/models/system.rb
    M src/app/views/systems/_new.html.haml
    M src/db/migrate/20120702175532_add_repository_library_id.rb
    M src/spec/models/system_spec.rb

  Log Message:
  -----------
  Merge pull request #1035 from parthaa/master-to-pulpv2

Merge Master to pulpv2


  Commit: e76fe5287e4dffff9680f7a5013a142143c292ba
      https://github.com/Katello/katello/commit/e76fe5287e4dffff9680f7a5013a142143c292ba
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-09 (Fri, 09 Nov 2012)

  Changed paths:
    M src/app/models/glue/elastic_search/product.rb
    M src/app/models/product.rb

  Log Message:
  -----------
  fixing after_save whose function was moved to elastic_search glue


  Commit: efcaee769f672ceecd0e0ee886fe8f982a5721d1
      https://github.com/Katello/katello/commit/efcaee769f672ceecd0e0ee886fe8f982a5721d1
  Author: David Davis <daviddavis@redhat.com>
  Date:   2012-11-09 (Fri, 09 Nov 2012)

  Changed paths:
    M src/app/models/glue/elastic_search/product.rb
    M src/app/models/product.rb

  Log Message:
  -----------
  Merge pull request #1036 from jlsherrill/pulpv2

fixing after_save whose function was moved to elastic_search glue


  Commit: 4f2e098cef9cb179c6a5941f3b6468ea95cb06e6
      https://github.com/Katello/katello/commit/4f2e098cef9cb179c6a5941f3b6468ea95cb06e6
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-09 (Fri, 09 Nov 2012)

  Changed paths:
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/models/system_group_spec.rb

  Log Message:
  -----------
  Fixed most glaring errors in the pulpv2 branch


  Commit: df2a0aecf43a08829517a6e2186bc6ec6e3cb1ff
      https://github.com/Katello/katello/commit/df2a0aecf43a08829517a6e2186bc6ec6e3cb1ff
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-09 (Fri, 09 Nov 2012)

  Changed paths:
    M src/spec/models/system_group_spec.rb

  Log Message:
  -----------
  One more fix


  Commit: b02a2ac63b485412f82cf24999c78d22fdbc9760
      https://github.com/Katello/katello/commit/b02a2ac63b485412f82cf24999c78d22fdbc9760
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-12 (Mon, 12 Nov 2012)

  Changed paths:
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/models/system_group_spec.rb

  Log Message:
  -----------
  Merge pull request #1034 from parthaa/spec-v2-fixes

Fixed most glaring errors in the pulpv2 branch


  Commit: d156b8538ada147c75a498b7697ee82a158829e5
      https://github.com/Katello/katello/commit/d156b8538ada147c75a498b7697ee82a158829e5
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-12 (Mon, 12 Nov 2012)

  Changed paths:
    M src/test/models/authorization/system_group_authorization_test.rb

  Log Message:
  -----------
  Merge pull request #1033 from daviddavis/pulpv2

Pulp v2 - Fixing bad require in test


  Commit: 406e5ac1b1c39788b74d2f3ab752efac7c38beab
      https://github.com/Katello/katello/commit/406e5ac1b1c39788b74d2f3ab752efac7c38beab
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-12 (Mon, 12 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb

  Log Message:
  -----------
  Added unmerged changes from commit 2bcbb432322646d13a6ab74b601035dc2dc2741e to \
consumer.rb

to make Ruby 1.9  tests happy


  Commit: a9237fc95ac7967cf9e1d750d5c646eddeba4da9
      https://github.com/Katello/katello/commit/a9237fc95ac7967cf9e1d750d5c646eddeba4da9
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-12 (Mon, 12 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb

  Log Message:
  -----------
  Merge pull request #1044 from parthaa/1.9-fixes

Added fixes to make Ruby 1.9  tests happy


  Commit: 2d82ee31b9edae5914b604dc355991d957956f7c
      https://github.com/Katello/katello/commit/2d82ee31b9edae5914b604dc355991d957956f7c
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-11-12 (Mon, 12 Nov 2012)

  Changed paths:
    M src/lib/resources/pulp.rb

  Log Message:
  -----------
  pulpv2 - remove migrated consumer apis from repo.rb

There are still a couple of consumer apis that still need to be migrated;
however, inquiring for details on the pulpv2 apis to support them
(ie. consumer errata apis).


  Commit: 2887e4eb70981daf732af0e01c03a11fccd472fa
      https://github.com/Katello/katello/commit/2887e4eb70981daf732af0e01c03a11fccd472fa
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-11-12 (Mon, 12 Nov 2012)

  Changed paths:
    M src/app/models/task_status.rb
    M src/app/views/system_events/_event_items.html.haml
    M src/lib/util/task_status.rb
    M src/public/javascripts/system_packages.js
    M src/spec/models/task_status_spec.rb

  Log Message:
  -----------
  pulpv2 - consumer - updates for changes in task structure

This commit contains changes to the structure for task_status
related to the actions initiated by katello on the consumer.


  Commit: 505c64f82a1b0dc208e92a4e266f3314c689a885
      https://github.com/Katello/katello/commit/505c64f82a1b0dc208e92a4e266f3314c689a885
  Author: Jeff Ortel <jortel@redhat.com>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M agent/etc/gofer/plugins/katelloplugin.conf
    M agent/src/katello/agent/katelloplugin.py

  Log Message:
  -----------
  Remove [reboot] override section in the plugin descriptor.
No use case driving this.


  Commit: 5f317747d5ee4bc43a541d6db81374235bb8719f
      https://github.com/Katello/katello/commit/5f317747d5ee4bc43a541d6db81374235bb8719f
  Author: Partha Aji <parthaa@gmail.com>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M src/app/models/task_status.rb
    M src/app/views/system_events/_event_items.html.haml
    M src/lib/resources/pulp.rb
    M src/lib/util/task_status.rb
    M src/public/javascripts/system_packages.js
    M src/spec/models/task_status_spec.rb

  Log Message:
  -----------
  Merge pull request #1046 from bbuckingham/fork-pulpv2-consumer

pulpv2 - consumer -updates for changes in task structure


  Commit: d60057e49ac6fcea6baab974f580495ba365072f
      https://github.com/Katello/katello/commit/d60057e49ac6fcea6baab974f580495ba365072f
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/user.rb
    M src/app/models/user.rb
    R src/app/models/username_validator.rb
    A src/db/migrate/20121101224013_add_remote_id_to_users.rb
    M src/lib/util/model_util.rb
    M src/test/fixtures/models/users.yml
    M src/test/glue/pulp/user_test.rb
    M src/test/models/authorization/system_group_authorization_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Modified code to allow utf8 usernames

Added a remote_id column to users to work with pulp
and other remote services


  Commit: b713cd1a0fb33c6b621ee0de8d65c8c73d66c1a8
      https://github.com/Katello/katello/commit/b713cd1a0fb33c6b621ee0de8d65c8c73d66c1a8
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/user.rb
    M src/app/models/user.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Added changes recommended in the pull request


  Commit: 96dd360585181bb9b5c34cd009e853db5f5d6625
      https://github.com/Katello/katello/commit/96dd360585181bb9b5c34cd009e853db5f5d6625
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M src/test/glue/pulp/user_test.rb

  Log Message:
  -----------
  Removed a white space issue based on PR comments


  Commit: 504b42b5d8baa3c2414b136f31c18597cb25d8db
      https://github.com/Katello/katello/commit/504b42b5d8baa3c2414b136f31c18597cb25d8db
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M src/app/models/user.rb

  Log Message:
  -----------
  Changed the place where the remote_id for user is generated

This is so that all validations such as username being null password not being the \
right size etc are executed before remote_ids are computed


  Commit: f750d791954ac135581e331510cef4283c94ebb0
      https://github.com/Katello/katello/commit/f750d791954ac135581e331510cef4283c94ebb0
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Added 2 user tests one for email and one i18n


  Commit: 488462b4cd2d2689293bc3be0195c79b24c70f16
      https://github.com/Katello/katello/commit/488462b4cd2d2689293bc3be0195c79b24c70f16
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M src/app/models/user.rb
    M src/db/migrate/20121101224013_add_remote_id_to_users.rb
    M src/db/seeds.rb
    M src/lib/util/threadsession.rb

  Log Message:
  -----------
  Made app cntlr use remote id instead of username

For pulp-id we need the code to use the remote id.

Also tweaked the migration scripts a little to propertly update
the User ActiveRecord model once the remote id column got added.


  Commit: 3e007f60b7d8b0871c9ff50b9294bb839278f241
      https://github.com/Katello/katello/commit/3e007f60b7d8b0871c9ff50b9294bb839278f241
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M src/lib/util/threadsession.rb

  Log Message:
  -----------
  changed logging remote_id to username based on suggestions in the pull request


  Commit: 453cc37327c13b7396dbfae08c443727d9ab4cf8
      https://github.com/Katello/katello/commit/453cc37327c13b7396dbfae08c443727d9ab4cf8
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb

  Log Message:
  -----------
  pulpv2 - updating katello-configure for new beta build


  Commit: 37c6ced9019ffcb7c38b693cf5aeed80d34db687
      https://github.com/Katello/katello/commit/37c6ced9019ffcb7c38b693cf5aeed80d34db687
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb

  Log Message:
  -----------
  Merge pull request #1064 from jlsherrill/pulpv2

pulpv2 - updating katello-configure for new beta build


  Commit: 9d2ef67daa4a15a7de68a30e6e0ff19bae55dee5
      https://github.com/Katello/katello/commit/9d2ef67daa4a15a7de68a30e6e0ff19bae55dee5
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/user.rb
    M src/app/models/user.rb
    R src/app/models/username_validator.rb
    A src/db/migrate/20121101224013_add_remote_id_to_users.rb
    M src/db/seeds.rb
    M src/lib/util/model_util.rb
    M src/lib/util/threadsession.rb
    M src/test/fixtures/models/users.yml
    M src/test/models/authorization/system_group_authorization_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Merge pull request #1056 from parthaa/i18n-users

I18n users


  Commit: 8516c11074b1d217205c50ff4b97a559096a8b91
      https://github.com/Katello/katello/commit/8516c11074b1d217205c50ff4b97a559096a8b91
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M cli/katello-cli.spec
    M katello-configure/bin/katello-configure
    M katello-configure/bin/katello-upgrade
    M katello-configure/katello-configure.spec
    A katello-configure/lib/util/functions.rb
    M katello-configure/man/katello-upgrade.pod
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/manifests/init.pp
    M katello-configure/modules/foreman/manifests/params.pp
    A katello-configure/upgrade-scripts/0050_start_qpid.sh
    A katello-configure/upgrade-scripts/0099_preallocate_mongo.sh
    A katello-configure/upgrade-scripts/0100_start_mongodb.sh
    A katello-configure/upgrade-scripts/0110_migrate_pulp.sh
    A katello-configure/upgrade-scripts/0200_start_httpd.sh
    A katello-configure/upgrade-scripts/0385_remove_hornet_files.sh
    A katello-configure/upgrade-scripts/0390_migrate_candlepin.sh
    A katello-configure/upgrade-scripts/0400_start_tomcat.sh
    A katello-configure/upgrade-scripts/0410_start_elasticsearch.sh
    A katello-configure/upgrade-scripts/0700_start_foreman.sh
    A katello-configure/upgrade-scripts/0710_migrate_katello.sh
    A katello-configure/upgrade-scripts/0711_reindex_elastic.sh
    A katello-configure/upgrade-scripts/0720_create_foreman_users.rb
    A katello-configure/upgrade-scripts/0800_start_katello.sh
    A katello-configure/upgrade-scripts/0805_start_katello_jobs.sh
    A katello-configure/upgrade-scripts/0900_katello_configure.sh
    A katello-configure/upgrade-scripts/README
    R katello-configure/upgrade-scripts/default/0002_update_pulp.sh
    R katello-configure/upgrade-scripts/default/0003_update_candlepin.sh
    R katello-configure/upgrade-scripts/default/0004_migrate_katello_db.sh
    R katello-configure/upgrade-scripts/default/0005_katello_configure.sh
    R katello-configure/upgrade-scripts/upgrade/0001_preallocate_mongo.sh
    R katello-configure/upgrade-scripts/upgrade/0002_create_foreman_users.rb
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M src/Gemfile
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/subscriptions_controller.rb
    M src/app/controllers/system_packages_controller.rb
    M src/app/models/async_orchestration.rb
    M src/app/models/glue/provider.rb
    M src/app/models/provider.rb
    M src/app/stylesheets/sections/systems.scss
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/system_packages/_package_items.html.haml
    M src/app/views/system_packages/_packages.html.haml
    M src/config/assets.yml
    M src/config/routes.rb
    M src/katello.spec
    M src/lib/navigation/content_management.rb
    M src/lib/resources/candlepin.rb
    M src/man/katello-service.8.asciidoc
    A src/public/javascripts/packages_filtertable.js
    M src/public/javascripts/routes.js
    M src/public/javascripts/subscription.js
    M src/public/javascripts/system_packages.js
    M src/script/katello-service
    M src/spec/controllers/search_controller_spec.rb
    M src/spec/support/monkey_rspec_trac_creation_line_of_mocks.rb

  Log Message:
  -----------
  merge conflict


  Commit: a8401975fdba58b43930ba865804afc2cb9e362a
      https://github.com/Katello/katello/commit/a8401975fdba58b43930ba865804afc2cb9e362a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M src/app/models/user.rb

  Log Message:
  -----------
  do not try to generate a remote id if validation fails


  Commit: c03b01bb47e14731880986b22f22e86d2b3c4f86
      https://github.com/Katello/katello/commit/c03b01bb47e14731880986b22f22e86d2b3c4f86
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M cli/src/katello/client/core/utils.py
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/task_status.rb
    M src/lib/util/task_status.rb
    M src/public/javascripts/system_packages.js
    M src/spec/models/task_status_spec.rb

  Log Message:
  -----------
  pulpv2 - update to use 'finished' for task status state

Prepare for long rambling commit message... :)

This commit contains changes to use 'finished' vs
'success' for task status state.  The original
change from 'finished' to 'success' was actually due to
an inconsistency in the result from pulp task status and
pulp sync history.  At the time, the syncs transitioned
very quickly from being status to history; therefore,
the thought was that pulpv2 had also changed task status
to use 'success' as a final state.  Since it did not and
the task status is used for more than sync tasks, we are
reverting back to using 'finished'.


  Commit: 5433220ae782fdf28594228d71b57be42cbb0d06
      https://github.com/Katello/katello/commit/5433220ae782fdf28594228d71b57be42cbb0d06
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M cli/katello-cli.spec
    M katello-configure/bin/katello-configure
    M katello-configure/bin/katello-upgrade
    M katello-configure/katello-configure.spec
    A katello-configure/lib/util/functions.rb
    M katello-configure/man/katello-upgrade.pod
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/manifests/init.pp
    M katello-configure/modules/foreman/manifests/params.pp
    A katello-configure/upgrade-scripts/0050_start_qpid.sh
    A katello-configure/upgrade-scripts/0099_preallocate_mongo.sh
    A katello-configure/upgrade-scripts/0100_start_mongodb.sh
    A katello-configure/upgrade-scripts/0110_migrate_pulp.sh
    A katello-configure/upgrade-scripts/0200_start_httpd.sh
    A katello-configure/upgrade-scripts/0385_remove_hornet_files.sh
    A katello-configure/upgrade-scripts/0390_migrate_candlepin.sh
    A katello-configure/upgrade-scripts/0400_start_tomcat.sh
    A katello-configure/upgrade-scripts/0410_start_elasticsearch.sh
    A katello-configure/upgrade-scripts/0700_start_foreman.sh
    A katello-configure/upgrade-scripts/0710_migrate_katello.sh
    A katello-configure/upgrade-scripts/0711_reindex_elastic.sh
    A katello-configure/upgrade-scripts/0720_create_foreman_users.rb
    A katello-configure/upgrade-scripts/0800_start_katello.sh
    A katello-configure/upgrade-scripts/0805_start_katello_jobs.sh
    A katello-configure/upgrade-scripts/0900_katello_configure.sh
    A katello-configure/upgrade-scripts/README
    R katello-configure/upgrade-scripts/default/0002_update_pulp.sh
    R katello-configure/upgrade-scripts/default/0003_update_candlepin.sh
    R katello-configure/upgrade-scripts/default/0004_migrate_katello_db.sh
    R katello-configure/upgrade-scripts/default/0005_katello_configure.sh
    R katello-configure/upgrade-scripts/upgrade/0001_preallocate_mongo.sh
    R katello-configure/upgrade-scripts/upgrade/0002_create_foreman_users.rb
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M src/Gemfile
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/subscriptions_controller.rb
    M src/app/controllers/system_packages_controller.rb
    M src/app/models/async_orchestration.rb
    M src/app/models/glue/provider.rb
    M src/app/models/provider.rb
    M src/app/models/user.rb
    M src/app/stylesheets/sections/systems.scss
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/system_packages/_package_items.html.haml
    M src/app/views/system_packages/_packages.html.haml
    M src/config/assets.yml
    M src/config/routes.rb
    M src/katello.spec
    M src/lib/navigation/content_management.rb
    M src/lib/resources/candlepin.rb
    M src/man/katello-service.8.asciidoc
    A src/public/javascripts/packages_filtertable.js
    M src/public/javascripts/routes.js
    M src/public/javascripts/subscription.js
    M src/public/javascripts/system_packages.js
    M src/script/katello-service
    M src/spec/controllers/search_controller_spec.rb
    M src/spec/support/monkey_rspec_trac_creation_line_of_mocks.rb

  Log Message:
  -----------
  Merge pull request #1065 from jlsherrill/pulpv2

Pulpv2 - master merge


  Commit: 75c963bb7968b0e28ab804c733c19a842ab63b51
      https://github.com/Katello/katello/commit/75c963bb7968b0e28ab804c733c19a842ab63b51
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/task_status.rb

  Log Message:
  -----------
  pulpv2 - remove UNARCHIVED_FINISH state from task status


  Commit: fe7c53cb36f48151e6ccfd5d9b4d5e6aa275ab70
      https://github.com/Katello/katello/commit/fe7c53cb36f48151e6ccfd5d9b4d5e6aa275ab70
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  pulpv2 - convert status to string


  Commit: d83b664b73490773ed57399c2cb745b7b7b86d1f
      https://github.com/Katello/katello/commit/d83b664b73490773ed57399c2cb745b7b7b86d1f
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M cli/src/katello/client/core/utils.py
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/task_status.rb
    M src/lib/util/task_status.rb
    M src/public/javascripts/system_packages.js
    M src/spec/models/task_status_spec.rb

  Log Message:
  -----------
  Merge pull request #1067 from bbuckingham/fork-pulpv2-consumer

pulpv2 - update to use 'finished' for task status state


  Commit: 40be01d079b38a7b1fd51aede97ba5757e013142
      https://github.com/Katello/katello/commit/40be01d079b38a7b1fd51aede97ba5757e013142
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/script/katello-reset-dbs
    M src/test/factories/user_factory.rb
    M src/test/fixtures/models/users.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    R src/test/fixtures/vcr_cassettes/glue_pulp_repo_distributions.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb

  Log Message:
  -----------
  PulpV2 - Updates to fix glue layer and tests for newest pulp beta.


  Commit: a37d688502a3b405560197a8a7263dce322cb22a
      https://github.com/Katello/katello/commit/a37d688502a3b405560197a8a7263dce322cb22a
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M src/test/models/user_test.rb

  Log Message:
  -----------
  PulpV2 - Adds encoding for the UTF-8 characters for 1.9.3


  Commit: fc11d4016ec44334b2bd0aa9792f989b1c20f6d7
      https://github.com/Katello/katello/commit/fc11d4016ec44334b2bd0aa9792f989b1c20f6d7
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/script/katello-reset-dbs
    M src/test/factories/user_factory.rb
    M src/test/fixtures/models/users.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    R src/test/fixtures/vcr_cassettes/glue_pulp_repo_distributions.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Merge pull request #1075 from ehelms/pulpv2

PulpV2 - Updates to fix glue layer and tests for newest pulp beta.


  Commit: aee25af4d7d75e0b5ae7cfd76cef2e12748028c8
      https://github.com/Katello/katello/commit/aee25af4d7d75e0b5ae7cfd76cef2e12748028c8
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M src/app/controllers/content_search_controller.rb
    M src/app/helpers/content_search_helper.rb
    M src/app/helpers/errata_helper.rb
    M src/app/models/glue/elastic_search/errata.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/promotion_changeset.rb
    M src/app/views/errata/_show.html.haml

  Log Message:
  -----------
  pulpv2 - migrating to using unit_id as the errata id

instead of advisory id


  Commit: f17227a22174c9da59a1702231ba81292a1bd788
      https://github.com/Katello/katello/commit/f17227a22174c9da59a1702231ba81292a1bd788
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/models/authorization/activation_key_authorization_test.rb
    M src/test/models/authorization/environment_authorization_test.rb
    M src/test/models/authorization/filter_authorization_test.rb
    M src/test/models/authorization/gpg_key_authorization_test.rb
    M src/test/models/authorization/organization_authorization_test.rb
    M src/test/models/authorization/product_authorization_test.rb
    M src/test/models/authorization/provider_authorization_test.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/authorization/role_authorization_test.rb
    M src/test/models/authorization/system_authorization_test.rb
    M src/test/models/authorization/system_group_authorization_test.rb
    M src/test/models/authorization/system_template_authorization_test.rb
    M src/test/models/authorization/user_authorization_test.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  PulpV2 - Cleans up asserts for friendlier output.


  Commit: 6ecd255862b6d9dcfdcc9b081f9a0a76b36c01d6
      https://github.com/Katello/katello/commit/6ecd255862b6d9dcfdcc9b081f9a0a76b36c01d6
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb

  Log Message:
  -----------
  PulpV2 - Fixes up errata tests for a repository with Pulp beta.


  Commit: 92d2915f5dd41c196387819b332f868eb4ab2d3c
      https://github.com/Katello/katello/commit/92d2915f5dd41c196387819b332f868eb4ab2d3c
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/models/authorization/activation_key_authorization_test.rb
    M src/test/models/authorization/environment_authorization_test.rb
    M src/test/models/authorization/filter_authorization_test.rb
    M src/test/models/authorization/gpg_key_authorization_test.rb
    M src/test/models/authorization/organization_authorization_test.rb
    M src/test/models/authorization/product_authorization_test.rb
    M src/test/models/authorization/provider_authorization_test.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/authorization/role_authorization_test.rb
    M src/test/models/authorization/system_authorization_test.rb
    M src/test/models/authorization/system_group_authorization_test.rb
    M src/test/models/authorization/system_template_authorization_test.rb
    M src/test/models/authorization/user_authorization_test.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Merge pull request #1076 from ehelms/pulpv2

Pulpv2 - Cleans up asserts to produce friendlier output and fixes up errata tests.


  Commit: abca7d92ea06c125504284e0a18c1fb352ec98b9
      https://github.com/Katello/katello/commit/abca7d92ea06c125504284e0a18c1fb352ec98b9
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M src/app/controllers/system_errata_controller.rb
    M src/app/controllers/system_group_errata_controller.rb
    M src/config/environments/test.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/models/changeset_spec.rb

  Log Message:
  -----------
  spec fixes


  Commit: 6dfb087df086b93634d177a674be10ea9daa93ba
      https://github.com/Katello/katello/commit/6dfb087df086b93634d177a674be10ea9daa93ba
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/models/authorization/activation_key_authorization_test.rb
    M src/test/models/authorization/environment_authorization_test.rb
    M src/test/models/authorization/filter_authorization_test.rb
    M src/test/models/authorization/gpg_key_authorization_test.rb
    M src/test/models/authorization/organization_authorization_test.rb
    M src/test/models/authorization/product_authorization_test.rb
    M src/test/models/authorization/provider_authorization_test.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/authorization/role_authorization_test.rb
    M src/test/models/authorization/system_authorization_test.rb
    M src/test/models/authorization/system_group_authorization_test.rb
    M src/test/models/authorization/system_template_authorization_test.rb
    M src/test/models/authorization/user_authorization_test.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  merge conflict


  Commit: 5cfac6739451f7c11f32e6a526a2807d9faefb0b
      https://github.com/Katello/katello/commit/5cfac6739451f7c11f32e6a526a2807d9faefb0b
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb

  Log Message:
  -----------
  adding comment


  Commit: 52a52693131d6a72babc3f77d5ac74e66fa1dfd3
      https://github.com/Katello/katello/commit/52a52693131d6a72babc3f77d5ac74e66fa1dfd3
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M src/test/glue/pulp/repository_test.rb

  Log Message:
  -----------
  spec test fix


  Commit: 2f40d1f1f2d5b91971417be6fd81b8d655eb9ae1
      https://github.com/Katello/katello/commit/2f40d1f1f2d5b91971417be6fd81b8d655eb9ae1
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml

  Log Message:
  -----------
  cassette updates


  Commit: f797551f05333ecba743ba7ab7a289157ad17080
      https://github.com/Katello/katello/commit/f797551f05333ecba743ba7ab7a289157ad17080
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M src/app/controllers/system_errata_controller.rb
    M src/app/controllers/system_group_errata_controller.rb
    M src/app/models/promotion_changeset.rb

  Log Message:
  -----------
  commit comment fixes


  Commit: 80e5020ce46f62eb38af1e2bf7034cca284a96a7
      https://github.com/Katello/katello/commit/80e5020ce46f62eb38af1e2bf7034cca284a96a7
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M src/app/controllers/system_errata_controller.rb
    M src/app/controllers/system_group_errata_controller.rb

  Log Message:
  -----------
  simplifying sorting


  Commit: 1c2a1dd6ceefac4b5b1d890ddcbc1bbabb62f7db
      https://github.com/Katello/katello/commit/1c2a1dd6ceefac4b5b1d890ddcbc1bbabb62f7db
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M src/app/controllers/system_errata_controller.rb
    M src/app/controllers/system_group_errata_controller.rb

  Log Message:
  -----------
  fixing errata_ids


  Commit: 6ce200f5a8f4eb3070b1c1312c8589072bba6ab6
      https://github.com/Katello/katello/commit/6ce200f5a8f4eb3070b1c1312c8589072bba6ab6
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/system_errata_controller.rb
    M src/app/controllers/system_group_errata_controller.rb
    M src/app/helpers/content_search_helper.rb
    M src/app/helpers/errata_helper.rb
    M src/app/models/glue/elastic_search/errata.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/promotion_changeset.rb
    M src/app/views/errata/_show.html.haml
    M src/config/environments/test.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/models/changeset_spec.rb
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb

  Log Message:
  -----------
  Merge pull request #1083 from jlsherrill/pulpv2

Pulpv2 - errata id migration


  Commit: dd2a47a1deb86bf318bd449a750c97210eb195d0
      https://github.com/Katello/katello/commit/dd2a47a1deb86bf318bd449a750c97210eb195d0
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M src/Gemfile

  Log Message:
  -----------
  PulpV2 - Switches the branch to start using Runcible from gem.


  Commit: 034fda7c6d84adf1489f583e77453326e27e1cfe
      https://github.com/Katello/katello/commit/034fda7c6d84adf1489f583e77453326e27e1cfe
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  PulpV2 - Adds Runcible to spec file.


  Commit: ab04154c4b276d633bed8c6d22725a831cd8b6c9
      https://github.com/Katello/katello/commit/ab04154c4b276d633bed8c6d22725a831cd8b6c9
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M src/Gemfile
    M src/katello.spec

  Log Message:
  -----------
  Merge pull request #1094 from ehelms/pulpv2

Pulpv2 - Switches to enforce use of gem.


  Commit: 0886000bf1f437efbe1c7b0edf575c88e7623af8
      https://github.com/Katello/katello/commit/0886000bf1f437efbe1c7b0edf575c88e7623af8
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M src/lib/tasks/test.rake

  Log Message:
  -----------
  PulpV2 - Adds task to find untested methods.


  Commit: 7c52f4cb538654a72680a6dd7dd2255f62845577
      https://github.com/Katello/katello/commit/7c52f4cb538654a72680a6dd7dd2255f62845577
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/distribution.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/system.rb
    M src/test/fixtures/models/systems.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_distribution.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_errata.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    A src/test/fixtures/vcr_cassettes/support/repository.yml
    A src/test/fixtures/vcr_cassettes/task_support.yml
    A src/test/glue/pulp/consumer_group_test.rb
    A src/test/glue/pulp/consumer_test.rb
    A src/test/glue/pulp/distribution_test.rb
    M src/test/glue/pulp/errata_test.rb
    M src/test/glue/pulp/package_test.rb
    A src/test/glue/pulp/repos_test.rb
    A src/test/support/repository_support.rb
    A src/test/support/task_support.rb

  Log Message:
  -----------
  PulpV2 - Adds Distribution, Package and Errata glue layer tests.
Adds support modules for Repositories and Tasks.


  Commit: 1baed047704fe662d2596f2d48f94a5f4f3d5568
      https://github.com/Katello/katello/commit/1baed047704fe662d2596f2d48f94a5f4f3d5568
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/models/system.rb
    A src/test/fixtures/vcr_cassettes/glue_pulp_consumer.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_distribution.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_errata.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    A src/test/fixtures/vcr_cassettes/support/consumer.yml
    M src/test/fixtures/vcr_cassettes/support/repository.yml
    M src/test/fixtures/vcr_cassettes/task_support.yml
    M src/test/glue/pulp/consumer_test.rb
    A src/test/support/consumer_support.rb
    M src/test/support/task_support.rb

  Log Message:
  -----------
  PulpV2 - Adds consumer glue layer tests.

Note: The giant if-else block currently needed to support
separation of concerns testing.  This will be addressed
in the future.


  Commit: 76cd6779e7402a85c87d806a5a6ef898a939cab1
      https://github.com/Katello/katello/commit/76cd6779e7402a85c87d806a5a6ef898a939cab1
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M src/spec/controllers/api/systems_controller_spec.rb

  Log Message:
  -----------
  PulpV2 - Fixes spec that was stubbing a changed API method.


  Commit: 5582cfea2634494b19e905cfcc6e49015bab7db6
      https://github.com/Katello/katello/commit/5582cfea2634494b19e905cfcc6e49015bab7db6
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/kt_environment.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/config/environments/test.rb
    M src/test/glue/pulp/errata_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  PulpV2 - Fixes up some Glue layer fencing.


  Commit: ab7afc551784e6f9ccd54c55f1f0fe33ef475dce
      https://github.com/Katello/katello/commit/ab7afc551784e6f9ccd54c55f1f0fe33ef475dce
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M src/test/models/authorization/activation_key_authorization_test.rb
    A src/test/models/authorization/authorization_base.rb
    M src/test/models/authorization/environment_authorization_test.rb
    M src/test/models/authorization/filter_authorization_test.rb
    M src/test/models/authorization/gpg_key_authorization_test.rb
    M src/test/models/authorization/organization_authorization_test.rb
    M src/test/models/authorization/product_authorization_test.rb
    M src/test/models/authorization/provider_authorization_test.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/authorization/role_authorization_test.rb
    M src/test/models/authorization/system_authorization_test.rb
    M src/test/models/authorization/system_group_authorization_test.rb
    M src/test/models/authorization/system_template_authorization_test.rb
    M src/test/models/authorization/user_authorization_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  PulpV2 - Adds an authorization base file that all authorization
tests inherit from.  Moves user and repository model tests to
use an inherited base instead of a module.


  Commit: 38a6551746c87c0225499929c903dbb81498aae3
      https://github.com/Katello/katello/commit/38a6551746c87c0225499929c903dbb81498aae3
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/errata.rb
    M src/test/support/consumer_support.rb

  Log Message:
  -----------
  PulpV2 - Minor fixes and cleanup.


  Commit: 09bbcd75280adba4b62e902b812c97f30efe200c
      https://github.com/Katello/katello/commit/09bbcd75280adba4b62e902b812c97f30efe200c
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml

  Log Message:
  -----------
  PulpV2 - Updates comps group to add rubygem-runcible.


  Commit: dd1cb61eae5e9f40277f59a36779fc310b392861
      https://github.com/Katello/katello/commit/dd1cb61eae5e9f40277f59a36779fc310b392861
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M src/test/minitest_helper.rb

  Log Message:
  -----------
  PulpV2 - Adds ActiveSupport dependency clearing to resolve issue with
running multiple test sets together.


  Commit: d409153d4e4c33aa58fce244d72c24bb6cc0b8b1
      https://github.com/Katello/katello/commit/d409153d4e4c33aa58fce244d72c24bb6cc0b8b1
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M cli/katello-cli.spec
    M cli/po/as.po
    M cli/po/bn.po
    A cli/po/cs.po
    M cli/po/de.po
    M cli/po/es.po
    M cli/po/fr.po
    M cli/po/gu.po
    M cli/po/hi.po
    M cli/po/it.po
    M cli/po/ja.po
    M cli/po/keys.pot
    M cli/po/kn.po
    M cli/po/ko.po
    M cli/po/ml.po
    M cli/po/mr.po
    M cli/po/or.po
    M cli/po/pa.po
    M cli/po/pt.po
    A cli/po/pt_BR.po
    M cli/po/ru.po
    M cli/po/ta.po
    M cli/po/te.po
    M cli/po/zh_CN.po
    M cli/po/zh_TW.po
    A cli/src/katello/client/api/subnet.py
    M cli/src/katello/client/constants.py
    M cli/src/katello/client/core/architecture.py
    M cli/src/katello/client/core/base.py
    M cli/src/katello/client/core/config_template.py
    M cli/src/katello/client/core/distribution.py
    M cli/src/katello/client/core/domain.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/errata.py
    M cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/package.py
    M cli/src/katello/client/core/provider.py
    M cli/src/katello/client/core/repo.py
    A cli/src/katello/client/core/subnet.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/template.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/main.py
    M katello-configure/katello-configure.spec
    M katello-configure/lib/util/functions.rb
    M katello-configure/modules/apache2/manifests/init.pp
    M katello-configure/modules/candlepin/manifests/config.pp
    M katello-configure/modules/candlepin/manifests/init.pp
    M katello-configure/modules/candlepin/manifests/service.pp
    M katello-configure/modules/certs/manifests/init.pp
    M katello-configure/modules/elasticsearch/manifests/config.pp
    M katello-configure/modules/elasticsearch/manifests/init.pp
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/manifests/init.pp
    M katello-configure/modules/foreman/templates/httpd.conf.erb
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/manifests/init.pp
    M katello-configure/modules/katello/manifests/params.pp
    M katello-configure/modules/mongodb/manifests/config.pp
    M katello-configure/modules/mongodb/manifests/init.pp
    M katello-configure/modules/postgres/manifests/init.pp
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/modules/pulp/manifests/init.pp
    M katello-configure/modules/qpid/manifests/init.pp
    M katello-configure/modules/thumbslug/manifests/config.pp
    M katello-configure/modules/thumbslug/manifests/init.pp
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    M rel-eng/comps/comps-katello-pulp-server-fedora16.xml
    M rel-eng/comps/comps-katello-pulp-server-fedora17.xml
    M rel-eng/comps/comps-katello-pulp-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    A scripts/system-test/cli_tests/subnets.sh
    A scripts/update_translations.sh
    M src/Gemfile
    M src/app/controllers/api/foreman/simple_crud_controller.rb
    A src/app/controllers/api/foreman/subnets_controller.rb
    M src/app/controllers/api/subscriptions_controller.rb
    A src/app/controllers/domains_controller.rb
    A src/app/controllers/simple_crud_controller.rb
    A src/app/controllers/subnets_controller.rb
    A src/app/helpers/foreman_helper.rb
    M src/app/helpers/katello_form_builder.rb
    M src/app/helpers/systems_helper.rb
    M src/app/models/activation_key.rb
    M src/app/models/foreman/config_template.rb
    M src/app/models/foreman/domain.rb
    A src/app/models/foreman/smart_proxy.rb
    A src/app/models/foreman/subnet.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/kt_environment.rb
    M src/app/models/ping.rb
    M src/app/views/activation_keys/_available_subscriptions.html.haml
    M src/app/views/dashboard/_subscriptions.haml
    A src/app/views/domains/_edit.html.haml
    A src/app/views/domains/_new.html.haml
    A src/app/views/domains/index.html.haml
    A src/app/views/providers/redhat/_children.html.haml
    A src/app/views/providers/redhat/_repo_whitelist.html.haml
    A src/app/views/providers/redhat/show.html.haml
    A src/app/views/subnets/_edit.html.haml
    A src/app/views/subnets/_new.html.haml
    A src/app/views/subnets/index.html.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/systems/_new.html.haml
    M src/app/views/systems/_subs.html.haml
    M src/app/views/systems/_subscriptions.html.haml
    M src/config/application.rb
    M src/config/assets.yml
    M src/config/environments/development.rb
    M src/config/environments/test.rb
    M src/config/initializers/app_config.rb
    M src/config/routes.rb
    M src/deploy/common/katello-jobs.init
    M src/deploy/common/katello.init
    M src/deploy/common/katello.sysconfig
    M src/katello.spec
    M src/lib/navigation/content_management.rb
    M src/lib/navigation/main.rb
    A src/lib/navigation/setup.rb
    M src/lib/resources/abstract_model.rb
    A src/lib/resources/abstract_model/indexed_model.rb
    M src/lib/resources/foreman.rb
    M src/locale/app.pot
    M src/locale/bn/app.po
    A src/locale/cs/app.po
    M src/locale/de/app.po
    M src/locale/en/app.po
    M src/locale/es/app.po
    M src/locale/fr/app.po
    M src/locale/gu/app.po
    M src/locale/hi/app.po
    M src/locale/it/app.po
    M src/locale/ja/app.po
    M src/locale/kn/app.po
    M src/locale/ko/app.po
    M src/locale/mr/app.po
    M src/locale/or/app.po
    M src/locale/pa/app.po
    M src/locale/pt_BR/app.po
    M src/locale/ru/app.po
    M src/locale/ta/app.po
    M src/locale/te/app.po
    M src/locale/zh_CN/app.po
    M src/locale/zh_TW/app.po
    A src/public/javascripts/domain.js
    A src/public/javascripts/provider_redhat.js
    M src/public/javascripts/routes.js
    A src/public/javascripts/subnet.js
    M src/script/katello-debug
    A src/spec/controllers/api/foreman/architectures_controller_spec.rb
    A src/spec/controllers/api/foreman/config_templates_controller_spec.rb
    A src/spec/controllers/api/foreman/domains_controller_spec.rb
    A src/spec/controllers/api/foreman/simpler_crud_controller_spec.rb
    M src/spec/models/activation_key_spec.rb
    A src/spec/models/foreman/config_template_spec.rb
    R src/spec/support/TDL.xsd
    M src/spec/support/monkey_rspec_trac_creation_line_of_mocks.rb
    R src/spec/support/protected_action_shared_examples.rb
    A src/spec/support/shared_examples/TDL.xsd
    A src/spec/support/shared_examples/protected_action_shared_examples.rb
    A src/spec/support/shared_examples/simple_crud_controller.rb
    A src/spec/support/shared_examples/valid_tdl_shared_examples.rb
    R src/spec/support/valid_tdl_shared_examples.rb

  Log Message:
  -----------
  Merge branch 'master' of github.com:Katello/katello into pulpv2-master

Conflicts:
	src/Gemfile
	src/config/environments/development.rb
	src/config/environments/test.rb
	src/katello.spec


  Commit: 37b135acdc8a76099d4f24ed69a1a1b9c386f983
      https://github.com/Katello/katello/commit/37b135acdc8a76099d4f24ed69a1a1b9c386f983
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M cli/katello-cli.spec
    M cli/po/as.po
    M cli/po/bn.po
    A cli/po/cs.po
    M cli/po/de.po
    M cli/po/es.po
    M cli/po/fr.po
    M cli/po/gu.po
    M cli/po/hi.po
    M cli/po/it.po
    M cli/po/ja.po
    M cli/po/keys.pot
    M cli/po/kn.po
    M cli/po/ko.po
    M cli/po/ml.po
    M cli/po/mr.po
    M cli/po/or.po
    M cli/po/pa.po
    M cli/po/pt.po
    A cli/po/pt_BR.po
    M cli/po/ru.po
    M cli/po/ta.po
    M cli/po/te.po
    M cli/po/zh_CN.po
    M cli/po/zh_TW.po
    A cli/src/katello/client/api/subnet.py
    M cli/src/katello/client/constants.py
    M cli/src/katello/client/core/architecture.py
    M cli/src/katello/client/core/base.py
    M cli/src/katello/client/core/config_template.py
    M cli/src/katello/client/core/distribution.py
    M cli/src/katello/client/core/domain.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/errata.py
    M cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/package.py
    M cli/src/katello/client/core/provider.py
    M cli/src/katello/client/core/repo.py
    A cli/src/katello/client/core/subnet.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/template.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/main.py
    M katello-configure/katello-configure.spec
    M katello-configure/lib/util/functions.rb
    M katello-configure/modules/apache2/manifests/init.pp
    M katello-configure/modules/candlepin/manifests/config.pp
    M katello-configure/modules/candlepin/manifests/init.pp
    M katello-configure/modules/candlepin/manifests/service.pp
    M katello-configure/modules/certs/manifests/init.pp
    M katello-configure/modules/elasticsearch/manifests/config.pp
    M katello-configure/modules/elasticsearch/manifests/init.pp
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/manifests/init.pp
    M katello-configure/modules/foreman/templates/httpd.conf.erb
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/manifests/init.pp
    M katello-configure/modules/katello/manifests/params.pp
    M katello-configure/modules/mongodb/manifests/config.pp
    M katello-configure/modules/mongodb/manifests/init.pp
    M katello-configure/modules/postgres/manifests/init.pp
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/modules/pulp/manifests/init.pp
    M katello-configure/modules/qpid/manifests/init.pp
    M katello-configure/modules/thumbslug/manifests/config.pp
    M katello-configure/modules/thumbslug/manifests/init.pp
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    M rel-eng/comps/comps-katello-pulp-server-fedora16.xml
    M rel-eng/comps/comps-katello-pulp-server-fedora17.xml
    M rel-eng/comps/comps-katello-pulp-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    A scripts/system-test/cli_tests/subnets.sh
    A scripts/update_translations.sh
    M src/Gemfile
    M src/app/controllers/api/foreman/simple_crud_controller.rb
    A src/app/controllers/api/foreman/subnets_controller.rb
    M src/app/controllers/api/subscriptions_controller.rb
    A src/app/controllers/domains_controller.rb
    A src/app/controllers/simple_crud_controller.rb
    A src/app/controllers/subnets_controller.rb
    A src/app/helpers/foreman_helper.rb
    M src/app/helpers/katello_form_builder.rb
    M src/app/helpers/systems_helper.rb
    M src/app/models/activation_key.rb
    M src/app/models/foreman/config_template.rb
    M src/app/models/foreman/domain.rb
    A src/app/models/foreman/smart_proxy.rb
    A src/app/models/foreman/subnet.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/kt_environment.rb
    M src/app/models/ping.rb
    M src/app/views/activation_keys/_available_subscriptions.html.haml
    M src/app/views/dashboard/_subscriptions.haml
    A src/app/views/domains/_edit.html.haml
    A src/app/views/domains/_new.html.haml
    A src/app/views/domains/index.html.haml
    A src/app/views/providers/redhat/_children.html.haml
    A src/app/views/providers/redhat/_repo_whitelist.html.haml
    A src/app/views/providers/redhat/show.html.haml
    A src/app/views/subnets/_edit.html.haml
    A src/app/views/subnets/_new.html.haml
    A src/app/views/subnets/index.html.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/systems/_new.html.haml
    M src/app/views/systems/_subs.html.haml
    M src/app/views/systems/_subscriptions.html.haml
    M src/config/application.rb
    M src/config/assets.yml
    M src/config/environments/development.rb
    M src/config/environments/test.rb
    M src/config/initializers/app_config.rb
    M src/config/routes.rb
    M src/deploy/common/katello-jobs.init
    M src/deploy/common/katello.init
    M src/deploy/common/katello.sysconfig
    M src/katello.spec
    M src/lib/navigation/content_management.rb
    M src/lib/navigation/main.rb
    A src/lib/navigation/setup.rb
    M src/lib/resources/abstract_model.rb
    A src/lib/resources/abstract_model/indexed_model.rb
    M src/lib/resources/foreman.rb
    M src/locale/app.pot
    M src/locale/bn/app.po
    A src/locale/cs/app.po
    M src/locale/de/app.po
    M src/locale/en/app.po
    M src/locale/es/app.po
    M src/locale/fr/app.po
    M src/locale/gu/app.po
    M src/locale/hi/app.po
    M src/locale/it/app.po
    M src/locale/ja/app.po
    M src/locale/kn/app.po
    M src/locale/ko/app.po
    M src/locale/mr/app.po
    M src/locale/or/app.po
    M src/locale/pa/app.po
    M src/locale/pt_BR/app.po
    M src/locale/ru/app.po
    M src/locale/ta/app.po
    M src/locale/te/app.po
    M src/locale/zh_CN/app.po
    M src/locale/zh_TW/app.po
    A src/public/javascripts/domain.js
    A src/public/javascripts/provider_redhat.js
    M src/public/javascripts/routes.js
    A src/public/javascripts/subnet.js
    M src/script/katello-debug
    A src/spec/controllers/api/foreman/architectures_controller_spec.rb
    A src/spec/controllers/api/foreman/config_templates_controller_spec.rb
    A src/spec/controllers/api/foreman/domains_controller_spec.rb
    A src/spec/controllers/api/foreman/simpler_crud_controller_spec.rb
    M src/spec/models/activation_key_spec.rb
    A src/spec/models/foreman/config_template_spec.rb
    R src/spec/support/TDL.xsd
    M src/spec/support/monkey_rspec_trac_creation_line_of_mocks.rb
    R src/spec/support/protected_action_shared_examples.rb
    A src/spec/support/shared_examples/TDL.xsd
    A src/spec/support/shared_examples/protected_action_shared_examples.rb
    A src/spec/support/shared_examples/simple_crud_controller.rb
    A src/spec/support/shared_examples/valid_tdl_shared_examples.rb
    R src/spec/support/valid_tdl_shared_examples.rb

  Log Message:
  -----------
  Merge pull request #1117 from ehelms/pulpv2-master

Master merge into PulpV2 Branch


  Commit: 484b16be1a5dc2168fa7a0b30aeb2e298a7ff5cd
      https://github.com/Katello/katello/commit/484b16be1a5dc2168fa7a0b30aeb2e298a7ff5cd
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M cli/katello-cli.spec
    M cli/po/as.po
    M cli/po/bn.po
    A cli/po/cs.po
    M cli/po/de.po
    M cli/po/es.po
    M cli/po/fr.po
    M cli/po/gu.po
    M cli/po/hi.po
    M cli/po/it.po
    M cli/po/ja.po
    M cli/po/keys.pot
    M cli/po/kn.po
    M cli/po/ko.po
    M cli/po/ml.po
    M cli/po/mr.po
    M cli/po/or.po
    M cli/po/pa.po
    M cli/po/pt.po
    A cli/po/pt_BR.po
    M cli/po/ru.po
    M cli/po/ta.po
    M cli/po/te.po
    M cli/po/zh_CN.po
    M cli/po/zh_TW.po
    A cli/src/katello/client/api/subnet.py
    M cli/src/katello/client/constants.py
    M cli/src/katello/client/core/architecture.py
    M cli/src/katello/client/core/base.py
    M cli/src/katello/client/core/config_template.py
    M cli/src/katello/client/core/distribution.py
    M cli/src/katello/client/core/domain.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/errata.py
    M cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/package.py
    M cli/src/katello/client/core/provider.py
    M cli/src/katello/client/core/repo.py
    A cli/src/katello/client/core/subnet.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/template.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/main.py
    M katello-configure/katello-configure.spec
    M katello-configure/lib/util/functions.rb
    M katello-configure/modules/apache2/manifests/init.pp
    M katello-configure/modules/candlepin/manifests/config.pp
    M katello-configure/modules/candlepin/manifests/init.pp
    M katello-configure/modules/candlepin/manifests/service.pp
    M katello-configure/modules/certs/manifests/init.pp
    M katello-configure/modules/elasticsearch/manifests/config.pp
    M katello-configure/modules/elasticsearch/manifests/init.pp
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/manifests/init.pp
    M katello-configure/modules/foreman/templates/httpd.conf.erb
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/manifests/init.pp
    M katello-configure/modules/katello/manifests/params.pp
    M katello-configure/modules/mongodb/manifests/config.pp
    M katello-configure/modules/mongodb/manifests/init.pp
    M katello-configure/modules/postgres/manifests/init.pp
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/modules/pulp/manifests/init.pp
    M katello-configure/modules/qpid/manifests/init.pp
    M katello-configure/modules/thumbslug/manifests/config.pp
    M katello-configure/modules/thumbslug/manifests/init.pp
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    M rel-eng/comps/comps-katello-pulp-server-fedora16.xml
    M rel-eng/comps/comps-katello-pulp-server-fedora17.xml
    M rel-eng/comps/comps-katello-pulp-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    A scripts/system-test/cli_tests/subnets.sh
    A scripts/update_translations.sh
    M src/Gemfile
    M src/app/controllers/api/foreman/simple_crud_controller.rb
    A src/app/controllers/api/foreman/subnets_controller.rb
    M src/app/controllers/api/subscriptions_controller.rb
    A src/app/controllers/domains_controller.rb
    A src/app/controllers/simple_crud_controller.rb
    A src/app/controllers/subnets_controller.rb
    A src/app/helpers/foreman_helper.rb
    M src/app/helpers/katello_form_builder.rb
    M src/app/helpers/systems_helper.rb
    M src/app/models/activation_key.rb
    M src/app/models/foreman/config_template.rb
    M src/app/models/foreman/domain.rb
    A src/app/models/foreman/smart_proxy.rb
    A src/app/models/foreman/subnet.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/kt_environment.rb
    M src/app/models/ping.rb
    M src/app/views/activation_keys/_available_subscriptions.html.haml
    M src/app/views/dashboard/_subscriptions.haml
    A src/app/views/domains/_edit.html.haml
    A src/app/views/domains/_new.html.haml
    A src/app/views/domains/index.html.haml
    A src/app/views/providers/redhat/_children.html.haml
    A src/app/views/providers/redhat/_repo_whitelist.html.haml
    A src/app/views/providers/redhat/show.html.haml
    A src/app/views/subnets/_edit.html.haml
    A src/app/views/subnets/_new.html.haml
    A src/app/views/subnets/index.html.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/systems/_new.html.haml
    M src/app/views/systems/_subs.html.haml
    M src/app/views/systems/_subscriptions.html.haml
    M src/config/application.rb
    M src/config/assets.yml
    M src/config/environments/development.rb
    M src/config/environments/test.rb
    M src/config/initializers/app_config.rb
    M src/config/routes.rb
    M src/deploy/common/katello-jobs.init
    M src/deploy/common/katello.init
    M src/deploy/common/katello.sysconfig
    M src/katello.spec
    M src/lib/navigation/content_management.rb
    M src/lib/navigation/main.rb
    A src/lib/navigation/setup.rb
    M src/lib/resources/abstract_model.rb
    A src/lib/resources/abstract_model/indexed_model.rb
    M src/lib/resources/foreman.rb
    M src/locale/app.pot
    M src/locale/bn/app.po
    A src/locale/cs/app.po
    M src/locale/de/app.po
    M src/locale/en/app.po
    M src/locale/es/app.po
    M src/locale/fr/app.po
    M src/locale/gu/app.po
    M src/locale/hi/app.po
    M src/locale/it/app.po
    M src/locale/ja/app.po
    M src/locale/kn/app.po
    M src/locale/ko/app.po
    M src/locale/mr/app.po
    M src/locale/or/app.po
    M src/locale/pa/app.po
    M src/locale/pt_BR/app.po
    M src/locale/ru/app.po
    M src/locale/ta/app.po
    M src/locale/te/app.po
    M src/locale/zh_CN/app.po
    M src/locale/zh_TW/app.po
    A src/public/javascripts/domain.js
    A src/public/javascripts/provider_redhat.js
    M src/public/javascripts/routes.js
    A src/public/javascripts/subnet.js
    M src/script/katello-debug
    A src/spec/controllers/api/foreman/architectures_controller_spec.rb
    A src/spec/controllers/api/foreman/config_templates_controller_spec.rb
    A src/spec/controllers/api/foreman/domains_controller_spec.rb
    A src/spec/controllers/api/foreman/simpler_crud_controller_spec.rb
    M src/spec/models/activation_key_spec.rb
    A src/spec/models/foreman/config_template_spec.rb
    R src/spec/support/TDL.xsd
    M src/spec/support/monkey_rspec_trac_creation_line_of_mocks.rb
    R src/spec/support/protected_action_shared_examples.rb
    A src/spec/support/shared_examples/TDL.xsd
    A src/spec/support/shared_examples/protected_action_shared_examples.rb
    A src/spec/support/shared_examples/simple_crud_controller.rb
    A src/spec/support/shared_examples/valid_tdl_shared_examples.rb
    R src/spec/support/valid_tdl_shared_examples.rb

  Log Message:
  -----------
  Merge branch 'pulpv2' of github.com:Katello/katello into pulpv2

Conflicts:
	src/config/environments/test.rb


  Commit: cd12bf6b7990ad832f7a4075fa5fbd6a5e796ba2
      https://github.com/Katello/katello/commit/cd12bf6b7990ad832f7a4075fa5fbd6a5e796ba2
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M src/config/environments/development.rb

  Log Message:
  -----------
  commenting out autoreload support for runcible

causes issue if not checked out via git


  Commit: 7b842c8c5f9e463f7c978a355d44d45c9f22567f
      https://github.com/Katello/katello/commit/7b842c8c5f9e463f7c978a355d44d45c9f22567f
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M src/app/models/deletion_changeset.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/promotion_changeset.rb

  Log Message:
  -----------
  pulpv2 - fixing promotion/demotion

fixing a few itmems
  * package/errata promotion
  * package/errata demotion
  * full product/repo re-promotion


  Commit: 9d57870dabf74caec5c4eef0769d11893f5fa033
      https://github.com/Katello/katello/commit/9d57870dabf74caec5c4eef0769d11893f5fa033
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M src/spec/models/changeset_spec.rb

  Log Message:
  -----------
  spec fix


  Commit: 60de5051e8169902215430c8ab9a86bf44fb9038
      https://github.com/Katello/katello/commit/60de5051e8169902215430c8ab9a86bf44fb9038
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M src/app/models/deletion_changeset.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/promotion_changeset.rb
    M src/config/environments/development.rb
    M src/spec/models/changeset_spec.rb

  Log Message:
  -----------
  Merge pull request #1135 from jlsherrill/pulpv2

Pulpv2 - a few fixes


  Commit: 8c694da31bcc692ccfa2844e0cb5f76398309702
      https://github.com/Katello/katello/commit/8c694da31bcc692ccfa2844e0cb5f76398309702
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/test/glue/pulp/repository_test.rb

  Log Message:
  -----------
  promoting package groups with repos


  Commit: 0b3a907719fa837be18d9529fcd43b7fcdea27bf
      https://github.com/Katello/katello/commit/0b3a907719fa837be18d9529fcd43b7fcdea27bf
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml

  Log Message:
  -----------
  cassette update


  Commit: 4d6d0fdc8d3e18ede073f877f66f74d0b365a9f5
      https://github.com/Katello/katello/commit/4d6d0fdc8d3e18ede073f877f66f74d0b365a9f5
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M src/Gemfile

  Log Message:
  -----------
  runcible version requirement bump


  Commit: 30f86d679f76b64a167b46eb0c5e6fbecdeb8344
      https://github.com/Katello/katello/commit/30f86d679f76b64a167b46eb0c5e6fbecdeb8344
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-11-29 (Thu, 29 Nov 2012)

  Changed paths:
    M src/Gemfile

  Log Message:
  -----------
  being more specific about runcible version


  Commit: 84358a15daa456901bec1ebffe96f4d63876af38
      https://github.com/Katello/katello/commit/84358a15daa456901bec1ebffe96f4d63876af38
  Author: David Davis <daviddavis@redhat.com>
  Date:   2012-11-29 (Thu, 29 Nov 2012)

  Changed paths:
    M src/Gemfile
    M src/app/models/glue/pulp/repo.rb
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb

  Log Message:
  -----------
  Merge pull request #1146 from jlsherrill/pulpv2

Pulpv2 - adding package group promotion as part of repo promote


  Commit: 2ac6b7c3648e2961a2dd19807a113319d841634c
      https://github.com/Katello/katello/commit/2ac6b7c3648e2961a2dd19807a113319d841634c
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-29 (Thu, 29 Nov 2012)

  Changed paths:
    M src/Gemfile
    M src/app/models/glue/elastic_search/system.rb
    M src/app/models/glue/elastic_search/system_group.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/models/indexed_model.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/spec/models/system_group_spec.rb

  Log Message:
  -----------
  PulpV2 - Introduces the small Hooks gem and implements association hooks
for system and system groups in order to create/remove the appropriate
instances in Pulp as well as update elasticsearch.


  Commit: f77e7d4787e80bd08a3c3d877446ca4c40b544d8
      https://github.com/Katello/katello/commit/f77e7d4787e80bd08a3c3d877446ca4c40b544d8
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-11-29 (Thu, 29 Nov 2012)

  Changed paths:
    M src/Gemfile
    M src/app/models/deletion_changeset.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/promotion_changeset.rb
    M src/config/environments/development.rb
    M src/spec/models/changeset_spec.rb
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/glue/pulp/repository_test.rb

  Log Message:
  -----------
  Merge branch 'pulpv2' of github.com:Katello/katello into pulpv2

Conflicts:
	src/Gemfile
	src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
	src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
	src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
	src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
	src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
	src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
	src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
	src/test/fixtures/vcr_cassettes/pulp_user_setup.yml


  Commit: 41621622dd2b47c963eaa8372ece6ccdbe025243
      https://github.com/Katello/katello/commit/41621622dd2b47c963eaa8372ece6ccdbe025243
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-12-03 (Mon, 03 Dec 2012)

  Changed paths:
    M cli/src/katello/client/api/provider.py
    M cli/src/katello/client/api/repo.py
    M cli/src/katello/client/core/repo.py
    M cli/test/katello/tests/core/repo/repo_discovery_test.py
    M src/Gemfile
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/models/provider.rb
    M src/config/routes.rb
    A src/db/migrate/20121129223138_provider_add_repo_generation.rb
    A src/lib/repo_discovery.rb

  Log Message:
  -----------
  initial repo discovery work


  Commit: a065eec8487292bca8efac95f8319b7abbf6f4c9
      https://github.com/Katello/katello/commit/a065eec8487292bca8efac95f8319b7abbf6f4c9
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-12-03 (Mon, 03 Dec 2012)

  Changed paths:
    M src/spec/controllers/api/systems_controller_spec.rb

  Log Message:
  -----------
  PuplV2 - Fix to make list inclusion test less dynamic.


  Commit: efb75c14dd19f4c4542ddd212dea1c40f22a74db
      https://github.com/Katello/katello/commit/efb75c14dd19f4c4542ddd212dea1c40f22a74db
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2012-12-03 (Mon, 03 Dec 2012)

  Changed paths:
    M src/app/models/system_group.rb

  Log Message:
  -----------
  PulpV2 - Removing unused functions and errant debugger.


  Commit: a5ba8cb71269895ce5ac744028d60269f5d73a61
      https://github.com/Katello/katello/commit/a5ba8cb71269895ce5ac744028d60269f5d73a61
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M src/Gemfile
    M src/app/models/glue/elastic_search/system.rb
    M src/app/models/glue/elastic_search/system_group.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/models/glue/pulp/distribution.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/indexed_model.rb
    M src/app/models/kt_environment.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/lib/tasks/test.rake
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/models/system_group_spec.rb
    M src/test/fixtures/models/systems.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_consumer.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_distribution.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_errata.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    A src/test/fixtures/vcr_cassettes/support/consumer.yml
    A src/test/fixtures/vcr_cassettes/support/repository.yml
    A src/test/fixtures/vcr_cassettes/task_support.yml
    A src/test/glue/pulp/consumer_group_test.rb
    A src/test/glue/pulp/consumer_test.rb
    A src/test/glue/pulp/distribution_test.rb
    M src/test/glue/pulp/errata_test.rb
    M src/test/glue/pulp/package_test.rb
    A src/test/glue/pulp/repos_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/authorization/activation_key_authorization_test.rb
    A src/test/models/authorization/authorization_base.rb
    M src/test/models/authorization/environment_authorization_test.rb
    M src/test/models/authorization/filter_authorization_test.rb
    M src/test/models/authorization/gpg_key_authorization_test.rb
    M src/test/models/authorization/organization_authorization_test.rb
    M src/test/models/authorization/product_authorization_test.rb
    M src/test/models/authorization/provider_authorization_test.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/authorization/role_authorization_test.rb
    M src/test/models/authorization/system_authorization_test.rb
    M src/test/models/authorization/system_group_authorization_test.rb
    M src/test/models/authorization/system_template_authorization_test.rb
    M src/test/models/authorization/user_authorization_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb
    A src/test/support/consumer_support.rb
    A src/test/support/repository_support.rb
    A src/test/support/task_support.rb

  Log Message:
  -----------
  Merge pull request #1098 from ehelms/pulpv2

Pulpv2 - Adds glue layer tests for Errata, Distribution, Package and Consumers.


  Commit: 3422ef0e9e69e9bb93800a81e5905e97d02b8f06
      https://github.com/Katello/katello/commit/3422ef0e9e69e9bb93800a81e5905e97d02b8f06
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    R src/app/models/authorization/filter.rb
    R src/app/models/filter.rb
    R src/app/models/filter_package.rb

  Log Message:
  -----------
  Removing Filter related models


  Commit: 200443904459ca88078bab51a52a7f6df720eeca
      https://github.com/Katello/katello/commit/200443904459ca88078bab51a52a7f6df720eeca
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    R src/app/models/glue/elastic_search/filter.rb

  Log Message:
  -----------
  Good Bye filter search


  Commit: ae0ffc19976fe723a94dd071f053cf3fe03c1662
      https://github.com/Katello/katello/commit/ae0ffc19976fe723a94dd071f053cf3fe03c1662
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    R src/app/controllers/api/filters_controller.rb
    M src/app/controllers/changesets_controller.rb
    R src/app/controllers/filters_controller.rb
    M src/app/controllers/system_group_packages_controller.rb
    M src/app/helpers/promotions_helper.rb
    M src/app/models/changeset_erratum.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/organization.rb
    M src/app/models/permission.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/repository.rb
    M src/app/models/resource_type.rb
    R src/app/views/filters/_edit.html.haml
    R src/app/views/filters/_new.html.haml
    R src/app/views/filters/_packages.html.haml
    R src/app/views/filters/_products.html.haml
    R src/app/views/filters/index.html.haml
    M src/app/views/promotions/_product.html.haml
    M src/app/views/promotions/_repo_items.html.haml
    M src/app/views/promotions/show.html.haml
    M src/config/assets.yml
    A src/db/migrate/20121121185801_remove_filters.rb
    A src/db/migrate/20121127191652_remove_filters_permissions.rb
    M src/lib/navigation/content_management.rb
    R src/public/javascripts/filters.js
    M src/public/javascripts/promotion.js
    M src/public/javascripts/widgets/tipsy.custom.js
    R src/spec/controllers/api/filters_controller_spec.rb
    R src/spec/controllers/filters_controller_spec.rb
    R src/test/fixtures/models/filters.yml
    R src/test/fixtures/models/filters_repositories.yml

  Log Message:
  -----------
  Wiped out other filter related artifacts


  Commit: 3e7950f5065e7f79459b6110676d591ee48a0189
      https://github.com/Katello/katello/commit/3e7950f5065e7f79459b6110676d591ee48a0189
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    R cli/src/katello/client/api/filter.py
    M cli/src/katello/client/api/product.py
    M cli/src/katello/client/api/repo.py
    M cli/src/katello/client/api/utils.py
    R cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/main.py
    R cli/test/katello/tests/core/filter/__init__.py
    R cli/test/katello/tests/core/filter/filter_add_package_test.py
    R cli/test/katello/tests/core/filter/filter_create_test.py
    R cli/test/katello/tests/core/filter/filter_data.py
    R cli/test/katello/tests/core/filter/filter_delete_test.py
    R cli/test/katello/tests/core/filter/filter_info_test.py
    R cli/test/katello/tests/core/filter/filter_list_test.py
    R cli/test/katello/tests/core/filter/filter_remove_package_test.py
    R cli/test/katello/tests/core/filter/filter_update_test.py
    R cli/test/katello/tests/core/product/product_add_remove_filter_test.py
    R cli/test/katello/tests/core/product/product_list_filter_test.py
    R cli/test/katello/tests/core/repo/repo_add_remove_filter_test.py
    R cli/test/katello/tests/core/repo/repo_list_filters_test.py
    M src/config/routes.rb

  Log Message:
  -----------
  Removed filters from the cli


  Commit: fcf3e61e32ba14bd22d0f43151bf49bb35d9d7cc
      https://github.com/Katello/katello/commit/fcf3e61e32ba14bd22d0f43151bf49bb35d9d7cc
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M scripts/system-test/cli_tests/_base_cleanup.sh
    M scripts/system-test/cli_tests/_base_setup.sh
    R scripts/system-test/cli_tests/filter.sh
    M scripts/system-test/cli_tests/product.sh
    M scripts/system-test/cli_tests/repo.sh

  Log Message:
  -----------
  Removing filter entries in the cli-system tests


  Commit: 7a9d9bfb3e30070079f0b779c2c684eb8c0e939f
      https://github.com/Katello/katello/commit/7a9d9bfb3e30070079f0b779c2c684eb8c0e939f
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    R src/db/migrate/20111006103843_create_filters.rb
    R src/db/migrate/20111014083338_filters_products.rb
    R src/db/migrate/20120123132008_filters_repositories.rb
    R src/db/migrate/20120330192143_filter_add_name.rb
    M src/db/migrate/20120820145108_add_db_indexes.rb
    M src/db/migrate/20120820203952_db_unique_indices.rb
    R src/db/migrate/20120910183801_filter_add_description.rb
    R src/db/migrate/20120910185505_filter_packages.rb
    M src/db/migrate/20121121185801_remove_filters.rb

  Log Message:
  -----------
  Modified the migration scripts to work for a fresh install

Basically removed all migration scripts that would create a filters table
since that concept no longer exists in Katello


  Commit: ce2be86fcc005708a5f36740c8e9e5bd8471b06e
      https://github.com/Katello/katello/commit/ce2be86fcc005708a5f36740c8e9e5bd8471b06e
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M src/public/javascripts/routes.js

  Log Message:
  -----------
  Updated js routes after removing filters


  Commit: 7b6a14d86623add6fc484e3f1973c50f81a66bcf
      https://github.com/Katello/katello/commit/7b6a14d86623add6fc484e3f1973c50f81a66bcf
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M cli/test/katello/tests/core/changeset/changeset_create_test.py
    M cli/test/katello/tests/core/repo/repo_data.py

  Log Message:
  -----------
  Removed filter related tests from cli


  Commit: b1e0206f64abcc34a1b44ad4d40dbf6242e67929
      https://github.com/Katello/katello/commit/b1e0206f64abcc34a1b44ad4d40dbf6242e67929
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M src/db/migrate/20121121185801_remove_filters.rb

  Log Message:
  -----------
  Removed a typo that got added in the previous migration commit


  Commit: 019cc2a918ade83a96810efc377e8d4874575567
      https://github.com/Katello/katello/commit/019cc2a918ade83a96810efc377e8d4874575567
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M src/test/models/authorization/authorization_base.rb
    R src/test/models/authorization/filter_authorization_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb

  Log Message:
  -----------
  Fixed some unit test failures


  Commit: 3edaabcea0ff7fcc232aee7b72da8ef345eef2a7
      https://github.com/Katello/katello/commit/3edaabcea0ff7fcc232aee7b72da8ef345eef2a7
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    R cli/src/katello/client/api/filter.py
    M cli/src/katello/client/api/product.py
    M cli/src/katello/client/api/repo.py
    M cli/src/katello/client/api/utils.py
    R cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/main.py
    M cli/test/katello/tests/core/changeset/changeset_create_test.py
    R cli/test/katello/tests/core/filter/__init__.py
    R cli/test/katello/tests/core/filter/filter_add_package_test.py
    R cli/test/katello/tests/core/filter/filter_create_test.py
    R cli/test/katello/tests/core/filter/filter_data.py
    R cli/test/katello/tests/core/filter/filter_delete_test.py
    R cli/test/katello/tests/core/filter/filter_info_test.py
    R cli/test/katello/tests/core/filter/filter_list_test.py
    R cli/test/katello/tests/core/filter/filter_remove_package_test.py
    R cli/test/katello/tests/core/filter/filter_update_test.py
    R cli/test/katello/tests/core/product/product_add_remove_filter_test.py
    R cli/test/katello/tests/core/product/product_list_filter_test.py
    R cli/test/katello/tests/core/repo/repo_add_remove_filter_test.py
    M cli/test/katello/tests/core/repo/repo_data.py
    R cli/test/katello/tests/core/repo/repo_list_filters_test.py
    M scripts/system-test/cli_tests/_base_cleanup.sh
    M scripts/system-test/cli_tests/_base_setup.sh
    R scripts/system-test/cli_tests/filter.sh
    M scripts/system-test/cli_tests/product.sh
    M scripts/system-test/cli_tests/repo.sh
    R src/app/controllers/api/filters_controller.rb
    M src/app/controllers/changesets_controller.rb
    R src/app/controllers/filters_controller.rb
    M src/app/controllers/system_group_packages_controller.rb
    M src/app/helpers/promotions_helper.rb
    R src/app/models/authorization/filter.rb
    M src/app/models/changeset_erratum.rb
    R src/app/models/filter.rb
    R src/app/models/filter_package.rb
    R src/app/models/glue/elastic_search/filter.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/organization.rb
    M src/app/models/permission.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/repository.rb
    M src/app/models/resource_type.rb
    R src/app/views/filters/_edit.html.haml
    R src/app/views/filters/_new.html.haml
    R src/app/views/filters/_packages.html.haml
    R src/app/views/filters/_products.html.haml
    R src/app/views/filters/index.html.haml
    M src/app/views/promotions/_product.html.haml
    M src/app/views/promotions/_repo_items.html.haml
    M src/app/views/promotions/show.html.haml
    M src/config/assets.yml
    M src/config/routes.rb
    R src/db/migrate/20111006103843_create_filters.rb
    R src/db/migrate/20111014083338_filters_products.rb
    R src/db/migrate/20120123132008_filters_repositories.rb
    R src/db/migrate/20120330192143_filter_add_name.rb
    M src/db/migrate/20120820145108_add_db_indexes.rb
    M src/db/migrate/20120820203952_db_unique_indices.rb
    R src/db/migrate/20120910183801_filter_add_description.rb
    R src/db/migrate/20120910185505_filter_packages.rb
    A src/db/migrate/20121121185801_remove_filters.rb
    A src/db/migrate/20121127191652_remove_filters_permissions.rb
    M src/lib/navigation/content_management.rb
    R src/public/javascripts/filters.js
    M src/public/javascripts/promotion.js
    M src/public/javascripts/routes.js
    M src/public/javascripts/widgets/tipsy.custom.js
    R src/spec/controllers/api/filters_controller_spec.rb
    R src/spec/controllers/filters_controller_spec.rb
    R src/test/fixtures/models/filters.yml
    R src/test/fixtures/models/filters_repositories.yml
    M src/test/models/authorization/authorization_base.rb
    R src/test/models/authorization/filter_authorization_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb

  Log Message:
  -----------
  Merge pull request #1165 from parthaa/bye-bye-filters

Bye bye filters


  Commit: fa0ae40ec3b94a4e33a73909ef6f0bcedfe9fc4b
      https://github.com/Katello/katello/commit/fa0ae40ec3b94a4e33a73909ef6f0bcedfe9fc4b
  Author: Brad Buckingham <bbuckingham@redhat.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M agent/etc/gofer/plugins/katelloplugin.conf
    M agent/katello-agent.spec
    M agent/src/katello/agent/katelloplugin.py

  Log Message:
  -----------
  Merge pull request #923 from jortel/pulpv2

Refit agent for pulp v2.


  Commit: d9907649781bc053f089c686f4642eaf650c5c9a
      https://github.com/Katello/katello/commit/d9907649781bc053f089c686f4642eaf650c5c9a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py

  Log Message:
  -----------
  pylint fixes


  Commit: c5ee8837717c432f5d3a5de10fddc5967287d7f0
      https://github.com/Katello/katello/commit/c5ee8837717c432f5d3a5de10fddc5967287d7f0
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M cli/test/katello/tests/core/product/product_create_test.py
    M cli/test/katello/tests/core/repo/repo_discovery_test.py

  Log Message:
  -----------
  cli test fixes


  Commit: e897897a1b284d9b5971f8c89e41e5732504494a
      https://github.com/Katello/katello/commit/e897897a1b284d9b5971f8c89e41e5732504494a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M src/lib/repo_discovery.rb

  Log Message:
  -----------
  comment update


  Commit: 07f9ff9e2ed9a24ade53e37026b4454a309c889b
      https://github.com/Katello/katello/commit/07f9ff9e2ed9a24ade53e37026b4454a309c889b
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb

  Log Message:
  -----------
  spec test update


  Commit: 2bb255520d671c61909fb2209d24c5bba25de11b
      https://github.com/Katello/katello/commit/2bb255520d671c61909fb2209d24c5bba25de11b
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  adding new gem for web crawling


  Commit: 09ba9e1ed97cfff5a6a20f411fd74418df5eb7cc
      https://github.com/Katello/katello/commit/09ba9e1ed97cfff5a6a20f411fd74418df5eb7cc
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M src/Gemfile

  Log Message:
  -----------
  fixing mistaken comment in Gemfile


  Commit: 6db4174f919dc66edaeda692a75287304f3a08dd
      https://github.com/Katello/katello/commit/6db4174f919dc66edaeda692a75287304f3a08dd
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M src/lib/repo_discovery.rb
    M src/lib/tasks/test.rake
    A src/test/lib/repo_discovery_test.rb

  Log Message:
  -----------
  adding file based repo discovery test, fixing small file based issue


  Commit: 54f1b367f13473b5c97097145c49b10ef6ba5f6b
      https://github.com/Katello/katello/commit/54f1b367f13473b5c97097145c49b10ef6ba5f6b
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M src/test/lib/repo_discovery_test.rb

  Log Message:
  -----------
  changing assert to assert_equals


  Commit: f384711d68b1cfab566822defbb6ef990b68b071
      https://github.com/Katello/katello/commit/f384711d68b1cfab566822defbb6ef990b68b071
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2012-12-16 (Sun, 16 Dec 2012)

  Changed paths:
    M cli/src/katello/client/api/provider.py
    M cli/src/katello/client/api/repo.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py
    M cli/test/katello/tests/core/product/product_create_test.py
    M cli/test/katello/tests/core/repo/repo_discovery_test.py
    M src/Gemfile
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/models/provider.rb
    M src/config/routes.rb
    A src/db/migrate/20121129223138_provider_add_repo_generation.rb
    M src/katello.spec
    A src/lib/repo_discovery.rb
    M src/lib/tasks/test.rake
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    A src/test/lib/repo_discovery_test.rb

  Log Message:
  -----------
  Merge pull request #1260 from jlsherrill/pulpv2

Pulpv2  - Repo Auto Discovery


  Commit: bcb32eecca91c9b67481149f0de912c7a54351f5
      https://github.com/Katello/katello/commit/bcb32eecca91c9b67481149f0de912c7a54351f5
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-12-17 (Mon, 17 Dec 2012)

  Changed paths:
    M src/app/controllers/providers_controller.rb
    M src/config/assets.yml
    M src/config/routes.rb
    M src/lib/navigation/content_management.rb
    M src/public/javascripts/provider.js

  Log Message:
  -----------
  initial repo discovery UI

Discovery works, no repo creation


  Commit: be22aec0d2c51daa73010ab26134376fd9241996
      https://github.com/Katello/katello/commit/be22aec0d2c51daa73010ab26134376fd9241996
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-12-17 (Mon, 17 Dec 2012)

  Changed paths:
    M .gitmodules
    M agent/katello-agent.spec
    M certs-tools/katello-certs-tools.spec
    A cli/bin/_complete_katello
    M cli/bin/katello-debug-certificates
    A cli/etc/katello.completion.sh
    M cli/katello-cli.spec
    A cli/src/katello/client/api/smart_proxy.py
    A cli/src/katello/client/completion.py
    M cli/src/katello/client/core/activation_key.py
    M cli/src/katello/client/core/errata.py
    A cli/src/katello/client/core/smart_proxy.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/shell.py
    M cli/src/katello/client/utils/option_validator.py
    M katello-configure/bin/katello-configure
    A katello-configure/bin/katello-configure-answer
    R katello-configure/bin/katello-passwd
    A katello-configure/bin/katello-passwd
    M katello-configure/bin/katello-upgrade
    M katello-configure/katello-configure.spec
    M katello-configure/lib/util/functions.rb
    A katello-configure/man/katello-configure-answer.pod
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/templates/httpd.conf.erb
    M katello-configure/modules/foreman/templates/thin.yml.erb
    M katello-configure/modules/katello/templates/etc/sysconfig/katello.erb
    M katello-configure/upgrade-scripts/0390_migrate_candlepin.sh
    M katello-utils/katello-utils.spec
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/packages/katello
    M rel-eng/packages/katello-cli
    M rel-eng/packages/katello-cli-tests
    M rel-eng/packages/katello-configure
    M rel-eng/packages/katello-repos
    M repos/katello-repos.spec
    M scripts/ci/katello_pull_request_tests.sh
    M scripts/cli_generator/generate.py
    M scripts/cli_generator/templates/action.py
    M scripts/cli_generator/templates/api.py
    M scripts/cli_generator/templates/command.py
    M scripts/gemfile-lock-install
    M scripts/system-test/cli-system-test
    M scripts/system-test/cli_tests/_base_setup.sh
    M scripts/system-test/cli_tests/architecture.sh
    M scripts/system-test/cli_tests/katello_agent.sh
    M scripts/system-test/cli_tests/provider_import.sh
    M scripts/system-test/cli_tests/rhsm.sh
    A scripts/system-test/cli_tests/smart_proxy.sh
    M scripts/system-test/katello-cli-tests.spec
    M selinux/katello-selinux/katello-selinux.spec
    M src/Gemfile
    M src/app/controllers/api/activation_keys_controller.rb
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/environments_controller.rb
    A src/app/controllers/api/foreman/smart_proxies_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/proxies_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/templates_content_controller.rb
    M src/app/controllers/api/templates_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/application_info_controller.rb
    M src/app/controllers/content_search_controller.rb
    R src/app/controllers/domains_controller.rb
    M src/app/controllers/environments_controller.rb
    A src/app/controllers/foreman/architectures_controller.rb
    A src/app/controllers/foreman/domains_controller.rb
    A src/app/controllers/foreman/subnets_controller.rb
    M src/app/controllers/gpg_keys_controller.rb
    M src/app/controllers/notices_controller.rb
    M src/app/controllers/password_resets_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/simple_crud_controller.rb
    R src/app/controllers/subnets_controller.rb
    M src/app/controllers/subscriptions_controller.rb
    M src/app/controllers/systems_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    A src/app/helpers/alchemy
    M src/app/helpers/application_helper.rb
    R src/app/helpers/converge_ui
    M src/app/helpers/foreman_helper.rb
    M src/app/helpers/layout_helper.rb
    M src/app/models/activation_key.rb
    M src/app/models/async_operation.rb
    M src/app/models/authorization/repository.rb
    M src/app/models/changeset.rb
    M src/app/models/foreman/architecture.rb
    M src/app/models/foreman/config_template.rb
    A src/app/models/foreman/operating_system.rb
    M src/app/models/glue/candlepin/pool.rb
    M src/app/models/glue/elastic_search/pool.rb
    M src/app/models/glue/provider.rb
    M src/app/models/katello_name_format_validator.rb
    M src/app/models/kt_environment.rb
    M src/app/models/organization.rb
    M src/app/models/ping.rb
    M src/app/models/pool.rb
    M src/app/models/product.rb
    M src/app/models/repository.rb
    M src/app/models/system.rb
    M src/app/stylesheets/_katello_base.scss
    M src/app/stylesheets/_katello_colors.scss
    A src/app/stylesheets/_katello_mixins.scss
    M src/app/stylesheets/_katello_vars.scss
    M src/app/stylesheets/_look.scss
    M src/app/stylesheets/_menu.scss
    A src/app/stylesheets/_overrides.scss
    A src/app/stylesheets/alchemy
    R src/app/stylesheets/converge-ui
    M src/app/stylesheets/fancyqueries.scss
    M src/app/stylesheets/katello.scss
    M src/app/stylesheets/sections/content_search.scss
    M src/app/stylesheets/sections/contents.scss
    M src/app/stylesheets/sections/dashboard.scss
    M src/app/stylesheets/sections/loginpage.scss
    M src/app/stylesheets/sections/notifications.scss
    M src/app/stylesheets/sections/operations.scss
    M src/app/stylesheets/sections/systems.scss
    M src/app/stylesheets/sections/tabs.scss
    M src/app/stylesheets/widgets/_env_select.scss
    M src/app/stylesheets/widgets/_multiselect.scss
    M src/app/stylesheets/widgets/_org_switcher.scss
    M src/app/stylesheets/widgets/_search.scss
    M src/app/stylesheets/widgets/_slidingtree.scss
    M src/app/stylesheets/widgets/path_selector.scss
    M src/app/views/activation_keys/_applied_subscriptions.html.haml
    M src/app/views/activation_keys/_available_subscriptions.html.haml
    M src/app/views/activation_keys/_edit.html.haml
    M src/app/views/activation_keys/_new.html.haml
    M src/app/views/activation_keys/_subscriptions.html.haml
    A src/app/views/alchemy
    M src/app/views/application_info/about.html.haml
    M src/app/views/common/_env_select.html.haml
    M src/app/views/common/_panel.html.haml
    R src/app/views/common/user_session.haml
    M src/app/views/content_search/_grid.html.haml
    M src/app/views/dashboard/_subscriptions.haml
    M src/app/views/dashboard/index.html.haml
    R src/app/views/domains/_edit.html.haml
    R src/app/views/domains/_new.html.haml
    R src/app/views/domains/index.html.haml
    A src/app/views/foreman/architectures/_edit.html.haml
    A src/app/views/foreman/architectures/_new.html.haml
    A src/app/views/foreman/architectures/index.html.haml
    A src/app/views/foreman/domains/_edit.html.haml
    A src/app/views/foreman/domains/_new.html.haml
    A src/app/views/foreman/domains/index.html.haml
    A src/app/views/foreman/subnets/_edit.html.haml
    A src/app/views/foreman/subnets/_new.html.haml
    A src/app/views/foreman/subnets/index.html.haml
    M src/app/views/gpg_keys/_edit.html.haml
    M src/app/views/gpg_keys/_products_repos.html.haml
    A src/app/views/layouts/alchemy
    R src/app/views/layouts/converge-ui
    M src/app/views/layouts/katello.haml
    A src/app/views/layouts/user_session.haml
    M src/app/views/notices/show.html.haml
    M src/app/views/organizations/_edit.html.haml
    M src/app/views/organizations/_events.html.haml
    A src/app/views/password_resets/_password_refresh.js.haml
    A src/app/views/password_resets/_username_refresh.js.haml
    M src/app/views/promotions/show.html.haml
    M src/app/views/providers/_edit.html.haml
    M src/app/views/providers/_products_repos.html.haml
    M src/app/views/roles/index.html.haml
    R src/app/views/subnets/_edit.html.haml
    R src/app/views/subnets/_new.html.haml
    R src/app/views/subnets/index.html.haml
    M src/app/views/subscriptions/_history_items.html.haml
    M src/app/views/subscriptions/_list_subscription_show.html.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/sync_schedules/index.html.haml
    M src/app/views/system_groups/_systems.html.haml
    M src/app/views/systems/_actions.html.haml
    A src/app/views/user_sessions/new.html.haml
    M src/app/views/users/_edit_environment.html.haml
    A src/bundler.d/build.rb
    A src/bundler.d/checking.rb
    A src/bundler.d/coverage.rb
    A src/bundler.d/debugging.rb
    A src/bundler.d/development.rb
    A src/bundler.d/development_boost.rb
    A src/bundler.d/foreman.rb
    A src/bundler.d/profiling.rb
    A src/bundler.d/test.rb
    M src/config/application.rb
    M src/config/assets.yml
    R src/config/environments/apipie.rb
    A src/config/environments/build.rb
    M src/config/environments/development.rb
    M src/config/environments/test.rb
    M src/config/initializers/apipie.rb
    M src/config/locales/ja.yml
    M src/config/locales/pt-BR.yml
    M src/config/locales/pt-PT.yml
    M src/config/locales/zh-CN.yml
    M src/config/locales/zh-TW.yml
    M src/config/routes.rb
    M src/deploy/common/katello-jobs.init
    R src/deploy/common/katello.completion.sh
    M src/deploy/common/katello.init
    M src/deploy/common/katello.sysconfig
    M src/deploy/common/thin.yml
    M src/gemfiles/Gemfile.f16.lock
    M src/gemfiles/Gemfile.f17.lock
    R src/gemfiles/Gemfile.lock
    M src/katello.spec
    M src/lib/navigation/administration.rb
    M src/lib/navigation/content_management.rb
    M src/lib/navigation/main.rb
    M src/lib/navigation/organization.rb
    M src/lib/navigation/setup.rb
    M src/lib/navigation/systems.rb
    M src/lib/resources/abstract_model.rb
    M src/lib/resources/candlepin.rb
    M src/lib/resources/foreman_model.rb
    R src/public/fonts
    A src/public/fonts/alchemy
    A src/public/images/alchemy
    R src/public/images/converge-ui
    A src/public/javascripts/alchemy
    A src/public/javascripts/architecture.js
    R src/public/javascripts/converge-ui
    M src/public/javascripts/jquery.jeditable.helpers.js
    M src/public/javascripts/notices.js
    M src/public/javascripts/panel.js
    M src/public/javascripts/product_edit.js
    M src/public/javascripts/role_sliding_tree.js
    M src/public/javascripts/routes.js
    M src/public/javascripts/slidingtree.js
    M src/public/javascripts/systems.js
    A src/public/javascripts/vendor
    M src/public/javascripts/widgets/comparison_grid.js
    M src/script/check-gettext.rb
    M src/script/katello-debug
    M src/script/katello-service
    M src/spec/controllers/api/foreman/architectures_controller_spec.rb
    M src/spec/controllers/api/foreman/config_templates_controller_spec.rb
    M src/spec/controllers/api/foreman/domains_controller_spec.rb
    A src/spec/controllers/api/foreman/smart_proxies_controller_spec.rb
    M src/spec/controllers/password_resets_controller_spec.rb
    M src/spec/controllers/products_controller_spec.rb
    M src/spec/lib/resources/foreman_model_spec.rb
    M src/spec/models/glue/foreman/user_spec.rb
    M src/spec/models/organization_spec.rb
    A src/vendor/alchemy
    R src/vendor/converge-ui

  Log Message:
  -----------
  Merging master to pulpv2

Conflicts:
	src/Gemfile
	src/app/controllers/api/filters_controller.rb
	src/app/models/pool.rb
	src/app/models/repository.rb
	src/config/assets.yml
	src/config/environments/development.rb
	src/gemfiles/Gemfile.f16.lock
	src/katello.spec
	src/lib/navigation/content_management.rb
	src/public/javascripts/routes.js
	src/vendor/converge-ui


  Commit: a300c4b1b3732ed3758358f34e79dedb470fa748
      https://github.com/Katello/katello/commit/a300c4b1b3732ed3758358f34e79dedb470fa748
  Author: Partha Aji <paji@redhat.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M cli/katello-cli.spec
    M katello-configure/bin/katello-configure
    M katello-configure/katello-configure.spec
    M katello-configure/modules/foreman/manifests/config.pp
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/packages/katello
    M rel-eng/packages/katello-cli
    M rel-eng/packages/katello-cli-tests
    M rel-eng/packages/katello-configure
    M rel-eng/packages/katello-repos
    M repos/katello-repos.spec
    M scripts/system-test/katello-cli-tests.spec
    M src/app/controllers/users_controller.rb
    M src/katello.spec
    M src/public/javascripts/katello.js

  Log Message:
  -----------
  Merge branch 'master' into merge-to-v2


  Commit: 4659fe8cd70b016c8589c51970dc9112d7385bd3
      https://github.com/Katello/katello/commit/4659fe8cd70b016c8589c51970dc9112d7385bd3
  Author: Partha Aji <parthaa@gmail.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M .gitmodules
    M agent/katello-agent.spec
    M certs-tools/katello-certs-tools.spec
    A cli/bin/_complete_katello
    M cli/bin/katello-debug-certificates
    A cli/etc/katello.completion.sh
    M cli/katello-cli.spec
    A cli/src/katello/client/api/smart_proxy.py
    A cli/src/katello/client/completion.py
    M cli/src/katello/client/core/activation_key.py
    M cli/src/katello/client/core/errata.py
    A cli/src/katello/client/core/smart_proxy.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/shell.py
    M cli/src/katello/client/utils/option_validator.py
    M katello-configure/bin/katello-configure
    A katello-configure/bin/katello-configure-answer
    R katello-configure/bin/katello-passwd
    A katello-configure/bin/katello-passwd
    M katello-configure/bin/katello-upgrade
    M katello-configure/katello-configure.spec
    M katello-configure/lib/util/functions.rb
    A katello-configure/man/katello-configure-answer.pod
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/templates/httpd.conf.erb
    M katello-configure/modules/foreman/templates/thin.yml.erb
    M katello-configure/modules/katello/templates/etc/sysconfig/katello.erb
    M katello-configure/upgrade-scripts/0390_migrate_candlepin.sh
    M katello-utils/katello-utils.spec
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/packages/katello
    M rel-eng/packages/katello-cli
    M rel-eng/packages/katello-cli-tests
    M rel-eng/packages/katello-configure
    M rel-eng/packages/katello-repos
    M repos/katello-repos.spec
    M scripts/ci/katello_pull_request_tests.sh
    M scripts/cli_generator/generate.py
    M scripts/cli_generator/templates/action.py
    M scripts/cli_generator/templates/api.py
    M scripts/cli_generator/templates/command.py
    M scripts/gemfile-lock-install
    M scripts/system-test/cli-system-test
    M scripts/system-test/cli_tests/_base_setup.sh
    M scripts/system-test/cli_tests/architecture.sh
    M scripts/system-test/cli_tests/katello_agent.sh
    M scripts/system-test/cli_tests/provider_import.sh
    M scripts/system-test/cli_tests/rhsm.sh
    A scripts/system-test/cli_tests/smart_proxy.sh
    M scripts/system-test/katello-cli-tests.spec
    M selinux/katello-selinux/katello-selinux.spec
    M src/Gemfile
    M src/app/controllers/api/activation_keys_controller.rb
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/environments_controller.rb
    A src/app/controllers/api/foreman/smart_proxies_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/proxies_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/templates_content_controller.rb
    M src/app/controllers/api/templates_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/application_info_controller.rb
    M src/app/controllers/content_search_controller.rb
    R src/app/controllers/domains_controller.rb
    M src/app/controllers/environments_controller.rb
    A src/app/controllers/foreman/architectures_controller.rb
    A src/app/controllers/foreman/domains_controller.rb
    A src/app/controllers/foreman/subnets_controller.rb
    M src/app/controllers/gpg_keys_controller.rb
    M src/app/controllers/notices_controller.rb
    M src/app/controllers/password_resets_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/simple_crud_controller.rb
    R src/app/controllers/subnets_controller.rb
    M src/app/controllers/subscriptions_controller.rb
    M src/app/controllers/systems_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    M src/app/controllers/users_controller.rb
    A src/app/helpers/alchemy
    M src/app/helpers/application_helper.rb
    R src/app/helpers/converge_ui
    M src/app/helpers/foreman_helper.rb
    M src/app/helpers/layout_helper.rb
    M src/app/models/activation_key.rb
    M src/app/models/async_operation.rb
    M src/app/models/authorization/repository.rb
    M src/app/models/changeset.rb
    M src/app/models/foreman/architecture.rb
    M src/app/models/foreman/config_template.rb
    A src/app/models/foreman/operating_system.rb
    M src/app/models/glue/candlepin/pool.rb
    M src/app/models/glue/elastic_search/pool.rb
    M src/app/models/glue/provider.rb
    M src/app/models/katello_name_format_validator.rb
    M src/app/models/kt_environment.rb
    M src/app/models/organization.rb
    M src/app/models/ping.rb
    M src/app/models/pool.rb
    M src/app/models/product.rb
    M src/app/models/repository.rb
    M src/app/models/system.rb
    M src/app/stylesheets/_katello_base.scss
    M src/app/stylesheets/_katello_colors.scss
    A src/app/stylesheets/_katello_mixins.scss
    M src/app/stylesheets/_katello_vars.scss
    M src/app/stylesheets/_look.scss
    M src/app/stylesheets/_menu.scss
    A src/app/stylesheets/_overrides.scss
    A src/app/stylesheets/alchemy
    R src/app/stylesheets/converge-ui
    M src/app/stylesheets/fancyqueries.scss
    M src/app/stylesheets/katello.scss
    M src/app/stylesheets/sections/content_search.scss
    M src/app/stylesheets/sections/contents.scss
    M src/app/stylesheets/sections/dashboard.scss
    M src/app/stylesheets/sections/loginpage.scss
    M src/app/stylesheets/sections/notifications.scss
    M src/app/stylesheets/sections/operations.scss
    M src/app/stylesheets/sections/systems.scss
    M src/app/stylesheets/sections/tabs.scss
    M src/app/stylesheets/widgets/_env_select.scss
    M src/app/stylesheets/widgets/_multiselect.scss
    M src/app/stylesheets/widgets/_org_switcher.scss
    M src/app/stylesheets/widgets/_search.scss
    M src/app/stylesheets/widgets/_slidingtree.scss
    M src/app/stylesheets/widgets/path_selector.scss
    M src/app/views/activation_keys/_applied_subscriptions.html.haml
    M src/app/views/activation_keys/_available_subscriptions.html.haml
    M src/app/views/activation_keys/_edit.html.haml
    M src/app/views/activation_keys/_new.html.haml
    M src/app/views/activation_keys/_subscriptions.html.haml
    A src/app/views/alchemy
    M src/app/views/application_info/about.html.haml
    M src/app/views/common/_env_select.html.haml
    M src/app/views/common/_panel.html.haml
    R src/app/views/common/user_session.haml
    M src/app/views/content_search/_grid.html.haml
    M src/app/views/dashboard/_subscriptions.haml
    M src/app/views/dashboard/index.html.haml
    R src/app/views/domains/_edit.html.haml
    R src/app/views/domains/_new.html.haml
    R src/app/views/domains/index.html.haml
    A src/app/views/foreman/architectures/_edit.html.haml
    A src/app/views/foreman/architectures/_new.html.haml
    A src/app/views/foreman/architectures/index.html.haml
    A src/app/views/foreman/domains/_edit.html.haml
    A src/app/views/foreman/domains/_new.html.haml
    A src/app/views/foreman/domains/index.html.haml
    A src/app/views/foreman/subnets/_edit.html.haml
    A src/app/views/foreman/subnets/_new.html.haml
    A src/app/views/foreman/subnets/index.html.haml
    M src/app/views/gpg_keys/_edit.html.haml
    M src/app/views/gpg_keys/_products_repos.html.haml
    A src/app/views/layouts/alchemy
    R src/app/views/layouts/converge-ui
    M src/app/views/layouts/katello.haml
    A src/app/views/layouts/user_session.haml
    M src/app/views/notices/show.html.haml
    M src/app/views/organizations/_edit.html.haml
    M src/app/views/organizations/_events.html.haml
    A src/app/views/password_resets/_password_refresh.js.haml
    A src/app/views/password_resets/_username_refresh.js.haml
    M src/app/views/promotions/show.html.haml
    M src/app/views/providers/_edit.html.haml
    M src/app/views/providers/_products_repos.html.haml
    M src/app/views/roles/index.html.haml
    R src/app/views/subnets/_edit.html.haml
    R src/app/views/subnets/_new.html.haml
    R src/app/views/subnets/index.html.haml
    M src/app/views/subscriptions/_history_items.html.haml
    M src/app/views/subscriptions/_list_subscription_show.html.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/sync_schedules/index.html.haml
    M src/app/views/system_groups/_systems.html.haml
    M src/app/views/systems/_actions.html.haml
    A src/app/views/user_sessions/new.html.haml
    M src/app/views/users/_edit_environment.html.haml
    A src/bundler.d/build.rb
    A src/bundler.d/checking.rb
    A src/bundler.d/coverage.rb
    A src/bundler.d/debugging.rb
    A src/bundler.d/development.rb
    A src/bundler.d/development_boost.rb
    A src/bundler.d/foreman.rb
    A src/bundler.d/profiling.rb
    A src/bundler.d/test.rb
    M src/config/application.rb
    M src/config/assets.yml
    R src/config/environments/apipie.rb
    A src/config/environments/build.rb
    M src/config/environments/development.rb
    M src/config/environments/test.rb
    M src/config/initializers/apipie.rb
    M src/config/locales/ja.yml
    M src/config/locales/pt-BR.yml
    M src/config/locales/pt-PT.yml
    M src/config/locales/zh-CN.yml
    M src/config/locales/zh-TW.yml
    M src/config/routes.rb
    M src/deploy/common/katello-jobs.init
    R src/deploy/common/katello.completion.sh
    M src/deploy/common/katello.init
    M src/deploy/common/katello.sysconfig
    M src/deploy/common/thin.yml
    M src/gemfiles/Gemfile.f16.lock
    M src/gemfiles/Gemfile.f17.lock
    R src/gemfiles/Gemfile.lock
    M src/katello.spec
    M src/lib/navigation/administration.rb
    M src/lib/navigation/content_management.rb
    M src/lib/navigation/main.rb
    M src/lib/navigation/organization.rb
    M src/lib/navigation/setup.rb
    M src/lib/navigation/systems.rb
    M src/lib/resources/abstract_model.rb
    M src/lib/resources/candlepin.rb
    M src/lib/resources/foreman_model.rb
    R src/public/fonts
    A src/public/fonts/alchemy
    A src/public/images/alchemy
    R src/public/images/converge-ui
    A src/public/javascripts/alchemy
    A src/public/javascripts/architecture.js
    R src/public/javascripts/converge-ui
    M src/public/javascripts/jquery.jeditable.helpers.js
    M src/public/javascripts/katello.js
    M src/public/javascripts/notices.js
    M src/public/javascripts/panel.js
    M src/public/javascripts/product_edit.js
    M src/public/javascripts/role_sliding_tree.js
    M src/public/javascripts/routes.js
    M src/public/javascripts/slidingtree.js
    M src/public/javascripts/systems.js
    A src/public/javascripts/vendor
    M src/public/javascripts/widgets/comparison_grid.js
    M src/script/check-gettext.rb
    M src/script/katello-debug
    M src/script/katello-service
    M src/spec/controllers/api/foreman/architectures_controller_spec.rb
    M src/spec/controllers/api/foreman/config_templates_controller_spec.rb
    M src/spec/controllers/api/foreman/domains_controller_spec.rb
    A src/spec/controllers/api/foreman/smart_proxies_controller_spec.rb
    M src/spec/controllers/password_resets_controller_spec.rb
    M src/spec/controllers/products_controller_spec.rb
    M src/spec/lib/resources/foreman_model_spec.rb
    M src/spec/models/glue/foreman/user_spec.rb
    M src/spec/models/organization_spec.rb
    A src/vendor/alchemy
    R src/vendor/converge-ui

  Log Message:
  -----------
  Merge pull request #1270 from parthaa/master-to-v2

Master to v2


  Commit: 972461c6e37d4946bd3dc2ae58fdb4b2e82224d2
      https://github.com/Katello/katello/commit/972461c6e37d4946bd3dc2ae58fdb4b2e82224d2
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M src/app/models/async_operation.rb

  Log Message:
  -----------
  storing current task id within Thread.current

this allows a delayed job itself to know what its
task number is, enabling it to check to see if it needs to be
cancelled


  Commit: 42c59ed8ca6a9f31a34aec5d4093e5d33b8578ee
      https://github.com/Katello/katello/commit/42c59ed8ca6a9f31a34aec5d4093e5d33b8578ee
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M src/app/controllers/providers_controller.rb
    M src/app/models/provider.rb
    M src/app/models/task_status.rb
    A src/app/views/providers/_repo_discovery.html.haml
    M src/config/routes.rb
    A src/db/migrate/20121217160251_provider_add_discovery_task_id.rb
    M src/lib/repo_discovery.rb
    M src/public/javascripts/provider.js
    A src/public/javascripts/repo_discovery.js

  Log Message:
  -----------
  allowing cancellation of repo discovery


  Commit: 7b49330f2a446c918cf38ad27b39a98b50c5b675
      https://github.com/Katello/katello/commit/7b49330f2a446c918cf38ad27b39a98b50c5b675
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-03 (Thu, 03 Jan 2013)

  Changed paths:
    M src/app/controllers/products_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/repositories_controller.rb
    M src/app/models/environment_product.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/stylesheets/sections/contents.scss
    A src/app/views/providers/_new_discovered_repos.html.haml
    M src/app/views/providers/_repo_discovery.html.haml
    M src/config/assets.yml
    M src/config/routes.rb
    M src/public/javascripts/repo_discovery.js
    A src/public/javascripts/repo_discovery_create.js

  Log Message:
  -----------
  Initial Repo discovery & creation ui


  Commit: c17ac3861b13f82e8736cff5c436b23a3a190445
      https://github.com/Katello/katello/commit/c17ac3861b13f82e8736cff5c436b23a3a190445
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-03 (Thu, 03 Jan 2013)

  Changed paths:
    M src/app/controllers/providers_controller.rb
    M src/app/views/providers/_repo_discovery.html.haml
    M src/public/javascripts/repo_discovery.js

  Log Message:
  -----------
  adding filter table for repo discovery

and other cosmetic changes


  Commit: aa8707cb7206db32a216ec4ad9cb41997ad3b1d1
      https://github.com/Katello/katello/commit/aa8707cb7206db32a216ec4ad9cb41997ad3b1d1
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-04 (Fri, 04 Jan 2013)

  Changed paths:
    M src/app/stylesheets/sections/contents.scss
    M src/app/views/providers/_new_discovered_repos.html.haml

  Log Message:
  -----------
  repo discovery styling changes


  Commit: 966eeed0f60ee9a5d86947aba55a905919ad868c
      https://github.com/Katello/katello/commit/966eeed0f60ee9a5d86947aba55a905919ad868c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-04 (Fri, 04 Jan 2013)

  Changed paths:
    M src/app/models/repository.rb
    A src/db/migrate/20130104151248_repository_add_feed.rb

  Log Message:
  -----------
  pulling in repo feed url into db


  Commit: adfecbe68927d61632d030cec1bb87396e6699f0
      https://github.com/Katello/katello/commit/adfecbe68927d61632d030cec1bb87396e6699f0
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-04 (Fri, 04 Jan 2013)

  Changed paths:
    M src/app/controllers/providers_controller.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/stylesheets/sections/contents.scss
    M src/app/views/providers/_repo_discovery.html.haml
    M src/app/views/repositories/_edit.html.haml
    M src/public/javascripts/repo_discovery.js

  Log Message:
  -----------
  repo discovery - ui enhancements

adding checkmark and tooltip if repo url has
  already been created
lots of small spacing tweaks


  Commit: e34c4366949120eee25a44fb0bba6ae1a296a7bb
      https://github.com/Katello/katello/commit/e34c4366949120eee25a44fb0bba6ae1a296a7bb
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-04 (Fri, 04 Jan 2013)

  Changed paths:
    M src/app/helpers/providers_helper.rb

  Log Message:
  -----------
  helper cleanup


  Commit: 8c47f636c69c00c7ac78fe3de9a80644e293aec4
      https://github.com/Katello/katello/commit/8c47f636c69c00c7ac78fe3de9a80644e293aec4
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-04 (Fri, 04 Jan 2013)

  Changed paths:
    M src/app/stylesheets/sections/contents.scss
    M src/app/views/providers/_repo_discovery.html.haml
    M src/public/javascripts/repo_discovery.js

  Log Message:
  -----------
  repo discovery table ui tweaks


  Commit: 12ca08dbfd5bba8befc61ae6096d695adf452d32
      https://github.com/Katello/katello/commit/12ca08dbfd5bba8befc61ae6096d695adf452d32
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-04 (Fri, 04 Jan 2013)

  Changed paths:
    M src/app/helpers/providers_helper.rb
    M src/app/views/providers/_new_discovered_repos.html.haml

  Log Message:
  -----------
  prepopulating repo name and label based on url path


  Commit: acf88099fdbb4b271e86f41ae55eae6315b1abc7
      https://github.com/Katello/katello/commit/acf88099fdbb4b271e86f41ae55eae6315b1abc7
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-04 (Fri, 04 Jan 2013)

  Changed paths:
    M src/public/javascripts/repo_discovery.js

  Log Message:
  -----------
  fixing filter table to only match on first column


  Commit: 22d5341250776d253ed1470a07ae81a4345f167f
      https://github.com/Katello/katello/commit/22d5341250776d253ed1470a07ae81a4345f167f
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-05 (Sat, 05 Jan 2013)

  Changed paths:
    M src/app/stylesheets/katello.scss
    M src/public/javascripts/panel.js

  Log Message:
  -----------
  improving spacing and height of subpanel


  Commit: 4d5e694565ef73d886177d34e2942f21fd537783
      https://github.com/Katello/katello/commit/4d5e694565ef73d886177d34e2942f21fd537783
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-05 (Sat, 05 Jan 2013)

  Changed paths:
    M src/public/javascripts/repo_discovery.js

  Log Message:
  -----------
  fixing bug with url string


  Commit: 4e28021ce07dd51128b1c5658731b44a3d30519e
      https://github.com/Katello/katello/commit/4e28021ce07dd51128b1c5658731b44a3d30519e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M src/app/controllers/repositories_controller.rb
    M src/app/views/providers/_repo_discovery.html.haml
    M src/public/javascripts/repo_discovery.js

  Log Message:
  -----------
  repo discovery - few small ui tweaks


  Commit: 7efec3d1ad8140526a6ad88a1d7f483a6e89889b
      https://github.com/Katello/katello/commit/7efec3d1ad8140526a6ad88a1d7f483a6e89889b
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M src/spec/controllers/providers_controller_spec.rb

  Log Message:
  -----------
  repo discovery spec additions


  Commit: 9bdd4dc1cbb6b1430970b348aa8f7f581b59b4a5
      https://github.com/Katello/katello/commit/9bdd4dc1cbb6b1430970b348aa8f7f581b59b4a5
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M src/app/controllers/providers_controller.rb

  Log Message:
  -----------
  removing traces of unneeded action


  Commit: 4fa4fc0b6d97cd4b3db411b786acc2f004139380
      https://github.com/Katello/katello/commit/4fa4fc0b6d97cd4b3db411b786acc2f004139380
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/task_status.rb

  Log Message:
  -----------
  some small code fixes that never were meant to be committed


  Commit: 7696cd6355f5f0fa63a3b03cd859d84a6067be6b
      https://github.com/Katello/katello/commit/7696cd6355f5f0fa63a3b03cd859d84a6067be6b
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M src/app/controllers/providers_controller.rb

  Log Message:
  -----------
  calling appropriate render, since we really don't need anything


  Commit: 85dc008397d0e249f15fc1add175ec559f707a54
      https://github.com/Katello/katello/commit/85dc008397d0e249f15fc1add175ec559f707a54
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M src/db/migrate/20121217160251_provider_add_discovery_task_id.rb

  Log Message:
  -----------
  fixing indentation


  Commit: 3bdeeba0f29eecda55e691cb7306e69b965185bb
      https://github.com/Katello/katello/commit/3bdeeba0f29eecda55e691cb7306e69b965185bb
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M .gitmodules
    M agent/etc/gofer/plugins/katelloplugin.conf
    M agent/katello-agent.spec
    M agent/src/katello/agent/katelloplugin.py
    M certs-tools/katello-certs-tools.spec
    A cli/bin/_complete_katello
    M cli/bin/katello-debug-certificates
    A cli/etc/katello.completion.sh
    M cli/katello-cli.spec
    R cli/src/katello/client/api/filter.py
    M cli/src/katello/client/api/product.py
    M cli/src/katello/client/api/repo.py
    A cli/src/katello/client/api/smart_proxy.py
    M cli/src/katello/client/api/utils.py
    A cli/src/katello/client/completion.py
    M cli/src/katello/client/core/activation_key.py
    M cli/src/katello/client/core/errata.py
    R cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py
    A cli/src/katello/client/core/smart_proxy.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/shell.py
    M cli/src/katello/client/utils/option_validator.py
    M cli/test/katello/tests/core/changeset/changeset_create_test.py
    R cli/test/katello/tests/core/filter/__init__.py
    R cli/test/katello/tests/core/filter/filter_add_package_test.py
    R cli/test/katello/tests/core/filter/filter_create_test.py
    R cli/test/katello/tests/core/filter/filter_data.py
    R cli/test/katello/tests/core/filter/filter_delete_test.py
    R cli/test/katello/tests/core/filter/filter_info_test.py
    R cli/test/katello/tests/core/filter/filter_list_test.py
    R cli/test/katello/tests/core/filter/filter_remove_package_test.py
    R cli/test/katello/tests/core/filter/filter_update_test.py
    R cli/test/katello/tests/core/product/product_add_remove_filter_test.py
    R cli/test/katello/tests/core/product/product_list_filter_test.py
    R cli/test/katello/tests/core/repo/repo_add_remove_filter_test.py
    M cli/test/katello/tests/core/repo/repo_data.py
    R cli/test/katello/tests/core/repo/repo_list_filters_test.py
    M katello-configure/bin/katello-configure
    A katello-configure/bin/katello-configure-answer
    A katello-configure/bin/katello-passwd
    R katello-configure/bin/katello-passwd
    M katello-configure/bin/katello-upgrade
    M katello-configure/katello-configure.spec
    M katello-configure/lib/util/functions.rb
    A katello-configure/man/katello-configure-answer.pod
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/templates/httpd.conf.erb
    M katello-configure/modules/foreman/templates/thin.yml.erb
    M katello-configure/modules/katello/templates/etc/sysconfig/katello.erb
    M katello-configure/upgrade-scripts/0390_migrate_candlepin.sh
    M katello-utils/katello-utils.spec
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/packages/katello
    M rel-eng/packages/katello-cli
    M rel-eng/packages/katello-cli-tests
    M rel-eng/packages/katello-configure
    M rel-eng/packages/katello-repos
    M repos/katello-repos.spec
    M scripts/ci/katello_pull_request_tests.sh
    M scripts/cli_generator/generate.py
    M scripts/cli_generator/templates/action.py
    M scripts/cli_generator/templates/api.py
    M scripts/cli_generator/templates/command.py
    M scripts/gemfile-lock-install
    M scripts/system-test/cli-system-test
    M scripts/system-test/cli_tests/_base_cleanup.sh
    M scripts/system-test/cli_tests/_base_setup.sh
    M scripts/system-test/cli_tests/architecture.sh
    R scripts/system-test/cli_tests/filter.sh
    M scripts/system-test/cli_tests/katello_agent.sh
    M scripts/system-test/cli_tests/product.sh
    M scripts/system-test/cli_tests/provider_import.sh
    M scripts/system-test/cli_tests/repo.sh
    M scripts/system-test/cli_tests/rhsm.sh
    A scripts/system-test/cli_tests/smart_proxy.sh
    M scripts/system-test/katello-cli-tests.spec
    M selinux/katello-selinux/katello-selinux.spec
    M src/Gemfile
    M src/app/controllers/api/activation_keys_controller.rb
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/environments_controller.rb
    R src/app/controllers/api/filters_controller.rb
    A src/app/controllers/api/foreman/smart_proxies_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/proxies_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/templates_content_controller.rb
    M src/app/controllers/api/templates_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/application_info_controller.rb
    M src/app/controllers/changesets_controller.rb
    M src/app/controllers/content_search_controller.rb
    R src/app/controllers/domains_controller.rb
    M src/app/controllers/environments_controller.rb
    R src/app/controllers/filters_controller.rb
    A src/app/controllers/foreman/architectures_controller.rb
    A src/app/controllers/foreman/domains_controller.rb
    A src/app/controllers/foreman/subnets_controller.rb
    M src/app/controllers/gpg_keys_controller.rb
    M src/app/controllers/notices_controller.rb
    M src/app/controllers/password_resets_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/simple_crud_controller.rb
    R src/app/controllers/subnets_controller.rb
    M src/app/controllers/subscriptions_controller.rb
    M src/app/controllers/system_group_packages_controller.rb
    M src/app/controllers/systems_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    M src/app/controllers/users_controller.rb
    A src/app/helpers/alchemy
    M src/app/helpers/application_helper.rb
    R src/app/helpers/converge_ui
    M src/app/helpers/foreman_helper.rb
    M src/app/helpers/layout_helper.rb
    M src/app/helpers/promotions_helper.rb
    M src/app/models/activation_key.rb
    M src/app/models/async_operation.rb
    R src/app/models/authorization/filter.rb
    M src/app/models/authorization/repository.rb
    M src/app/models/changeset.rb
    M src/app/models/changeset_erratum.rb
    R src/app/models/filter.rb
    R src/app/models/filter_package.rb
    M src/app/models/foreman/architecture.rb
    M src/app/models/foreman/config_template.rb
    A src/app/models/foreman/operating_system.rb
    M src/app/models/glue/candlepin/pool.rb
    R src/app/models/glue/elastic_search/filter.rb
    M src/app/models/glue/elastic_search/pool.rb
    M src/app/models/glue/elastic_search/system.rb
    M src/app/models/glue/elastic_search/system_group.rb
    M src/app/models/glue/provider.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/models/glue/pulp/distribution.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/indexed_model.rb
    M src/app/models/katello_name_format_validator.rb
    M src/app/models/kt_environment.rb
    M src/app/models/organization.rb
    M src/app/models/permission.rb
    M src/app/models/ping.rb
    M src/app/models/pool.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/repository.rb
    M src/app/models/resource_type.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/stylesheets/_katello_base.scss
    M src/app/stylesheets/_katello_colors.scss
    A src/app/stylesheets/_katello_mixins.scss
    M src/app/stylesheets/_katello_vars.scss
    M src/app/stylesheets/_look.scss
    M src/app/stylesheets/_menu.scss
    A src/app/stylesheets/_overrides.scss
    A src/app/stylesheets/alchemy
    R src/app/stylesheets/converge-ui
    M src/app/stylesheets/fancyqueries.scss
    M src/app/stylesheets/katello.scss
    M src/app/stylesheets/sections/content_search.scss
    M src/app/stylesheets/sections/contents.scss
    M src/app/stylesheets/sections/dashboard.scss
    M src/app/stylesheets/sections/loginpage.scss
    M src/app/stylesheets/sections/notifications.scss
    M src/app/stylesheets/sections/operations.scss
    M src/app/stylesheets/sections/systems.scss
    M src/app/stylesheets/sections/tabs.scss
    M src/app/stylesheets/widgets/_env_select.scss
    M src/app/stylesheets/widgets/_multiselect.scss
    M src/app/stylesheets/widgets/_org_switcher.scss
    M src/app/stylesheets/widgets/_search.scss
    M src/app/stylesheets/widgets/_slidingtree.scss
    M src/app/stylesheets/widgets/path_selector.scss
    M src/app/views/activation_keys/_applied_subscriptions.html.haml
    M src/app/views/activation_keys/_available_subscriptions.html.haml
    M src/app/views/activation_keys/_edit.html.haml
    M src/app/views/activation_keys/_new.html.haml
    M src/app/views/activation_keys/_subscriptions.html.haml
    A src/app/views/alchemy
    M src/app/views/application_info/about.html.haml
    M src/app/views/common/_env_select.html.haml
    M src/app/views/common/_panel.html.haml
    R src/app/views/common/user_session.haml
    M src/app/views/content_search/_grid.html.haml
    M src/app/views/dashboard/_subscriptions.haml
    M src/app/views/dashboard/index.html.haml
    R src/app/views/domains/_edit.html.haml
    R src/app/views/domains/_new.html.haml
    R src/app/views/domains/index.html.haml
    R src/app/views/filters/_edit.html.haml
    R src/app/views/filters/_new.html.haml
    R src/app/views/filters/_packages.html.haml
    R src/app/views/filters/_products.html.haml
    R src/app/views/filters/index.html.haml
    A src/app/views/foreman/architectures/_edit.html.haml
    A src/app/views/foreman/architectures/_new.html.haml
    A src/app/views/foreman/architectures/index.html.haml
    A src/app/views/foreman/domains/_edit.html.haml
    A src/app/views/foreman/domains/_new.html.haml
    A src/app/views/foreman/domains/index.html.haml
    A src/app/views/foreman/subnets/_edit.html.haml
    A src/app/views/foreman/subnets/_new.html.haml
    A src/app/views/foreman/subnets/index.html.haml
    M src/app/views/gpg_keys/_edit.html.haml
    M src/app/views/gpg_keys/_products_repos.html.haml
    A src/app/views/layouts/alchemy
    R src/app/views/layouts/converge-ui
    M src/app/views/layouts/katello.haml
    A src/app/views/layouts/user_session.haml
    M src/app/views/notices/show.html.haml
    M src/app/views/organizations/_edit.html.haml
    M src/app/views/organizations/_events.html.haml
    A src/app/views/password_resets/_password_refresh.js.haml
    A src/app/views/password_resets/_username_refresh.js.haml
    M src/app/views/promotions/_product.html.haml
    M src/app/views/promotions/_repo_items.html.haml
    M src/app/views/promotions/show.html.haml
    M src/app/views/providers/_edit.html.haml
    M src/app/views/providers/_products_repos.html.haml
    M src/app/views/roles/index.html.haml
    R src/app/views/subnets/_edit.html.haml
    R src/app/views/subnets/_new.html.haml
    R src/app/views/subnets/index.html.haml
    M src/app/views/subscriptions/_history_items.html.haml
    M src/app/views/subscriptions/_list_subscription_show.html.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/sync_schedules/index.html.haml
    M src/app/views/system_groups/_systems.html.haml
    M src/app/views/systems/_actions.html.haml
    A src/app/views/user_sessions/new.html.haml
    M src/app/views/users/_edit_environment.html.haml
    A src/bundler.d/build.rb
    A src/bundler.d/checking.rb
    A src/bundler.d/coverage.rb
    A src/bundler.d/debugging.rb
    A src/bundler.d/development.rb
    A src/bundler.d/development_boost.rb
    A src/bundler.d/foreman.rb
    A src/bundler.d/profiling.rb
    A src/bundler.d/test.rb
    M src/config/application.rb
    M src/config/assets.yml
    R src/config/environments/apipie.rb
    A src/config/environments/build.rb
    M src/config/environments/development.rb
    M src/config/environments/test.rb
    M src/config/initializers/apipie.rb
    M src/config/locales/ja.yml
    M src/config/locales/pt-BR.yml
    M src/config/locales/pt-PT.yml
    M src/config/locales/zh-CN.yml
    M src/config/locales/zh-TW.yml
    M src/config/routes.rb
    R src/db/migrate/20111006103843_create_filters.rb
    R src/db/migrate/20111014083338_filters_products.rb
    R src/db/migrate/20120123132008_filters_repositories.rb
    R src/db/migrate/20120330192143_filter_add_name.rb
    M src/db/migrate/20120820145108_add_db_indexes.rb
    M src/db/migrate/20120820203952_db_unique_indices.rb
    R src/db/migrate/20120910183801_filter_add_description.rb
    R src/db/migrate/20120910185505_filter_packages.rb
    A src/db/migrate/20121121185801_remove_filters.rb
    A src/db/migrate/20121127191652_remove_filters_permissions.rb
    M src/deploy/common/katello-jobs.init
    R src/deploy/common/katello.completion.sh
    M src/deploy/common/katello.init
    M src/deploy/common/katello.sysconfig
    M src/deploy/common/thin.yml
    M src/gemfiles/Gemfile.f16.lock
    M src/gemfiles/Gemfile.f17.lock
    R src/gemfiles/Gemfile.lock
    M src/katello.spec
    M src/lib/navigation/administration.rb
    M src/lib/navigation/content_management.rb
    M src/lib/navigation/main.rb
    M src/lib/navigation/organization.rb
    M src/lib/navigation/setup.rb
    M src/lib/navigation/systems.rb
    M src/lib/resources/abstract_model.rb
    M src/lib/resources/candlepin.rb
    M src/lib/resources/foreman_model.rb
    M src/lib/tasks/test.rake
    R src/public/fonts
    A src/public/fonts/alchemy
    A src/public/images/alchemy
    R src/public/images/converge-ui
    A src/public/javascripts/alchemy
    A src/public/javascripts/architecture.js
    R src/public/javascripts/converge-ui
    R src/public/javascripts/filters.js
    M src/public/javascripts/jquery.jeditable.helpers.js
    M src/public/javascripts/katello.js
    M src/public/javascripts/notices.js
    M src/public/javascripts/panel.js
    M src/public/javascripts/product_edit.js
    M src/public/javascripts/promotion.js
    M src/public/javascripts/role_sliding_tree.js
    M src/public/javascripts/routes.js
    M src/public/javascripts/slidingtree.js
    M src/public/javascripts/systems.js
    A src/public/javascripts/vendor
    M src/public/javascripts/widgets/comparison_grid.js
    M src/public/javascripts/widgets/tipsy.custom.js
    M src/script/check-gettext.rb
    M src/script/katello-debug
    M src/script/katello-service
    R src/spec/controllers/api/filters_controller_spec.rb
    M src/spec/controllers/api/foreman/architectures_controller_spec.rb
    M src/spec/controllers/api/foreman/config_templates_controller_spec.rb
    M src/spec/controllers/api/foreman/domains_controller_spec.rb
    A src/spec/controllers/api/foreman/smart_proxies_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    R src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/password_resets_controller_spec.rb
    M src/spec/controllers/products_controller_spec.rb
    M src/spec/lib/resources/foreman_model_spec.rb
    M src/spec/models/glue/foreman/user_spec.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/system_group_spec.rb
    R src/test/fixtures/models/filters.yml
    R src/test/fixtures/models/filters_repositories.yml
    M src/test/fixtures/models/systems.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_consumer.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_distribution.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_errata.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    A src/test/fixtures/vcr_cassettes/support/consumer.yml
    A src/test/fixtures/vcr_cassettes/support/repository.yml
    A src/test/fixtures/vcr_cassettes/task_support.yml
    A src/test/glue/pulp/consumer_group_test.rb
    A src/test/glue/pulp/consumer_test.rb
    A src/test/glue/pulp/distribution_test.rb
    M src/test/glue/pulp/errata_test.rb
    M src/test/glue/pulp/package_test.rb
    A src/test/glue/pulp/repos_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/authorization/activation_key_authorization_test.rb
    A src/test/models/authorization/authorization_base.rb
    M src/test/models/authorization/environment_authorization_test.rb
    R src/test/models/authorization/filter_authorization_test.rb
    M src/test/models/authorization/gpg_key_authorization_test.rb
    M src/test/models/authorization/organization_authorization_test.rb
    M src/test/models/authorization/product_authorization_test.rb
    M src/test/models/authorization/provider_authorization_test.rb
    M src/test/models/authorization/repository_authorization_test.rb
    M src/test/models/authorization/role_authorization_test.rb
    M src/test/models/authorization/system_authorization_test.rb
    M src/test/models/authorization/system_group_authorization_test.rb
    M src/test/models/authorization/system_template_authorization_test.rb
    M src/test/models/authorization/user_authorization_test.rb
    M src/test/models/repository_base.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb
    A src/test/support/consumer_support.rb
    A src/test/support/repository_support.rb
    A src/test/support/task_support.rb
    A src/vendor/alchemy
    R src/vendor/converge-ui

  Log Message:
  -----------
  merge conflict fix


  Commit: 1a81c414211cc6f84fe75340a203df193a773ba4
      https://github.com/Katello/katello/commit/1a81c414211cc6f84fe75340a203df193a773ba4
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M src/app/helpers/providers_helper.rb
    M src/app/views/providers/_new_discovered_repos.html.haml
    M src/public/javascripts/panel.js
    M src/public/javascripts/repo_discovery.js

  Log Message:
  -----------
  PR comment updates


  Commit: 007cc820fb7980c58d19d159be4ce2f5cc20d55f
      https://github.com/Katello/katello/commit/007cc820fb7980c58d19d159be4ce2f5cc20d55f
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M src/Gemfile

  Log Message:
  -----------
  porting static rails version


  Commit: affe9217b74a7055c5aa5e497b49e421b9caffdc
      https://github.com/Katello/katello/commit/affe9217b74a7055c5aa5e497b49e421b9caffdc
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M src/app/models/environment_product.rb
    M src/app/models/glue/pulp/repos.rb

  Log Message:
  -----------
  reverting some uneeded changes


  Commit: 0fb56100c5dfb2e291af804db2472fe5b39958e1
      https://github.com/Katello/katello/commit/0fb56100c5dfb2e291af804db2472fe5b39958e1
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M src/test/lib/repo_discovery_test.rb

  Log Message:
  -----------
  fixing broken minitest


  Commit: dc4c02ab60a29301fb26e627d2a2820dfb53c920
      https://github.com/Katello/katello/commit/dc4c02ab60a29301fb26e627d2a2820dfb53c920
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M src/test/lib/repo_discovery_test.rb

  Log Message:
  -----------
  fixing 1.9 minitest issue


  Commit: 5941173d38ccc8eccb0b8027ef2a36c97c58bc8f
      https://github.com/Katello/katello/commit/5941173d38ccc8eccb0b8027ef2a36c97c58bc8f
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M agent/katello-agent.spec
    M rel-eng/packages/katello-agent

  Log Message:
  -----------
  Automatic commit of package [katello-agent] release [1.3.1-1].


  Commit: 82ab28a798b137dac120fbde62f113045c55d742
      https://github.com/Katello/katello/commit/82ab28a798b137dac120fbde62f113045c55d742
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2013-01-07 (Mon, 07 Jan 2013)

  Changed paths:
    M src/Gemfile
    M src/app/controllers/products_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/repositories_controller.rb
    M src/app/helpers/providers_helper.rb
    M src/app/models/async_operation.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/provider.rb
    M src/app/models/repository.rb
    M src/app/stylesheets/katello.scss
    M src/app/stylesheets/sections/contents.scss
    A src/app/views/providers/_new_discovered_repos.html.haml
    A src/app/views/providers/_repo_discovery.html.haml
    M src/app/views/repositories/_edit.html.haml
    M src/config/assets.yml
    M src/config/routes.rb
    A src/db/migrate/20121217160251_provider_add_discovery_task_id.rb
    A src/db/migrate/20130104151248_repository_add_feed.rb
    M src/lib/navigation/content_management.rb
    M src/lib/repo_discovery.rb
    M src/public/javascripts/panel.js
    M src/public/javascripts/provider.js
    A src/public/javascripts/repo_discovery.js
    A src/public/javascripts/repo_discovery_create.js
    M src/spec/controllers/providers_controller_spec.rb
    M src/test/lib/repo_discovery_test.rb

  Log Message:
  -----------
  Merge pull request #1365 from jlsherrill/pulpv2

Repo Discovery UI


  Commit: 447bf0a164ddf807917d84a0aba17181dd3f7e3a
      https://github.com/Katello/katello/commit/447bf0a164ddf807917d84a0aba17181dd3f7e3a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M src/config/initializers/warden.rb

  Log Message:
  -----------
  fixing oauth using consumers


  Commit: 9a1e4dda1f0107bae2e8e67553aa78b811dfab4a
      https://github.com/Katello/katello/commit/9a1e4dda1f0107bae2e8e67553aa78b811dfab4a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb

  Log Message:
  -----------
  validate bind & unbind actions occur succesfully


  Commit: 017abc24b980228b9880f12467313aa4353fd670
      https://github.com/Katello/katello/commit/017abc24b980228b9880f12467313aa4353fd670
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M src/test/glue/pulp/consumer_test.rb
    A src/test/support/user_support.rb

  Log Message:
  -----------
  updating consumer test to handle hidden user


  Commit: a67462bf974502eb34468daad25c5a1f1bca25a8
      https://github.com/Katello/katello/commit/a67462bf974502eb34468daad25c5a1f1bca25a8
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M src/test/fixtures/vcr_cassettes/glue_pulp_consumer.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_distribution.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_errata.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/fixtures/vcr_cassettes/support/consumer.yml
    M src/test/fixtures/vcr_cassettes/support/repository.yml
    M src/test/fixtures/vcr_cassettes/task_support.yml

  Log Message:
  -----------
  vcr update


  Commit: a6802a01cda175cf4429d576e5803ea2f72e3d30
      https://github.com/Katello/katello/commit/a6802a01cda175cf4429d576e5803ea2f72e3d30
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/test/fixtures/vcr_cassettes/glue_pulp_consumer.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_distribution.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_errata.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/fixtures/vcr_cassettes/support/consumer.yml
    M src/test/fixtures/vcr_cassettes/support/repository.yml
    M src/test/fixtures/vcr_cassettes/task_support.yml
    M src/test/glue/pulp/consumer_test.rb

  Log Message:
  -----------
  PulpV2 - Updates to version of Runcible that is built against
Pulp V2 community release.


  Commit: cf848e1b87aaa99cc50a5190978a50ec575e04b3
      https://github.com/Katello/katello/commit/cf848e1b87aaa99cc50a5190978a50ec575e04b3
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
    R src/app/controllers/api/pulp_proxies_controller.rb

  Log Message:
  -----------
  PulpV2 - Removes the Pulp proxies controller as it is no longer used.


  Commit: 762474fdd02399bcbf1dffd9e86659633f042106
      https://github.com/Katello/katello/commit/762474fdd02399bcbf1dffd9e86659633f042106
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
    M src/Gemfile

  Log Message:
  -----------
  PulpV2 - Bumps Runcible to 0.3 version requirement in Gemfile.


  Commit: 7b2864177c166f69b95769b0a699adfda03f84fc
      https://github.com/Katello/katello/commit/7b2864177c166f69b95769b0a699adfda03f84fc
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/models/errata_spec.rb
    M src/spec/models/system_template_revision_spec.rb

  Log Message:
  -----------
  PulpV2 - Fixes for spec tests and removing :feed attr from glue/pulp/repo


  Commit: 77e90a931731296c1caf90cb3d98ca6611cbfdda
      https://github.com/Katello/katello/commit/77e90a931731296c1caf90cb3d98ca6611cbfdda
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
    M src/public/javascripts/repo_discovery.js

  Log Message:
  -----------
  repo discovery - auto filter table upon new redraw


  Commit: c29e0be026e5c5153c07f8f9c248cd38f17afa18
      https://github.com/Katello/katello/commit/c29e0be026e5c5153c07f8f9c248cd38f17afa18
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/models/errata_spec.rb

  Log Message:
  -----------
  PulpV2 - Fixes two broken spec tests by stubbing the correct Runcible call.


  Commit: 2da996766446d98683fd2b7d16fa45e9bdafed70
      https://github.com/Katello/katello/commit/2da996766446d98683fd2b7d16fa45e9bdafed70
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M src/test/fixtures/models/roles.yml
    M src/test/fixtures/models/roles_users.yml
    M src/test/fixtures/models/users.yml
    M src/test/glue/pulp/consumer_test.rb
    R src/test/support/user_support.rb

  Log Message:
  -----------
  adding fixture for hidden user


  Commit: 22a408a75e10cf4ed1e7d75b59de61f4d15aaedd
      https://github.com/Katello/katello/commit/22a408a75e10cf4ed1e7d75b59de61f4d15aaedd
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M src/public/javascripts/repo_discovery.js

  Log Message:
  -----------
  Merge pull request #1383 from jlsherrill/pulpv2

repo discovery - auto filter table upon new redraw


  Commit: c99eacdf5a567a3a054040483462906cfff83e7b
      https://github.com/Katello/katello/commit/c99eacdf5a567a3a054040483462906cfff83e7b
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M src/Gemfile
    R src/app/controllers/api/pulp_proxies_controller.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/models/errata_spec.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/test/fixtures/vcr_cassettes/glue_pulp_consumer.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_distribution.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_errata.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/fixtures/vcr_cassettes/support/consumer.yml
    M src/test/fixtures/vcr_cassettes/support/repository.yml
    M src/test/fixtures/vcr_cassettes/task_support.yml
    M src/test/glue/pulp/consumer_test.rb

  Log Message:
  -----------
  Merge pull request #1385 from ehelms/pulpv2

Pulpv2 - Updates to Runcible 0.3 which is built for Pulp V2.0 Release.


  Commit: 67d46c0b04e12c0798c865dcf36277cea7b1a776
      https://github.com/Katello/katello/commit/67d46c0b04e12c0798c865dcf36277cea7b1a776
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb

  Log Message:
  -----------
  ensuring previous user is reset


  Commit: 935a05e019b35b1b7809ebdcd25b407169858946
      https://github.com/Katello/katello/commit/935a05e019b35b1b7809ebdcd25b407169858946
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M src/Gemfile
    R src/app/controllers/api/pulp_proxies_controller.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/public/javascripts/repo_discovery.js
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/models/errata_spec.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/test/fixtures/vcr_cassettes/glue_pulp_consumer.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_distribution.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_errata.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_hidden_user.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/fixtures/vcr_cassettes/support/consumer.yml
    M src/test/fixtures/vcr_cassettes/support/repository.yml
    M src/test/fixtures/vcr_cassettes/task_support.yml
    M src/test/glue/pulp/consumer_test.rb
    A src/test/support/user_support.rb

  Log Message:
  -----------
  merge conflict


  Commit: a353697ddee69a16baefd31b82002658e4c42908
      https://github.com/Katello/katello/commit/a353697ddee69a16baefd31b82002658e4c42908
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-13 (Sun, 13 Jan 2013)

  Changed paths:
    M src/app/controllers/api/systems_controller.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    R src/lib/resources/pulp.rb
    A src/test/fixtures/vcr_cassettes/glue_pulp_consumer_group.yml
    A src/test/fixtures/vcr_cassettes/support/consumer_group.yml
    M src/test/glue/pulp/consumer_group_test.rb

  Log Message:
  -----------
  PulpV2 - Numerous clean-up around Resources::Pulp and Consumer Groups.

- Adds consumer group tests, and skips any currently inoperable
functionality.
- Removes references to Resource::Pulp and the lib/resources/pulp.rb
- Currently broken functionality in pulp raises NotImplementedErrors


  Commit: 041f0323116e96ccd9152f83cf253ca769f0711d
      https://github.com/Katello/katello/commit/041f0323116e96ccd9152f83cf253ca769f0711d
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-13 (Sun, 13 Jan 2013)

  Changed paths:
    M src/app/models/glue/pulp/consumer_group.rb

  Log Message:
  -----------
  PulpV2 - Removes reference to now removed resources/pulp


  Commit: 830477f35fb6d9d41b7f08463c960a98c1b47a80
      https://github.com/Katello/katello/commit/830477f35fb6d9d41b7f08463c960a98c1b47a80
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-13 (Sun, 13 Jan 2013)

  Changed paths:
    M src/spec/controllers/api/system_group_errata_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/system_errata_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb
    M src/spec/controllers/systems_controller_spec.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/product_spec.rb

  Log Message:
  -----------
  PulpV2 - Removes test references to Resources::Pulp


  Commit: 7d9c8fedd60213a1d6ab23b73e262aebe1147653
      https://github.com/Katello/katello/commit/7d9c8fedd60213a1d6ab23b73e262aebe1147653
  Author: David Davis <daviddavis@redhat.com>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M src/app/controllers/providers_controller.rb
    M src/app/helpers/providers_helper.rb

  Log Message:
  -----------
  Pulpv2: Making some tweaks based on feedback


  Commit: f739f88fc66e614666c5a78ac799ee7bf1e91717
      https://github.com/Katello/katello/commit/f739f88fc66e614666c5a78ac799ee7bf1e91717
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M src/app/models/glue/pulp/consumer.rb
    M src/config/initializers/warden.rb
    M src/test/fixtures/models/roles.yml
    M src/test/fixtures/models/roles_users.yml
    M src/test/fixtures/models/users.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_consumer.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_distribution.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_errata.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_hidden_user.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/fixtures/vcr_cassettes/support/consumer.yml
    M src/test/fixtures/vcr_cassettes/support/repository.yml
    M src/test/fixtures/vcr_cassettes/task_support.yml
    M src/test/glue/pulp/consumer_test.rb
    A src/test/support/user_support.rb

  Log Message:
  -----------
  Merge pull request #1382 from jlsherrill/pulpv2-consumer_bind

Pulpv2 - wait on consumer bind


  Commit: b95dc3d1db764def0153a488d6dc77a2cbea7706
      https://github.com/Katello/katello/commit/b95dc3d1db764def0153a488d6dc77a2cbea7706
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M src/spec/controllers/api/system_group_errata_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/system_errata_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb

  Log Message:
  -----------
  PulpV2 - Sets a number of spec tests to pending that depend on
errata calls that is currently busted in Pulp.


  Commit: 3679b768be1db2b74799b887290c6e28409a3fe9
      https://github.com/Katello/katello/commit/3679b768be1db2b74799b887290c6e28409a3fe9
  Author: David Davis <daviddavis@redhat.com>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M src/app/controllers/providers_controller.rb
    M src/app/helpers/providers_helper.rb

  Log Message:
  -----------
  Merge pull request #1393 from daviddavis/pulpv2

Some tweaks to pulpv2 code


  Commit: 7cde771e30d85d75485bb9e0e89972b09b10ae9a
      https://github.com/Katello/katello/commit/7cde771e30d85d75485bb9e0e89972b09b10ae9a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

  Changed paths:
    M src/app/models/system_group.rb

  Log Message:
  -----------
  881847 - allow system group names with spaces and other characters

pulpv2 does not support spaces and other non alpha-numeric
characters in the id, so in order to create a group in katello
with those characters we just need to labelize the name when
constructing the pulpId


  Commit: 776e00b43631f26e5c6677342107ae573e5bc378
      https://github.com/Katello/katello/commit/776e00b43631f26e5c6677342107ae573e5bc378
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

  Changed paths:
    M src/app/controllers/api/systems_controller.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    R src/lib/resources/pulp.rb
    M src/spec/controllers/api/system_group_errata_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/system_errata_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb
    M src/spec/controllers/systems_controller_spec.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/product_spec.rb
    A src/test/fixtures/vcr_cassettes/glue_pulp_consumer_group.yml
    A src/test/fixtures/vcr_cassettes/support/consumer_group.yml
    M src/test/glue/pulp/consumer_group_test.rb

  Log Message:
  -----------
  Merge pull request #1395 from ehelms/pulpv2

PulpV2 - Numerous clean-up around Resources::Pulp and Consumer Groups.


  Commit: a58957ae4aace313acb7817ad7ff8fb30da5e90d
      https://github.com/Katello/katello/commit/a58957ae4aace313acb7817ad7ff8fb30da5e90d
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

  Changed paths:
    M src/app/models/system_group.rb

  Log Message:
  -----------
  Merge pull request #1401 from jlsherrill/pulpv2-group_pulp_id

881847 - allow system group names with spaces and other characters


  Commit: 95bb4038e80d1d038bc43531f81e36f88dc19b36
      https://github.com/Katello/katello/commit/95bb4038e80d1d038bc43531f81e36f88dc19b36
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

  Changed paths:
    M src/app/mailers/user_mailer.rb

  Log Message:
  -----------
  PulpV2 - Updating TODOs found in UserMailer to use default organization
for the user instead of the just the first organization.


  Commit: d2dc548eb6cb021334baf6891db301f920758b0f
      https://github.com/Katello/katello/commit/d2dc548eb6cb021334baf6891db301f920758b0f
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

  Changed paths:
    M src/app/models/authorization/enforcement.rb
    M src/app/models/user.rb
    M src/bundler.d/checking.rb
    M src/lib/ldap.rb
    A src/test/fixtures/models/help_tips.yml
    A src/test/fixtures/models/notices.yml
    M src/test/fixtures/models/roles.yml
    A src/test/fixtures/models/user_notices.yml
    M src/test/fixtures/models/users.yml
    M src/test/models/user_test.rb

  Log Message:
  -----------
  PulpV2 - Adds missing User model tests and cleans up user.rb.


  Commit: a840406592741b18231a67417573dbe43eccbed3
      https://github.com/Katello/katello/commit/a840406592741b18231a67417573dbe43eccbed3
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

  Changed paths:
    M src/Gemfile

  Log Message:
  -----------
  updating requires for runcible to fix errata promotion


  Commit: cdcb3d24001ea4fa77340981c88a0dfbace83abb
      https://github.com/Katello/katello/commit/cdcb3d24001ea4fa77340981c88a0dfbace83abb
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

  Changed paths:
    M src/test/fixtures/vcr_cassettes/glue_pulp_consumer.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_consumer_group.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_distribution.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_errata.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_hidden_user.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/fixtures/vcr_cassettes/support/consumer.yml
    R src/test/fixtures/vcr_cassettes/support/consumer_group.yml
    M src/test/fixtures/vcr_cassettes/support/repository.yml
    M src/test/fixtures/vcr_cassettes/task_support.yml

  Log Message:
  -----------
  vcr_update


  Commit: 4352714b75ba502e6fbbab05cea85e1010367102
      https://github.com/Katello/katello/commit/4352714b75ba502e6fbbab05cea85e1010367102
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

  Changed paths:
    R src/spec/models/distribution_spec.rb
    R src/spec/models/errata_spec.rb
    R src/spec/models/repository_spec.rb

  Log Message:
  -----------
  PulpV2 - Removing spec tests that are no longer valid with new
test setup.


  Commit: ee5567b1994b4d76cacc2ffd1fc46eab8522fb45
      https://github.com/Katello/katello/commit/ee5567b1994b4d76cacc2ffd1fc46eab8522fb45
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

  Changed paths:
    M src/app/models/user.rb

  Log Message:
  -----------
  PulpV2 - Simplifies a join to reduce the number of DB calls.


  Commit: fd2909fbd900032622b4eb0c573fc59758176dc7
      https://github.com/Katello/katello/commit/fd2909fbd900032622b4eb0c573fc59758176dc7
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M src/test/fixtures/vcr_cassettes/glue_pulp_consumer_group.yml
    M src/test/glue/pulp/consumer_group_test.rb
    M src/test/glue/pulp/consumer_test.rb
    M src/test/support/consumer_support.rb

  Log Message:
  -----------
  travis test fix (hopefully)


  Commit: 23ab00363735e854908f64b9ea90e1fab43d86d2
      https://github.com/Katello/katello/commit/23ab00363735e854908f64b9ea90e1fab43d86d2
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M src/Gemfile
    M src/test/fixtures/vcr_cassettes/glue_pulp_consumer.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_consumer_group.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_distribution.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_errata.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_hidden_user.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    M src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    M src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    M src/test/fixtures/vcr_cassettes/support/consumer.yml
    R src/test/fixtures/vcr_cassettes/support/consumer_group.yml
    M src/test/fixtures/vcr_cassettes/support/repository.yml
    M src/test/fixtures/vcr_cassettes/task_support.yml
    M src/test/glue/pulp/consumer_group_test.rb
    M src/test/glue/pulp/consumer_test.rb
    M src/test/support/consumer_support.rb

  Log Message:
  -----------
  Merge pull request #1407 from jlsherrill/pulpv2

updating requires for runcible to fix errata promotion


  Commit: b00312b4271f194cbf4a6e21e83f0b837fd59266
      https://github.com/Katello/katello/commit/b00312b4271f194cbf4a6e21e83f0b837fd59266
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M cli/src/katello/client/core/packagegroup.py

  Log Message:
  -----------
  package group conditional package names is now an array, not a hash

no need to convert it


  Commit: b7338dd18eb95a4a5e77791a01bf759e8049aba2
      https://github.com/Katello/katello/commit/b7338dd18eb95a4a5e77791a01bf759e8049aba2
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M src/app/controllers/api/changesets_content_controller.rb
    M src/app/models/changeset.rb

  Log Message:
  -----------
  we now use unit id to refer to errata, so we need to look up errata and get both \
ids


  Commit: 1cfb72373e08449a6debd44f1d53d1fb1297f64c
      https://github.com/Katello/katello/commit/1cfb72373e08449a6debd44f1d53d1fb1297f64c
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M src/app/controllers/api/distributions_controller.rb
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/models/glue/pulp/consumer.rb

  Log Message:
  -----------
  various cli system test fixes


  Commit: b3b8845e87cda883471b870fd0ef0ba416aca7d8
      https://github.com/Katello/katello/commit/b3b8845e87cda883471b870fd0ef0ba416aca7d8
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M src/app/mailers/user_mailer.rb
    M src/app/models/authorization/enforcement.rb
    M src/app/models/user.rb
    M src/bundler.d/checking.rb
    M src/lib/ldap.rb
    R src/spec/models/distribution_spec.rb
    R src/spec/models/errata_spec.rb
    R src/spec/models/repository_spec.rb
    A src/test/fixtures/models/help_tips.yml
    A src/test/fixtures/models/notices.yml
    M src/test/fixtures/models/roles.yml
    A src/test/fixtures/models/user_notices.yml
    M src/test/fixtures/models/users.yml
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Merge pull request #1409 from ehelms/pulpv2

Pulpv2 - User model tests, user model file clean-up.


  Commit: 780440b594b5772565cc3af8d12937eb868d95c2
      https://github.com/Katello/katello/commit/780440b594b5772565cc3af8d12937eb868d95c2
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M src/app/controllers/api/changesets_content_controller.rb
    M src/app/models/changeset.rb
    M src/app/models/changeset_erratum.rb
    M src/app/models/glue/pulp/repo.rb
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/system_packages_controller_spec.rb
    M src/spec/models/changeset_spec.rb

  Log Message:
  -----------
  fixing spec tests


  Commit: 077217da8963d7ade479ca0bb07922e798142b5a
      https://github.com/Katello/katello/commit/077217da8963d7ade479ca0bb07922e798142b5a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M cli/test/katello/tests/core/packagegroup/packagegroup_data.py

  Log Message:
  -----------
  fixing cli test


  Commit: 094d649c58c129fc5d86a668134680344f4e23e4
      https://github.com/Katello/katello/commit/094d649c58c129fc5d86a668134680344f4e23e4
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M src/test/glue/pulp/repository_test.rb

  Log Message:
  -----------
  minitest glue fix


  Commit: a7a72bb4657237263b40cfbae0efd5a46d9f0c06
      https://github.com/Katello/katello/commit/a7a72bb4657237263b40cfbae0efd5a46d9f0c06
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M cli/src/katello/client/core/packagegroup.py
    M cli/test/katello/tests/core/packagegroup/packagegroup_data.py
    M src/app/controllers/api/distributions_controller.rb
    M src/app/controllers/api/providers_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/models/changeset.rb
    M src/app/models/changeset_erratum.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/repo.rb
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/system_packages_controller_spec.rb
    M src/spec/models/changeset_spec.rb
    M src/test/glue/pulp/repository_test.rb

  Log Message:
  -----------
  Merge pull request #1417 from jlsherrill/pulpv2-system

Pulpv2 - fixing system tests


  Commit: ba112730a6312f1feadcdbd53a7454e5aa9b9f20
      https://github.com/Katello/katello/commit/ba112730a6312f1feadcdbd53a7454e5aa9b9f20
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  temporary release bump for pulpv2 test building


  Commit: 21a2246b56dd3da3933590dee7d3c3869d843f97
      https://github.com/Katello/katello/commit/21a2246b56dd3da3933590dee7d3c3869d843f97
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M katello-configure/modules/katello/templates/etc/katello/katello.yml.erb

  Log Message:
  -----------
  adding post sync url to katello.yml


  Commit: bdf6f4a8372903018839354a3cf07a7c168864ce
      https://github.com/Katello/katello/commit/bdf6f4a8372903018839354a3cf07a7c168864ce
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M katello-configure/katello-configure.spec

  Log Message:
  -----------
  temporarily adding pulpv2 to release


  Commit: 90befb5d6ab0a8b9f5b6989ed5254745a416676e
      https://github.com/Katello/katello/commit/90befb5d6ab0a8b9f5b6989ed5254745a416676e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M katello-configure/katello-configure.spec
    M rel-eng/packages/katello-configure

  Log Message:
  -----------
  Automatic commit of package [katello-configure] release [1.4.2_pulpv2-1].


  Commit: 801ba6e6ac48cb04b1360c91d3002b1a541547c0
      https://github.com/Katello/katello/commit/801ba6e6ac48cb04b1360c91d3002b1a541547c0
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M rel-eng/packages/katello
    M src/katello.spec

  Log Message:
  -----------
  Automatic commit of package [katello] release [1.4.1_pulpv2-1].


  Commit: ab7da75cc758132a7abeaf3260c7ae1476d4aa02
      https://github.com/Katello/katello/commit/ab7da75cc758132a7abeaf3260c7ae1476d4aa02
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  version downgrade from mistaken bump


  Commit: 350202419b074e334ee4c9f1f58072f7a4195a24
      https://github.com/Katello/katello/commit/350202419b074e334ee4c9f1f58072f7a4195a24
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M rel-eng/packages/katello
    M src/katello.spec

  Log Message:
  -----------
  Automatic commit of package [katello] release [1.3.4_pulpv2-1].


  Commit: d398ac57417e17deb01a5dd50869b5fa523797e5
      https://github.com/Katello/katello/commit/d398ac57417e17deb01a5dd50869b5fa523797e5
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M katello-configure/katello-configure.spec

  Log Message:
  -----------
  version downgrade from mistaken bump


  Commit: ddd84307dbfc28672d6e554dbeeab48fcca28a1f
      https://github.com/Katello/katello/commit/ddd84307dbfc28672d6e554dbeeab48fcca28a1f
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M katello-configure/katello-configure.spec
    M rel-eng/packages/katello-configure

  Log Message:
  -----------
  Automatic commit of package [katello-configure] release [1.3.2_pulpv2-1].


  Commit: cf7edae93255a697544913126cfebf148fffeb2e
      https://github.com/Katello/katello/commit/cf7edae93255a697544913126cfebf148fffeb2e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M cli/katello-cli.spec

  Log Message:
  -----------
  adding pulpv2 prefix to cli spec version


  Commit: bc08149fded682354ed48027a866a271646367bf
      https://github.com/Katello/katello/commit/bc08149fded682354ed48027a866a271646367bf
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M cli/katello-cli.spec
    M rel-eng/packages/katello-cli

  Log Message:
  -----------
  Automatic commit of package [katello-cli] release [1.3.1_pulpv2-1].


  Commit: dbf234a40279de274a6463886d14560a0c1d9674
      https://github.com/Katello/katello/commit/dbf234a40279de274a6463886d14560a0c1d9674
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  removing old converge-ui build code


  Commit: 18996ac1c6538b435fc65d1095a7f24c16fa74da
      https://github.com/Katello/katello/commit/18996ac1c6538b435fc65d1095a7f24c16fa74da
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  version bump


  Commit: 17f9a075ed30fd8f1a0eeb5e50984585660a87e5
      https://github.com/Katello/katello/commit/17f9a075ed30fd8f1a0eeb5e50984585660a87e5
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M rel-eng/packages/katello
    M src/katello.spec

  Log Message:
  -----------
  Automatic commit of package [katello] release [1.3.5_pulpv2-1].


  Commit: ef1f5e7fdae0cc309cced8a9cd5f582dce480522
      https://github.com/Katello/katello/commit/ef1f5e7fdae0cc309cced8a9cd5f582dce480522
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  fixing rpm build for pulpv2


  Commit: accb9015772be1d587d281c9e315f5cd629aebff
      https://github.com/Katello/katello/commit/accb9015772be1d587d281c9e315f5cd629aebff
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M rel-eng/packages/katello
    M src/katello.spec

  Log Message:
  -----------
  Automatic commit of package [katello] release [1.3.6_pulpv2-1].


  Commit: 7b5d62224226a93378771e0beebc54bbdd92f3bc
      https://github.com/Katello/katello/commit/7b5d62224226a93378771e0beebc54bbdd92f3bc
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M src/public/javascripts/repo_discovery.js
    M src/public/javascripts/repo_discovery_create.js

  Log Message:
  -----------
  fixing use of reserved javascript word


  Commit: d577abac49d251abd7821a97c957e0c2a268d3af
      https://github.com/Katello/katello/commit/d577abac49d251abd7821a97c957e0c2a268d3af
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  revert of requiring compass < 0.12


  Commit: 86184d5eb66d7e31aba3d03717df3d5e570ac5aa
      https://github.com/Katello/katello/commit/86184d5eb66d7e31aba3d03717df3d5e570ac5aa
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M rel-eng/packages/katello
    M src/katello.spec

  Log Message:
  -----------
  Automatic commit of package [katello] release [1.3.7_pulpv2-1].


  Commit: 3180f1baf3c05bb5a7bbba409fd1e47c71dbf0e0
      https://github.com/Katello/katello/commit/3180f1baf3c05bb5a7bbba409fd1e47c71dbf0e0
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M src/config/application.rb

  Log Message:
  -----------
  fixing bundler_ext changes


  Commit: 529e4f2c07c2ee7615f4ad6ee5975960fa699e54
      https://github.com/Katello/katello/commit/529e4f2c07c2ee7615f4ad6ee5975960fa699e54
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  adding rubygem-hooks to spec requires


  Commit: d744f7d31cdfebe69358e7d1fa687717ed65e059
      https://github.com/Katello/katello/commit/d744f7d31cdfebe69358e7d1fa687717ed65e059
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  version bump


  Commit: 49d7fda60de8ca57d7572df1e381d3caf7930a2d
      https://github.com/Katello/katello/commit/49d7fda60de8ca57d7572df1e381d3caf7930a2d
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M rel-eng/packages/katello
    M src/katello.spec

  Log Message:
  -----------
  Automatic commit of package [katello] release [1.3.8_pulpv2-1].


  Commit: 6cb0178568db875fd428defd6fc16b781094e7c2
      https://github.com/Katello/katello/commit/6cb0178568db875fd428defd6fc16b781094e7c2
  Author: David Davis <daviddavis@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M src/app/controllers/activation_keys_controller.rb
    M src/app/controllers/api/foreman/smart_proxies_controller.rb
    M src/app/controllers/api/role_ldap_groups_controller.rb
    M src/app/controllers/api/sync_controller.rb
    M src/app/controllers/api/sync_plans_controller.rb
    M src/app/controllers/api/system_groups_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/changesets_controller.rb
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/errata_controller.rb
    M src/app/controllers/failed_authentication_controller.rb
    M src/app/controllers/promotions_controller.rb
    M src/app/controllers/roles_controller.rb
    M src/app/controllers/search_controller.rb
    M src/app/controllers/system_group_errata_controller.rb
    M src/app/controllers/system_packages_controller.rb
    M src/app/controllers/system_templates_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    M src/app/helpers/application_helper.rb
    M src/app/helpers/breadcrumb_helper.rb
    M src/app/helpers/katello_url_helper.rb
    M src/app/helpers/products_helper.rb
    M src/app/helpers/promotions_helper.rb
    M src/app/helpers/repositories_helper.rb
    M src/app/helpers/system_errata_helper.rb
    M src/app/models/authorization/repository.rb
    M src/app/models/glue/elastic_search/pool.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/katello_url_format_validator.rb
    M src/app/models/permission.rb
    M src/app/models/pulp_sync_status.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/repository.rb
    M src/app/models/sync_plan.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb
    M src/bundler.d/test.rb
    M src/config/application.rb
    M src/config/initializers/apipie.rb
    M src/db/migrate/20110506182638_create_sync_plans.rb
    M src/db/migrate/20120420003530_create_system_system_groups.rb
    M src/db/migrate/20120515133827_create_jobs.rb
    M src/db/migrate/20120814142911_repository_add_content_id.rb
    M src/db/migrate/20120815145728_repository_add_arch.rb
    M src/db/migrate/20120911182916_add_labels_to_repository.rb
    M src/integration_spec/candlepin/consumer_api_spec.rb
    M src/integration_spec/spec_helper.rb
    M src/lib/util/threadsession.rb
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/environments_controller_spec.rb
    M src/spec/controllers/gpg_keys_controller_spec.rb
    M src/spec/controllers/notices_controller_spec.rb
    M src/spec/controllers/organizations_controller_spec.rb
    M src/spec/controllers/packages_controller_spec.rb
    M src/spec/controllers/password_resets_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/controllers/roles_controller_spec.rb
    M src/spec/controllers/search_controller_spec.rb
    M src/spec/controllers/system_errata_controller_spec.rb
    M src/spec/controllers/user_session_controller_spec.rb
    M src/spec/controllers/users_controller_spec.rb
    M src/spec/helpers/product_test_data.rb
    M src/spec/models/gpg_key_spec.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/permission_spec.rb
    M src/spec/spec_helper.rb
    M src/spec/support/shared_examples/protected_action_shared_examples.rb
    M src/spec/views/common/_search.html.haml_spec.rb
    M src/test/glue/pulp/errata_test.rb
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Fixing trailing whitespace


  Commit: 9fb99339e896f5e0cd12e551bcf1790ab954f3f5
      https://github.com/Katello/katello/commit/9fb99339e896f5e0cd12e551bcf1790ab954f3f5
  Author: David Davis <daviddavis@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M src/app/controllers/activation_keys_controller.rb
    M src/app/controllers/api/foreman/smart_proxies_controller.rb
    M src/app/controllers/api/role_ldap_groups_controller.rb
    M src/app/controllers/api/sync_controller.rb
    M src/app/controllers/api/sync_plans_controller.rb
    M src/app/controllers/api/system_groups_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/changesets_controller.rb
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/errata_controller.rb
    M src/app/controllers/failed_authentication_controller.rb
    M src/app/controllers/promotions_controller.rb
    M src/app/controllers/roles_controller.rb
    M src/app/controllers/search_controller.rb
    M src/app/controllers/system_group_errata_controller.rb
    M src/app/controllers/system_packages_controller.rb
    M src/app/controllers/system_templates_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    M src/app/helpers/application_helper.rb
    M src/app/helpers/breadcrumb_helper.rb
    M src/app/helpers/katello_url_helper.rb
    M src/app/helpers/products_helper.rb
    M src/app/helpers/promotions_helper.rb
    M src/app/helpers/repositories_helper.rb
    M src/app/helpers/system_errata_helper.rb
    M src/app/models/authorization/repository.rb
    M src/app/models/glue/elastic_search/pool.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/katello_url_format_validator.rb
    M src/app/models/permission.rb
    M src/app/models/pulp_sync_status.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/repository.rb
    M src/app/models/sync_plan.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb
    M src/bundler.d/test.rb
    M src/config/application.rb
    M src/config/initializers/apipie.rb
    M src/db/migrate/20110506182638_create_sync_plans.rb
    M src/db/migrate/20120420003530_create_system_system_groups.rb
    M src/db/migrate/20120515133827_create_jobs.rb
    M src/db/migrate/20120814142911_repository_add_content_id.rb
    M src/db/migrate/20120815145728_repository_add_arch.rb
    M src/db/migrate/20120911182916_add_labels_to_repository.rb
    M src/integration_spec/candlepin/consumer_api_spec.rb
    M src/integration_spec/spec_helper.rb
    M src/lib/util/threadsession.rb
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/environments_controller_spec.rb
    M src/spec/controllers/gpg_keys_controller_spec.rb
    M src/spec/controllers/notices_controller_spec.rb
    M src/spec/controllers/organizations_controller_spec.rb
    M src/spec/controllers/packages_controller_spec.rb
    M src/spec/controllers/password_resets_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/controllers/roles_controller_spec.rb
    M src/spec/controllers/search_controller_spec.rb
    M src/spec/controllers/system_errata_controller_spec.rb
    M src/spec/controllers/user_session_controller_spec.rb
    M src/spec/controllers/users_controller_spec.rb
    M src/spec/helpers/product_test_data.rb
    M src/spec/models/gpg_key_spec.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/permission_spec.rb
    M src/spec/spec_helper.rb
    M src/spec/support/shared_examples/protected_action_shared_examples.rb
    M src/spec/views/common/_search.html.haml_spec.rb
    M src/test/glue/pulp/errata_test.rb
    M src/test/glue/pulp/repository_test.rb
    M src/test/glue/pulp/user_test.rb
    M src/test/minitest_helper.rb
    M src/test/models/repository_test.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Merge pull request #1429 from daviddavis/whitespace

Pulpv2: Fixing some bad formatting


  Commit: cb62ef9e2d4e317eeba5c219a203750e187fdbb2
      https://github.com/Katello/katello/commit/cb62ef9e2d4e317eeba5c219a203750e187fdbb2
  Author: David Davis <daviddavis@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M scripts/ci/katello_pull_request_tests.sh
    A src/script/ruby-linter

  Log Message:
  -----------
  Added a lint check for ruby code


  Commit: cd95ed258cd6625c71e1eb0d8017b419337ec48c
      https://github.com/Katello/katello/commit/cd95ed258cd6625c71e1eb0d8017b419337ec48c
  Author: David Davis <daviddavis@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M src/app/helpers/notices_helper.rb

  Log Message:
  -----------
  Fixed whitespace


  Commit: dba9e3764d1fc7bf4c62d6e7e1f31b6ddb71a4c7
      https://github.com/Katello/katello/commit/dba9e3764d1fc7bf4c62d6e7e1f31b6ddb71a4c7
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  removing lib/resources/pulp.rb from spec


  Commit: 26fed6de405818a32acd48a27ded1f1faf74df55
      https://github.com/Katello/katello/commit/26fed6de405818a32acd48a27ded1f1faf74df55
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  bad merge fix


  Commit: 5e4c01a46836b4bf168234a5b4984c79b86ce7ca
      https://github.com/Katello/katello/commit/5e4c01a46836b4bf168234a5b4984c79b86ce7ca
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M src/bundler.d/test.rb
    M src/katello.spec

  Log Message:
  -----------
  spec file changes for build


  Commit: bdcb838558b24acfa36eb593fd059c637160c93e
      https://github.com/Katello/katello/commit/bdcb838558b24acfa36eb593fd059c637160c93e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  version bump


  Commit: 405c569e8346be892a5eef3f281d5d5e3d42a603
      https://github.com/Katello/katello/commit/405c569e8346be892a5eef3f281d5d5e3d42a603
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M rel-eng/packages/katello
    M src/katello.spec

  Log Message:
  -----------
  Automatic commit of package [katello] release [1.3.9_pulpv2-1].


  Commit: 469fbd3acba9b7b8b1ccce1a097dadbf50671af6
      https://github.com/Katello/katello/commit/469fbd3acba9b7b8b1ccce1a097dadbf50671af6
  Author: David Davis <daviddavis@redhat.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M src/script/ruby-linter

  Log Message:
  -----------
  Streaming files instead of loading them entirely into mem


  Commit: 184780bbbf86f881406efaad79b40dab787a514c
      https://github.com/Katello/katello/commit/184780bbbf86f881406efaad79b40dab787a514c
  Author: Miroslav Suchý <msuchy@redhat.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M src/bundler.d/test.rb

  Log Message:
  -----------
  Skipping Zentest 4.8.4 due to bad gemspec


  Commit: 45562e2322b3ff92ea6422d7c1fc48c43cfe5f65
      https://github.com/Katello/katello/commit/45562e2322b3ff92ea6422d7c1fc48c43cfe5f65
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M scripts/system-test/katello-cli-tests.spec

  Log Message:
  -----------
  appening pulpv2 to spec for test build


  Commit: 5c3eaffdd34e6433c1520142c0ecdd7f00e52159
      https://github.com/Katello/katello/commit/5c3eaffdd34e6433c1520142c0ecdd7f00e52159
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M rel-eng/packages/katello-cli-tests
    M scripts/system-test/katello-cli-tests.spec

  Log Message:
  -----------
  Automatic commit of package [katello-cli-tests] release [1.3.2.pulpv2-1].


  Commit: 1e3a1b3f36a54932c15cec5fe08d1923e7dd73f6
      https://github.com/Katello/katello/commit/1e3a1b3f36a54932c15cec5fe08d1923e7dd73f6
  Author: David Davis <daviddavis@redhat.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M scripts/ci/katello_pull_request_tests.sh
    M src/app/helpers/notices_helper.rb
    M src/bundler.d/test.rb
    A src/script/ruby-linter

  Log Message:
  -----------
  Merge pull request #1442 from daviddavis/rlint

Pulpv2 - Adding an extra Travis check


  Commit: 8d0ef640920b633312cc1812d9678fc996549057
      https://github.com/Katello/katello/commit/8d0ef640920b633312cc1812d9678fc996549057
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  requiring pulp rpm package in the correct place


  Commit: 793f1c676456dd0b70c58fcf893652b190966b29
      https://github.com/Katello/katello/commit/793f1c676456dd0b70c58fcf893652b190966b29
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  fixing version


  Commit: 83e262964790e30e2edadea3df783eb9da3250e4
      https://github.com/Katello/katello/commit/83e262964790e30e2edadea3df783eb9da3250e4
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M rel-eng/packages/katello
    M src/katello.spec

  Log Message:
  -----------
  Automatic commit of package [katello] release [1.3.10.pulpv2-1].


  Commit: 5faf5dcb8f6b2ebc9efb8e3351da3900b77a2262
      https://github.com/Katello/katello/commit/5faf5dcb8f6b2ebc9efb8e3351da3900b77a2262
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M rel-eng/comps/comps-katello-pulp-server-fedora17.xml
    M rel-eng/comps/comps-katello-pulp-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml

  Log Message:
  -----------
  comps update for pulp2


  Commit: 0510997fc503af9177b538415fd88ae2e651cb2e
      https://github.com/Katello/katello/commit/0510997fc503af9177b538415fd88ae2e651cb2e
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M rel-eng/comps/comps-katello-pulp-server-fedora17.xml
    M rel-eng/comps/comps-katello-pulp-server-rhel6.xml

  Log Message:
  -----------
  fixing duplicate entries in comps


  Commit: 3e7a7eb2c43e57b243fb39fe64a005dd8b0f5cc0
      https://github.com/Katello/katello/commit/3e7a7eb2c43e57b243fb39fe64a005dd8b0f5cc0
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M rel-eng/comps/comps-katello-pulp-server-fedora17.xml
    M rel-eng/comps/comps-katello-pulp-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml

  Log Message:
  -----------
  Merge pull request #1457 from jlsherrill/pulpv2

comps update for pulp2


  Commit: 4a7b6d5cdf02c3b3c65cde7ebbc298f4577f0165
      https://github.com/Katello/katello/commit/4a7b6d5cdf02c3b3c65cde7ebbc298f4577f0165
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  exclude test.rake for main rpm


  Commit: 81e2ff8c59ff8c059d347b1c17477366b9d7ac47
      https://github.com/Katello/katello/commit/81e2ff8c59ff8c059d347b1c17477366b9d7ac47
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb

  Log Message:
  -----------
  fixing commented line in server.conf


  Commit: 3b0e7cff795e0f5a71a2cd0b83c2cb3f0c6c0bee
      https://github.com/Katello/katello/commit/3b0e7cff795e0f5a71a2cd0b83c2cb3f0c6c0bee
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb
    M src/katello.spec

  Log Message:
  -----------
  Merge pull request #1459 from jlsherrill/pulpv2

Pulpv2 - fixes for install


  Commit: f8f2f089b150639df84ed5cb2c62076890e9c46f
      https://github.com/Katello/katello/commit/f8f2f089b150639df84ed5cb2c62076890e9c46f
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M .gitignore
    M .travis.yml
    R README
    A README.md
    M agent/katello-agent.spec
    M cli/etc/katello.completion.sh
    M cli/katello-cli.spec
    M cli/po/as.po
    M cli/po/bn.po
    M cli/po/cs.po
    M cli/po/de.po
    M cli/po/es.po
    M cli/po/fr.po
    M cli/po/gu.po
    M cli/po/hi.po
    M cli/po/it.po
    M cli/po/ja.po
    M cli/po/keys.pot
    M cli/po/kn.po
    M cli/po/ko.po
    M cli/po/ml.po
    M cli/po/mr.po
    M cli/po/or.po
    M cli/po/pa.po
    M cli/po/pt.po
    M cli/po/pt_BR.po
    M cli/po/ru.po
    M cli/po/ta.po
    M cli/po/te.po
    M cli/po/zh_CN.po
    M cli/po/zh_TW.po
    A cli/src/katello/client/api/compute_resource.py
    M cli/src/katello/client/api/utils.py
    M cli/src/katello/client/cli/base.py
    M cli/src/katello/client/core/activation_key.py
    M cli/src/katello/client/core/architecture.py
    M cli/src/katello/client/core/base.py
    M cli/src/katello/client/core/changeset.py
    M cli/src/katello/client/core/client.py
    A cli/src/katello/client/core/compute_resource.py
    M cli/src/katello/client/core/config_template.py
    M cli/src/katello/client/core/distribution.py
    M cli/src/katello/client/core/domain.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/errata.py
    M cli/src/katello/client/core/gpg_key.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/package.py
    M cli/src/katello/client/core/packagegroup.py
    M cli/src/katello/client/core/permission.py
    M cli/src/katello/client/core/ping.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/provider.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/smart_proxy.py
    M cli/src/katello/client/core/subnet.py
    M cli/src/katello/client/core/sync_plan.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/system_custom_info.py
    M cli/src/katello/client/core/system_group.py
    M cli/src/katello/client/core/template.py
    M cli/src/katello/client/core/user.py
    M cli/src/katello/client/core/user_role.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/i18n_optparse.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/server.py
    M cli/src/katello/client/utils/printer.py
    A cli/test/katello/tests/core/environment/__init__.py
    A cli/test/katello/tests/core/environment/environment_base_test.py
    A cli/test/katello/tests/core/environment/environment_create_test.py
    A cli/test/katello/tests/core/environment/environment_data.py
    A cli/test/katello/tests/core/environment/environment_update_test.py
    M cli/test/katello/tests/utils/printer_test.py
    M katello-configure/bin/katello-configure
    M katello-configure/default-answer-file
    M katello-configure/katello-configure.spec
    M katello-configure/lib/util/functions.rb
    M katello-configure/man/katello-configure.pod
    M katello-configure/modules/apache2/manifests/init.pp
    M katello-configure/modules/candlepin/manifests/init.pp
    M katello-configure/modules/candlepin/templates/etc/candlepin/candlepin.conf.erb
    M katello-configure/modules/certs/manifests/config.pp
    M katello-configure/modules/certs/manifests/init.pp
    M katello-configure/modules/elasticsearch/manifests/init.pp
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/manifests/init.pp
    M katello-configure/modules/foreman/manifests/params.pp
    M katello-configure/modules/katello/manifests/config.pp
    A katello-configure/modules/katello/manifests/config/files.pp
    M katello-configure/modules/katello/manifests/init.pp
    M katello-configure/modules/katello/templates/etc/katello/katello.yml.erb
    M katello-configure/modules/mongodb/manifests/init.pp
    M katello-configure/modules/postgres/manifests/createdb.pp
    M katello-configure/modules/postgres/manifests/createuser.pp
    M katello-configure/modules/postgres/manifests/init.pp
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/modules/pulp/manifests/init.pp
    M katello-configure/modules/qpid/manifests/init.pp
    M katello-configure/modules/thumbslug/manifests/init.pp
    A katello-configure/upgrade-scripts/0701_delete_undeleted_providers.rb
    A katello-configure/upgrade-scripts/0705_katello_configure.sh
    M katello-utils/katello-utils.spec
    M rel-eng/build-missing-builds-in-koji.sh
    A rel-eng/comps/comps-katello-candlepin-server-fedora18.xml
    A rel-eng/comps/comps-katello-client-fedora18.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    A rel-eng/comps/comps-katello-foreman-server-fedora18.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    A rel-eng/comps/comps-katello-pulp-server-fedora18.xml
    A rel-eng/comps/comps-katello-server-fedora18.xml
    M rel-eng/koji-missing-builds.py
    M rel-eng/packages/katello-selinux
    M rel-eng/packages/katello-utils
    M rel-eng/releasers.conf
    M rel-eng/tito.props
    M scripts/ci/katello_pull_request_tests.sh
    M scripts/devsetup
    R scripts/gemfile-lock-install
    M scripts/run-tests.sh
    M scripts/system-test/cli-system-test
    A scripts/system-test/cli_tests/compute_resource.sh
    M scripts/system-test/cli_tests/system.sh
    M scripts/system-test/katello-cli-tests.spec
    M scripts/test/repo_generation/README.TXT
    A scripts/test/repo_generation/cds/meta.txt
    A scripts/test/repo_generation/create_cds.sh
    M scripts/test/repo_generation/create_dummy_package.sh
    M scripts/test/repo_generation/create_repo.sh
    M scripts/test/repo_generation/updated_zoo/errata.txt
    M selinux/katello-selinux/katello-selinux.spec
    M src/.gitignore
    M src/Gemfile
    R src/README
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/candlepin_proxies_controller.rb
    A src/app/controllers/api/foreman/compute_resources_controller.rb
    M src/app/controllers/api/foreman/simple_crud_controller.rb
    M src/app/controllers/api/foreman/smart_proxies_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/ping_controller.rb
    M src/app/controllers/api/proxies_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/root_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/application_info_controller.rb
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/foreman/architectures_controller.rb
    A src/app/controllers/foreman/smart_proxies_controller.rb
    M src/app/controllers/gpg_keys_controller.rb
    M src/app/controllers/organizations_controller.rb
    M src/app/controllers/repositories_controller.rb
    M src/app/controllers/system_group_packages_controller.rb
    M src/app/controllers/systems_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    M src/app/controllers/users_controller.rb
    M src/app/helpers/application_helper.rb
    M src/app/helpers/branding_helper.rb
    M src/app/helpers/breadcrumb_helper.rb
    M src/app/helpers/content_search_helper.rb
    M src/app/helpers/katello_url_helper.rb
    M src/app/helpers/password_resets_helper.rb
    M src/app/helpers/search_helper.rb
    M src/app/helpers/users_helper.rb
    M src/app/mailers/user_mailer.rb
    M src/app/models/activation_key.rb
    M src/app/models/authorization/environment.rb
    M src/app/models/authorization/organization.rb
    M src/app/models/authorization/provider.rb
    M src/app/models/authorization/system.rb
    M src/app/models/changeset.rb
    M src/app/models/changeset_distribution.rb
    M src/app/models/changeset_erratum.rb
    M src/app/models/changeset_package.rb
    M src/app/models/deletion_changeset.rb
    A src/app/models/foreman/compute_resource.rb
    A src/app/models/foreman/compute_resource/ec2.rb
    A src/app/models/foreman/compute_resource/libvirt.rb
    A src/app/models/foreman/compute_resource/openstack.rb
    A src/app/models/foreman/compute_resource/ovirt.rb
    A src/app/models/foreman/compute_resource/rackspace.rb
    A src/app/models/foreman/compute_resource/vmware.rb
    M src/app/models/foreman/smart_proxy.rb
    M src/app/models/foreman/subnet.rb
    M src/app/models/glue.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/glue/candlepin/content.rb
    M src/app/models/glue/elastic_search/errata.rb
    M src/app/models/glue/elastic_search/package.rb
    M src/app/models/glue/elastic_search/pool.rb
    M src/app/models/glue/elastic_search/provider.rb
    M src/app/models/glue/elastic_search/system.rb
    M src/app/models/glue/foreman/user.rb
    M src/app/models/glue/provider.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/gpg_key.rb
    M src/app/models/indexed_model.rb
    R src/app/models/katello_description_format_validator.rb
    R src/app/models/katello_label_format_validator.rb
    R src/app/models/katello_name_format_validator.rb
    R src/app/models/katello_url_format_validator.rb
    M src/app/models/kt_environment.rb
    R src/app/models/no_trailing_space_validator.rb
    M src/app/models/organization.rb
    M src/app/models/organization_destroyer.rb
    M src/app/models/permission.rb
    M src/app/models/ping.rb
    M src/app/models/pool.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/provider.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/repository.rb
    M src/app/models/resource_type.rb
    M src/app/models/role.rb
    M src/app/models/sync_plan.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/system_template.rb
    M src/app/models/system_template_distribution.rb
    M src/app/models/system_template_pack_group.rb
    M src/app/models/system_template_package.rb
    M src/app/models/system_template_pg_category.rb
    M src/app/models/user.rb
    M src/app/stylesheets/katello.scss
    M src/app/stylesheets/sections/content_search.scss
    M src/app/stylesheets/widgets/_chosen.scss
    M src/app/views/activation_keys/_edit.html.haml
    M src/app/views/activation_keys/_new.html.haml
    M src/app/views/activation_keys/index.html.haml
    M src/app/views/common/_common_i18n.html.haml
    M src/app/views/common/_footer.haml
    M src/app/views/common/_header.haml
    M src/app/views/common/_list_update.html.haml
    R src/app/views/consumers/export_status.html.haml
    M src/app/views/content_search/_browser_box.html.haml
    M src/app/views/content_search/_grid.html.haml
    M src/app/views/dashboard/index.html.haml
    M src/app/views/environments/_edit.html.haml
    M src/app/views/environments/_new.html.haml
    A src/app/views/foreman/smart_proxies/_edit.html.haml
    A src/app/views/foreman/smart_proxies/_new.html.haml
    A src/app/views/foreman/smart_proxies/index.html.haml
    M src/app/views/organizations/_download_debug_certificate.html.haml
    R src/app/views/owners/import_status.html.haml
    M src/app/views/products/_new.html.haml
    M src/app/views/promotions/show.html.haml
    M src/app/views/providers/redhat/_children.html.haml
    M src/app/views/repositories/_new.html.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/sync_management/_products.html.haml
    M src/app/views/system_groups/_edit.html.haml
    M src/app/views/system_groups/_new.html.haml
    M src/app/views/system_templates/index.html.haml
    M src/app/views/systems/_actions.html.haml
    M src/app/views/systems/_edit.html.haml
    M src/app/views/systems/_new.html.haml
    M src/app/views/systems/_products.html.haml
    A src/bundler.d/assets.rb
    M src/bundler.d/checking.rb
    M src/bundler.d/foreman.rb
    M src/config.ru
    M src/config/application.rb
    M src/config/assets.yml
    M src/config/compass.rb
    M src/config/database.yml
    M src/config/environments/production.rb
    R src/config/initializers/app_config.rb
    M src/config/initializers/delayed_job.rb
    M src/config/initializers/logical_insight.rb
    M src/config/initializers/secret_token.rb
    M src/config/initializers/tire.rb
    M src/config/initializers/warden.rb
    A src/config/katello.template.yml
    R src/config/katello.yml
    A src/config/locales/README
    R src/config/locales/bn-IN.yml
    A src/config/locales/bn.yml
    A src/config/locales/compare_upstream.sh
    M src/config/locales/cs.yml
    M src/config/locales/de.yml
    M src/config/locales/en.yml
    M src/config/locales/es.yml
    M src/config/locales/fr.yml
    M src/config/locales/hi.yml
    M src/config/locales/it.yml
    M src/config/locales/ja.yml
    M src/config/locales/kn.yml
    M src/config/locales/ko.yml
    M src/config/locales/pt-BR.yml
    R src/config/locales/pt-PT.yml
    A src/config/locales/pt.yml
    M src/config/locales/ru.yml
    A src/config/locales/update.sh
    M src/config/locales/zh-CN.yml
    M src/config/locales/zh-TW.yml
    M src/config/routes.rb
    M src/db/migrate/20111208225553_add_user_to_task_status.rb
    M src/db/seeds.rb
    M src/deploy/common/katello-jobs.logrotate
    M src/deploy/common/katello.init
    M src/deploy/common/katello.logrotate
    R src/gemfiles/Gemfile.f16.lock
    R src/gemfiles/Gemfile.f17.lock
    R src/gemfiles/Gemfile.rhel6.lock
    M src/katello.spec
    A src/lib/app_config.rb
    M src/lib/glue/queue.rb
    M src/lib/http_resource.rb
    A src/lib/katello_config.rb
    M src/lib/katello_logger.rb
    M src/lib/navigation/administration.rb
    M src/lib/navigation/content_management.rb
    M src/lib/navigation/main.rb
    M src/lib/navigation/setup.rb
    M src/lib/navigation/systems.rb
    M src/lib/notifications/notifier.rb
    M src/lib/resources/abstract_model.rb
    M src/lib/resources/candlepin.rb
    M src/lib/resources/cdn.rb
    M src/lib/resources/foreman.rb
    M src/lib/resources/foreman_model.rb
    M src/lib/task.rb
    M src/lib/tasks/headpin_misc.rake
    M src/lib/tasks/hudson.rake
    M src/lib/tasks/test.rake
    R src/lib/util/boot_util.rb
    M src/lib/util/password.rb
    M src/lib/util/task_status.rb
    M src/lib/util/threadsession.rb
    A src/lib/validators/changeset_distribution_validator.rb
    A src/lib/validators/changeset_erratum_validator.rb
    A src/lib/validators/changeset_package_validator.rb
    A src/lib/validators/content_validator.rb
    A src/lib/validators/distribution_validator.rb
    A src/lib/validators/katello_description_format_validator.rb
    A src/lib/validators/katello_label_format_validator.rb
    A src/lib/validators/katello_name_format_validator.rb
    A src/lib/validators/katello_url_format_validator.rb
    A src/lib/validators/library_presence_validator.rb
    A src/lib/validators/lock_validator.rb
    A src/lib/validators/no_trailing_space_validator.rb
    A src/lib/validators/non_library_environment_validator.rb
    A src/lib/validators/not_in_library_validator.rb
    A src/lib/validators/pack_group_validator.rb
    A src/lib/validators/package_uniqueness_validator.rb
    A src/lib/validators/package_validator.rb
    A src/lib/validators/parent_template_validator.rb
    A src/lib/validators/path_descendents_validator.rb
    A src/lib/validators/permission_validator.rb
    A src/lib/validators/pg_category_validator.rb
    A src/lib/validators/prior_validator.rb
    A src/lib/validators/repo_disablement_validator.rb
    A src/lib/validators/self_reference_environment_validator.rb
    A src/lib/validators/username_validator.rb
    M src/locale/app.pot
    M src/locale/bn/app.po
    M src/locale/cs/app.po
    M src/locale/de/app.po
    M src/locale/en/app.po
    M src/locale/es/app.po
    M src/locale/fr/app.po
    M src/locale/gu/app.po
    M src/locale/hi/app.po
    M src/locale/it/app.po
    M src/locale/ja/app.po
    M src/locale/kn/app.po
    M src/locale/ko/app.po
    M src/locale/mr/app.po
    M src/locale/or/app.po
    M src/locale/pa/app.po
    A src/locale/pt/app.po
    M src/locale/pt_BR/app.po
    M src/locale/ru/app.po
    M src/locale/ta/app.po
    M src/locale/te/app.po
    M src/locale/zh_CN/app.po
    M src/locale/zh_TW/app.po
    M src/public/javascripts/architecture.js
    M src/public/javascripts/content_search.js
    M src/public/javascripts/domain.js
    M src/public/javascripts/katello.js
    M src/public/javascripts/panel.js
    M src/public/javascripts/promotion.js
    M src/public/javascripts/role_sliding_tree.js
    M src/public/javascripts/routes.js
    M src/public/javascripts/slidingtree.js
    A src/public/javascripts/smart_proxy.js
    A src/public/javascripts/spin.min.js
    M src/public/javascripts/subnet.js
    M src/public/javascripts/system_template.js
    M src/public/javascripts/systems.js
    M src/public/javascripts/user_methods.js
    M src/public/javascripts/widgets/comparison_grid.js
    M src/public/javascripts/widgets/tipsy.custom.js
    M src/script/katello-generate-passphrase
    M src/script/rails
    M src/script/reset-oauth
    M src/spec/controllers/activation_keys_controller_spec.rb
    M src/spec/controllers/api/activation_keys_controller_spec.rb
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/environments_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    M src/spec/controllers/api/foreman/architectures_controller_spec.rb
    A src/spec/controllers/api/foreman/compute_resources_controller_spec.rb
    M src/spec/controllers/api/foreman/config_templates_controller_spec.rb
    M src/spec/controllers/api/foreman/domains_controller_spec.rb
    M src/spec/controllers/api/foreman/smart_proxies_controller_spec.rb
    M src/spec/controllers/api/organizations_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/ping_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/root_controller_spec.rb
    M src/spec/controllers/api/sync_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/api/tasks_controller_spec.rb
    M src/spec/controllers/api/uebercerts_controller_spec.rb
    M src/spec/controllers/distributions_controller_spec.rb
    M src/spec/controllers/environments_controller_spec.rb
    M src/spec/controllers/system_group_packages_controller_spec.rb
    M src/spec/helpers/application_info_helper_spec.rb
    M src/spec/helpers/authorization_helper_methods.rb
    M src/spec/helpers/katello_url_helper_spec.rb
    M src/spec/helpers/login_helper_methods.rb
    M src/spec/helpers/organization_helper_methods.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/repo_test_data.rb
    M src/spec/lib/cdn_spec.rb
    A src/spec/lib/navigation_spec.rb
    M src/spec/lib/resources/foreman_model_spec.rb
    M src/spec/models/activation_key_spec.rb
    M src/spec/models/changeset_spec.rb
    M src/spec/models/custom_info_spec.rb
    M src/spec/models/environment_spec.rb
    M src/spec/models/glue/foreman/user_spec.rb
    M src/spec/models/hypervisor_spec.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/permission_spec.rb
    A src/spec/models/ping_spec.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb
    M src/spec/models/role_spec.rb
    M src/spec/models/system_spec.rb
    M src/spec/support/foreman_user_disablement.rb
    M src/spec/support/shared_examples/protected_action_shared_examples.rb
    M src/spec/support/shared_examples/simple_crud_controller.rb

  Log Message:
  -----------
  merge conflict


  Commit: df9bcae2862bb411fcc62fa2e768079e7a985e30
      https://github.com/Katello/katello/commit/df9bcae2862bb411fcc62fa2e768079e7a985e30
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M src/app/models/authorization/provider.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/user.rb
    M src/lib/util/threadsession.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/product_test_data.rb
    M src/spec/helpers/repository_helper_methods.rb
    M src/spec/lib/navigation_spec.rb
    M src/spec/models/changeset_spec.rb
    M src/spec/models/ping_spec.rb

  Log Message:
  -----------
  fixing some merge conflict broken-ness


  Commit: e4b23deae6ede9ff02083a1ae93674c049500670
      https://github.com/Katello/katello/commit/e4b23deae6ede9ff02083a1ae93674c049500670
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/organization.rb
    M src/app/models/repository.rb
    M src/app/models/role.rb
    M src/app/models/user.rb
    A src/lib/validators/rolename_validator.rb
    M src/lib/validators/username_validator.rb
    M src/test/minitest_helper.rb
    M src/test/models/authorization/authorization_base.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  fixing minitests and most specs


  Commit: 41a72166cc5aac6498cfec3e0e77f5322f513148
      https://github.com/Katello/katello/commit/41a72166cc5aac6498cfec3e0e77f5322f513148
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/role_spec.rb

  Log Message:
  -----------
  more spec fixes


  Commit: 96e65ca7b8c68b6f55785b53c03b65974247893a
      https://github.com/Katello/katello/commit/96e65ca7b8c68b6f55785b53c03b65974247893a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M cli/src/katello/client/core/activation_key.py
    M scripts/ci/katello_pull_request_tests.sh
    M src/Gemfile
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/system_groups_controller.rb
    M src/app/controllers/system_templates_controller.rb
    M src/app/controllers/systems_controller.rb
    M src/app/models/async_operation.rb
    M src/app/models/changeset.rb
    M src/app/models/environment_system_group.rb
    M src/app/models/errors.rb
    A src/app/models/ext/indexed_model.rb
    A src/app/models/ext/permission_tag_cleanup.rb
    M src/app/models/glue/elastic_search/errata.rb
    M src/app/models/glue/elastic_search/package.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/gpg_key.rb
    R src/app/models/indexed_model.rb
    M src/app/models/kt_environment.rb
    R src/app/models/lazy_accessor.rb
    M src/app/models/organization.rb
    M src/app/models/product.rb
    M src/app/models/provider.rb
    M src/app/models/role.rb
    R src/app/models/support.rb
    M src/app/models/sync_plan.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/system_template.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb
    R src/bundler.d/assets.rb
    M src/bundler.d/checking.rb
    M src/bundler.d/test.rb
    M src/config/application.rb
    M src/config/compass.rb
    M src/katello.spec
    A src/lib/lazy_accessor.rb
    M src/lib/resources/abstract_model/indexed_model.rb
    A src/lib/util/support.rb
    M src/spec/controllers/api/activation_keys_controller_spec.rb
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/changesets_controller_spec.rb
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/environments_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    M src/spec/controllers/api/gpg_keys_controller_spec.rb
    M src/spec/controllers/api/organizations_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/permissions_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/roles_controller_spec.rb
    M src/spec/controllers/api/sync_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/api/tasks_controller_spec.rb
    M src/spec/controllers/api/templates_content_controller_spec.rb
    M src/spec/controllers/api/templates_controller_spec.rb
    M src/spec/controllers/api/uebercerts_controller_spec.rb
    M src/spec/controllers/api/users_controller_spec.rb
    M src/spec/controllers/environments_controller_spec.rb
    M src/spec/helpers/search_helper_methods.rb
    M src/spec/models/custom_info_spec.rb
    M src/spec/models/hypervisor_spec.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/permission_spec.rb
    M src/spec/models/system_spec.rb

  Log Message:
  -----------
  merge conflict


  Commit: b14359198b3149efaabb217cd39e258fb83669b9
      https://github.com/Katello/katello/commit/b14359198b3149efaabb217cd39e258fb83669b9
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M src/app/models/glue/elastic_search/activation_key.rb
    M src/app/models/glue/elastic_search/changeset.rb
    M src/app/models/glue/elastic_search/gpg_key.rb
    M src/app/models/glue/elastic_search/job.rb
    M src/app/models/glue/elastic_search/notice.rb
    M src/app/models/glue/elastic_search/organization.rb
    M src/app/models/glue/elastic_search/product.rb
    M src/app/models/glue/elastic_search/provider.rb
    M src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/elastic_search/role.rb
    M src/app/models/glue/elastic_search/sync_plan.rb
    M src/app/models/glue/elastic_search/system.rb
    M src/app/models/glue/elastic_search/system_group.rb
    M src/app/models/glue/elastic_search/task_status.rb
    M src/app/models/glue/elastic_search/user.rb

  Log Message:
  -----------
  updating ES glue to use Ext::IndexedModel


  Commit: ebf9adeca827102ff35a090f5eb7f6b72603f210
      https://github.com/Katello/katello/commit/ebf9adeca827102ff35a090f5eb7f6b72603f210
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M src/app/models/glue/pulp/package.rb

  Log Message:
  -----------
  merge fix


  Commit: fecd6f952ede6cf85bec7222479a9931ca725354
      https://github.com/Katello/katello/commit/fecd6f952ede6cf85bec7222479a9931ca725354
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M src/config/katello.template.yml

  Log Message:
  -----------
  adding use_elasticsearch to config template


  Commit: e7aafeefc27864ea4d2cb9f338e5efcf6221ecea
      https://github.com/Katello/katello/commit/e7aafeefc27864ea4d2cb9f338e5efcf6221ecea
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M src/script/ruby-linter

  Log Message:
  -----------
  change ruby-linter to print out all errors


  Commit: cb476636ae631b2d545cdd631b775b1a9ff23c05
      https://github.com/Katello/katello/commit/cb476636ae631b2d545cdd631b775b1a9ff23c05
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M src/app/controllers/application_controller.rb
    M src/app/controllers/repositories_controller.rb
    M src/app/models/glue.rb
    M src/config/initializers/secret_token.rb
    M src/lib/navigation/setup.rb
    M src/lib/util/threadsession.rb
    M src/spec/models/changeset_spec.rb

  Log Message:
  -----------
  fix whitespace


  Commit: e88a736568bd0b30e15f96f379f90177c1feed6b
      https://github.com/Katello/katello/commit/e88a736568bd0b30e15f96f379f90177c1feed6b
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M src/config/katello.template.yml

  Log Message:
  -----------
  fixing pulp url in config template


  Commit: 8ebd5d3446b7dbcb30f482f635322b7c5162f69b
      https://github.com/Katello/katello/commit/8ebd5d3446b7dbcb30f482f635322b7c5162f69b
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M .gitignore
    M .travis.yml
    R README
    A README.md
    M agent/katello-agent.spec
    M cli/etc/katello.completion.sh
    M cli/katello-cli.spec
    M cli/po/as.po
    M cli/po/bn.po
    M cli/po/cs.po
    M cli/po/de.po
    M cli/po/es.po
    M cli/po/fr.po
    M cli/po/gu.po
    M cli/po/hi.po
    M cli/po/it.po
    M cli/po/ja.po
    M cli/po/keys.pot
    M cli/po/kn.po
    M cli/po/ko.po
    M cli/po/ml.po
    M cli/po/mr.po
    M cli/po/or.po
    M cli/po/pa.po
    M cli/po/pt.po
    M cli/po/pt_BR.po
    M cli/po/ru.po
    M cli/po/ta.po
    M cli/po/te.po
    M cli/po/zh_CN.po
    M cli/po/zh_TW.po
    A cli/src/katello/client/api/compute_resource.py
    M cli/src/katello/client/api/utils.py
    M cli/src/katello/client/cli/base.py
    M cli/src/katello/client/core/activation_key.py
    M cli/src/katello/client/core/architecture.py
    M cli/src/katello/client/core/base.py
    M cli/src/katello/client/core/changeset.py
    M cli/src/katello/client/core/client.py
    A cli/src/katello/client/core/compute_resource.py
    M cli/src/katello/client/core/config_template.py
    M cli/src/katello/client/core/distribution.py
    M cli/src/katello/client/core/domain.py
    M cli/src/katello/client/core/environment.py
    M cli/src/katello/client/core/errata.py
    M cli/src/katello/client/core/gpg_key.py
    M cli/src/katello/client/core/organization.py
    M cli/src/katello/client/core/package.py
    M cli/src/katello/client/core/packagegroup.py
    M cli/src/katello/client/core/permission.py
    M cli/src/katello/client/core/ping.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/provider.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/smart_proxy.py
    M cli/src/katello/client/core/subnet.py
    M cli/src/katello/client/core/sync_plan.py
    M cli/src/katello/client/core/system.py
    M cli/src/katello/client/core/system_custom_info.py
    M cli/src/katello/client/core/system_group.py
    M cli/src/katello/client/core/template.py
    M cli/src/katello/client/core/user.py
    M cli/src/katello/client/core/user_role.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/i18n_optparse.py
    M cli/src/katello/client/main.py
    M cli/src/katello/client/server.py
    M cli/src/katello/client/utils/printer.py
    A cli/test/katello/tests/core/environment/__init__.py
    A cli/test/katello/tests/core/environment/environment_base_test.py
    A cli/test/katello/tests/core/environment/environment_create_test.py
    A cli/test/katello/tests/core/environment/environment_data.py
    A cli/test/katello/tests/core/environment/environment_update_test.py
    M cli/test/katello/tests/utils/printer_test.py
    M katello-configure/bin/katello-configure
    M katello-configure/default-answer-file
    M katello-configure/katello-configure.spec
    M katello-configure/lib/util/functions.rb
    M katello-configure/man/katello-configure.pod
    M katello-configure/modules/apache2/manifests/init.pp
    M katello-configure/modules/candlepin/manifests/init.pp
    M katello-configure/modules/candlepin/templates/etc/candlepin/candlepin.conf.erb
    M katello-configure/modules/certs/manifests/config.pp
    M katello-configure/modules/certs/manifests/init.pp
    M katello-configure/modules/elasticsearch/manifests/init.pp
    M katello-configure/modules/foreman/manifests/config.pp
    M katello-configure/modules/foreman/manifests/init.pp
    M katello-configure/modules/foreman/manifests/params.pp
    M katello-configure/modules/katello/manifests/config.pp
    A katello-configure/modules/katello/manifests/config/files.pp
    M katello-configure/modules/katello/manifests/init.pp
    M katello-configure/modules/katello/templates/etc/katello/katello.yml.erb
    M katello-configure/modules/mongodb/manifests/init.pp
    M katello-configure/modules/postgres/manifests/createdb.pp
    M katello-configure/modules/postgres/manifests/createuser.pp
    M katello-configure/modules/postgres/manifests/init.pp
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/modules/pulp/manifests/init.pp
    M katello-configure/modules/qpid/manifests/init.pp
    M katello-configure/modules/thumbslug/manifests/init.pp
    A katello-configure/upgrade-scripts/0701_delete_undeleted_providers.rb
    A katello-configure/upgrade-scripts/0705_katello_configure.sh
    M katello-utils/katello-utils.spec
    M rel-eng/build-missing-builds-in-koji.sh
    A rel-eng/comps/comps-katello-candlepin-server-fedora18.xml
    A rel-eng/comps/comps-katello-client-fedora18.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora16.xml
    M rel-eng/comps/comps-katello-foreman-server-fedora17.xml
    A rel-eng/comps/comps-katello-foreman-server-fedora18.xml
    M rel-eng/comps/comps-katello-foreman-server-rhel6.xml
    A rel-eng/comps/comps-katello-pulp-server-fedora18.xml
    A rel-eng/comps/comps-katello-server-fedora18.xml
    M rel-eng/koji-missing-builds.py
    M rel-eng/packages/katello-selinux
    M rel-eng/packages/katello-utils
    M rel-eng/releasers.conf
    M rel-eng/tito.props
    M scripts/ci/katello_pull_request_tests.sh
    M scripts/devsetup
    R scripts/gemfile-lock-install
    M scripts/run-tests.sh
    M scripts/system-test/cli-system-test
    A scripts/system-test/cli_tests/compute_resource.sh
    M scripts/system-test/cli_tests/system.sh
    M scripts/system-test/katello-cli-tests.spec
    M scripts/test/repo_generation/README.TXT
    A scripts/test/repo_generation/cds/meta.txt
    A scripts/test/repo_generation/create_cds.sh
    M scripts/test/repo_generation/create_dummy_package.sh
    M scripts/test/repo_generation/create_repo.sh
    M scripts/test/repo_generation/updated_zoo/errata.txt
    M selinux/katello-selinux/katello-selinux.spec
    M src/.gitignore
    M src/Gemfile
    R src/README
    M src/app/controllers/api/api_controller.rb
    M src/app/controllers/api/candlepin_proxies_controller.rb
    A src/app/controllers/api/foreman/compute_resources_controller.rb
    M src/app/controllers/api/foreman/simple_crud_controller.rb
    M src/app/controllers/api/foreman/smart_proxies_controller.rb
    M src/app/controllers/api/organizations_controller.rb
    M src/app/controllers/api/ping_controller.rb
    M src/app/controllers/api/proxies_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/root_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/api/users_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/application_info_controller.rb
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/foreman/architectures_controller.rb
    A src/app/controllers/foreman/smart_proxies_controller.rb
    M src/app/controllers/gpg_keys_controller.rb
    M src/app/controllers/organizations_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/repositories_controller.rb
    M src/app/controllers/system_group_packages_controller.rb
    M src/app/controllers/system_groups_controller.rb
    M src/app/controllers/system_templates_controller.rb
    M src/app/controllers/systems_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    M src/app/controllers/users_controller.rb
    M src/app/helpers/application_helper.rb
    M src/app/helpers/branding_helper.rb
    M src/app/helpers/breadcrumb_helper.rb
    M src/app/helpers/content_search_helper.rb
    M src/app/helpers/katello_url_helper.rb
    M src/app/helpers/password_resets_helper.rb
    M src/app/helpers/search_helper.rb
    M src/app/helpers/users_helper.rb
    M src/app/mailers/user_mailer.rb
    M src/app/models/activation_key.rb
    M src/app/models/async_operation.rb
    M src/app/models/authorization/environment.rb
    M src/app/models/authorization/organization.rb
    M src/app/models/authorization/provider.rb
    M src/app/models/authorization/system.rb
    M src/app/models/changeset.rb
    M src/app/models/changeset_distribution.rb
    M src/app/models/changeset_erratum.rb
    M src/app/models/changeset_package.rb
    M src/app/models/deletion_changeset.rb
    M src/app/models/environment_system_group.rb
    M src/app/models/errors.rb
    A src/app/models/ext/indexed_model.rb
    A src/app/models/ext/permission_tag_cleanup.rb
    A src/app/models/foreman/compute_resource.rb
    A src/app/models/foreman/compute_resource/ec2.rb
    A src/app/models/foreman/compute_resource/libvirt.rb
    A src/app/models/foreman/compute_resource/openstack.rb
    A src/app/models/foreman/compute_resource/ovirt.rb
    A src/app/models/foreman/compute_resource/rackspace.rb
    A src/app/models/foreman/compute_resource/vmware.rb
    M src/app/models/foreman/smart_proxy.rb
    M src/app/models/foreman/subnet.rb
    M src/app/models/glue.rb
    M src/app/models/glue/candlepin/consumer.rb
    M src/app/models/glue/candlepin/content.rb
    M src/app/models/glue/elastic_search/activation_key.rb
    M src/app/models/glue/elastic_search/changeset.rb
    M src/app/models/glue/elastic_search/errata.rb
    M src/app/models/glue/elastic_search/gpg_key.rb
    M src/app/models/glue/elastic_search/job.rb
    M src/app/models/glue/elastic_search/notice.rb
    M src/app/models/glue/elastic_search/organization.rb
    M src/app/models/glue/elastic_search/package.rb
    M src/app/models/glue/elastic_search/pool.rb
    M src/app/models/glue/elastic_search/product.rb
    M src/app/models/glue/elastic_search/provider.rb
    M src/app/models/glue/elastic_search/repository.rb
    M src/app/models/glue/elastic_search/role.rb
    M src/app/models/glue/elastic_search/sync_plan.rb
    M src/app/models/glue/elastic_search/system.rb
    M src/app/models/glue/elastic_search/system_group.rb
    M src/app/models/glue/elastic_search/task_status.rb
    M src/app/models/glue/elastic_search/user.rb
    M src/app/models/glue/foreman/user.rb
    M src/app/models/glue/provider.rb
    M src/app/models/glue/pulp/errata.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/gpg_key.rb
    R src/app/models/indexed_model.rb
    R src/app/models/katello_description_format_validator.rb
    R src/app/models/katello_label_format_validator.rb
    R src/app/models/katello_name_format_validator.rb
    R src/app/models/katello_url_format_validator.rb
    M src/app/models/kt_environment.rb
    R src/app/models/lazy_accessor.rb
    R src/app/models/no_trailing_space_validator.rb
    M src/app/models/organization.rb
    M src/app/models/organization_destroyer.rb
    M src/app/models/permission.rb
    M src/app/models/ping.rb
    M src/app/models/pool.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/provider.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/repository.rb
    M src/app/models/resource_type.rb
    M src/app/models/role.rb
    R src/app/models/support.rb
    M src/app/models/sync_plan.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/system_template.rb
    M src/app/models/system_template_distribution.rb
    M src/app/models/system_template_pack_group.rb
    M src/app/models/system_template_package.rb
    M src/app/models/system_template_pg_category.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb
    M src/app/stylesheets/katello.scss
    M src/app/stylesheets/sections/content_search.scss
    M src/app/stylesheets/widgets/_chosen.scss
    M src/app/views/activation_keys/_edit.html.haml
    M src/app/views/activation_keys/_new.html.haml
    M src/app/views/activation_keys/index.html.haml
    M src/app/views/common/_common_i18n.html.haml
    M src/app/views/common/_footer.haml
    M src/app/views/common/_header.haml
    M src/app/views/common/_list_update.html.haml
    R src/app/views/consumers/export_status.html.haml
    M src/app/views/content_search/_browser_box.html.haml
    M src/app/views/content_search/_grid.html.haml
    M src/app/views/dashboard/index.html.haml
    M src/app/views/environments/_edit.html.haml
    M src/app/views/environments/_new.html.haml
    A src/app/views/foreman/smart_proxies/_edit.html.haml
    A src/app/views/foreman/smart_proxies/_new.html.haml
    A src/app/views/foreman/smart_proxies/index.html.haml
    M src/app/views/organizations/_download_debug_certificate.html.haml
    R src/app/views/owners/import_status.html.haml
    M src/app/views/products/_new.html.haml
    M src/app/views/promotions/show.html.haml
    M src/app/views/providers/redhat/_children.html.haml
    M src/app/views/repositories/_new.html.haml
    M src/app/views/subscriptions/_new.html.haml
    M src/app/views/sync_management/_products.html.haml
    M src/app/views/system_groups/_edit.html.haml
    M src/app/views/system_groups/_new.html.haml
    M src/app/views/system_templates/index.html.haml
    M src/app/views/systems/_actions.html.haml
    M src/app/views/systems/_edit.html.haml
    M src/app/views/systems/_new.html.haml
    M src/app/views/systems/_products.html.haml
    M src/bundler.d/checking.rb
    M src/bundler.d/foreman.rb
    M src/bundler.d/test.rb
    M src/config.ru
    M src/config/application.rb
    M src/config/assets.yml
    M src/config/compass.rb
    M src/config/database.yml
    M src/config/environments/production.rb
    R src/config/initializers/app_config.rb
    M src/config/initializers/delayed_job.rb
    M src/config/initializers/logical_insight.rb
    M src/config/initializers/secret_token.rb
    M src/config/initializers/tire.rb
    M src/config/initializers/warden.rb
    A src/config/katello.template.yml
    R src/config/katello.yml
    A src/config/locales/README
    R src/config/locales/bn-IN.yml
    A src/config/locales/bn.yml
    A src/config/locales/compare_upstream.sh
    M src/config/locales/cs.yml
    M src/config/locales/de.yml
    M src/config/locales/en.yml
    M src/config/locales/es.yml
    M src/config/locales/fr.yml
    M src/config/locales/hi.yml
    M src/config/locales/it.yml
    M src/config/locales/ja.yml
    M src/config/locales/kn.yml
    M src/config/locales/ko.yml
    M src/config/locales/pt-BR.yml
    R src/config/locales/pt-PT.yml
    A src/config/locales/pt.yml
    M src/config/locales/ru.yml
    A src/config/locales/update.sh
    M src/config/locales/zh-CN.yml
    M src/config/locales/zh-TW.yml
    M src/config/routes.rb
    M src/db/migrate/20111208225553_add_user_to_task_status.rb
    M src/db/seeds.rb
    M src/deploy/common/katello-jobs.logrotate
    M src/deploy/common/katello.init
    M src/deploy/common/katello.logrotate
    R src/gemfiles/Gemfile.f16.lock
    R src/gemfiles/Gemfile.f17.lock
    R src/gemfiles/Gemfile.rhel6.lock
    M src/katello.spec
    A src/lib/app_config.rb
    M src/lib/glue/queue.rb
    M src/lib/http_resource.rb
    A src/lib/katello_config.rb
    M src/lib/katello_logger.rb
    A src/lib/lazy_accessor.rb
    M src/lib/navigation/administration.rb
    M src/lib/navigation/content_management.rb
    M src/lib/navigation/main.rb
    M src/lib/navigation/setup.rb
    M src/lib/navigation/systems.rb
    M src/lib/notifications/notifier.rb
    M src/lib/resources/abstract_model.rb
    M src/lib/resources/abstract_model/indexed_model.rb
    M src/lib/resources/candlepin.rb
    M src/lib/resources/cdn.rb
    M src/lib/resources/foreman.rb
    M src/lib/resources/foreman_model.rb
    M src/lib/task.rb
    M src/lib/tasks/headpin_misc.rake
    M src/lib/tasks/hudson.rake
    M src/lib/tasks/test.rake
    R src/lib/util/boot_util.rb
    M src/lib/util/password.rb
    A src/lib/util/support.rb
    M src/lib/util/task_status.rb
    M src/lib/util/threadsession.rb
    A src/lib/validators/changeset_distribution_validator.rb
    A src/lib/validators/changeset_erratum_validator.rb
    A src/lib/validators/changeset_package_validator.rb
    A src/lib/validators/content_validator.rb
    A src/lib/validators/distribution_validator.rb
    A src/lib/validators/katello_description_format_validator.rb
    A src/lib/validators/katello_label_format_validator.rb
    A src/lib/validators/katello_name_format_validator.rb
    A src/lib/validators/katello_url_format_validator.rb
    A src/lib/validators/library_presence_validator.rb
    A src/lib/validators/lock_validator.rb
    A src/lib/validators/no_trailing_space_validator.rb
    A src/lib/validators/non_library_environment_validator.rb
    A src/lib/validators/not_in_library_validator.rb
    A src/lib/validators/pack_group_validator.rb
    A src/lib/validators/package_uniqueness_validator.rb
    A src/lib/validators/package_validator.rb
    A src/lib/validators/parent_template_validator.rb
    A src/lib/validators/path_descendents_validator.rb
    A src/lib/validators/permission_validator.rb
    A src/lib/validators/pg_category_validator.rb
    A src/lib/validators/prior_validator.rb
    A src/lib/validators/repo_disablement_validator.rb
    A src/lib/validators/rolename_validator.rb
    A src/lib/validators/self_reference_environment_validator.rb
    A src/lib/validators/username_validator.rb
    M src/locale/app.pot
    M src/locale/bn/app.po
    M src/locale/cs/app.po
    M src/locale/de/app.po
    M src/locale/en/app.po
    M src/locale/es/app.po
    M src/locale/fr/app.po
    M src/locale/gu/app.po
    M src/locale/hi/app.po
    M src/locale/it/app.po
    M src/locale/ja/app.po
    M src/locale/kn/app.po
    M src/locale/ko/app.po
    M src/locale/mr/app.po
    M src/locale/or/app.po
    M src/locale/pa/app.po
    A src/locale/pt/app.po
    M src/locale/pt_BR/app.po
    M src/locale/ru/app.po
    M src/locale/ta/app.po
    M src/locale/te/app.po
    M src/locale/zh_CN/app.po
    M src/locale/zh_TW/app.po
    M src/public/javascripts/architecture.js
    M src/public/javascripts/content_search.js
    M src/public/javascripts/domain.js
    M src/public/javascripts/katello.js
    M src/public/javascripts/panel.js
    M src/public/javascripts/promotion.js
    M src/public/javascripts/role_sliding_tree.js
    M src/public/javascripts/routes.js
    M src/public/javascripts/slidingtree.js
    A src/public/javascripts/smart_proxy.js
    A src/public/javascripts/spin.min.js
    M src/public/javascripts/subnet.js
    M src/public/javascripts/system_template.js
    M src/public/javascripts/systems.js
    M src/public/javascripts/user_methods.js
    M src/public/javascripts/widgets/comparison_grid.js
    M src/public/javascripts/widgets/tipsy.custom.js
    M src/script/katello-generate-passphrase
    M src/script/rails
    M src/script/reset-oauth
    M src/script/ruby-linter
    M src/spec/controllers/activation_keys_controller_spec.rb
    M src/spec/controllers/api/activation_keys_controller_spec.rb
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/changesets_controller_spec.rb
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/environments_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    M src/spec/controllers/api/foreman/architectures_controller_spec.rb
    A src/spec/controllers/api/foreman/compute_resources_controller_spec.rb
    M src/spec/controllers/api/foreman/config_templates_controller_spec.rb
    M src/spec/controllers/api/foreman/domains_controller_spec.rb
    M src/spec/controllers/api/foreman/smart_proxies_controller_spec.rb
    M src/spec/controllers/api/gpg_keys_controller_spec.rb
    M src/spec/controllers/api/organizations_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/permissions_controller_spec.rb
    M src/spec/controllers/api/ping_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/roles_controller_spec.rb
    M src/spec/controllers/api/root_controller_spec.rb
    M src/spec/controllers/api/sync_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/api/tasks_controller_spec.rb
    M src/spec/controllers/api/templates_content_controller_spec.rb
    M src/spec/controllers/api/templates_controller_spec.rb
    M src/spec/controllers/api/uebercerts_controller_spec.rb
    M src/spec/controllers/api/users_controller_spec.rb
    M src/spec/controllers/distributions_controller_spec.rb
    M src/spec/controllers/environments_controller_spec.rb
    M src/spec/controllers/system_group_packages_controller_spec.rb
    M src/spec/helpers/application_info_helper_spec.rb
    M src/spec/helpers/authorization_helper_methods.rb
    M src/spec/helpers/katello_url_helper_spec.rb
    M src/spec/helpers/login_helper_methods.rb
    M src/spec/helpers/organization_helper_methods.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/product_test_data.rb
    M src/spec/helpers/repo_test_data.rb
    M src/spec/helpers/repository_helper_methods.rb
    M src/spec/helpers/search_helper_methods.rb
    M src/spec/lib/cdn_spec.rb
    A src/spec/lib/navigation_spec.rb
    M src/spec/lib/resources/foreman_model_spec.rb
    M src/spec/models/activation_key_spec.rb
    M src/spec/models/changeset_spec.rb
    M src/spec/models/custom_info_spec.rb
    M src/spec/models/environment_spec.rb
    M src/spec/models/glue/foreman/user_spec.rb
    M src/spec/models/hypervisor_spec.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/permission_spec.rb
    A src/spec/models/ping_spec.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb
    M src/spec/models/role_spec.rb
    M src/spec/models/system_spec.rb
    M src/spec/support/foreman_user_disablement.rb
    M src/spec/support/shared_examples/protected_action_shared_examples.rb
    M src/spec/support/shared_examples/simple_crud_controller.rb
    M src/test/minitest_helper.rb
    M src/test/models/authorization/authorization_base.rb
    M src/test/models/user_base.rb
    M src/test/models/user_test.rb

  Log Message:
  -----------
  Merge pull request #1468 from jlsherrill/pulpv2-merge

Pulpv2 - merge from master


  Commit: fd2542ff4e7c6003b79534236a6a076dee208697
      https://github.com/Katello/katello/commit/fd2542ff4e7c6003b79534236a6a076dee208697
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M rel-eng/packages/katello
    M src/katello.spec

  Log Message:
  -----------
  Automatic commit of package [katello] release [1.3.11.pulpv2-1].


  Commit: de076be8ad0b2721d69e3110f290f69fef50feb0
      https://github.com/Katello/katello/commit/de076be8ad0b2721d69e3110f290f69fef50feb0
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M katello-configure/katello-configure.spec

  Log Message:
  -----------
  fixing pulpv2 version in spec


  Commit: 2500bfbfdf69b5653f44607373c35d320f5f677a
      https://github.com/Katello/katello/commit/2500bfbfdf69b5653f44607373c35d320f5f677a
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M katello-configure/katello-configure.spec
    M rel-eng/packages/katello-configure

  Log Message:
  -----------
  Automatic commit of package [katello-configure] release [1.3.3.pulpv2-1].


  Commit: 6d1e82c51bd431f1dafce697f55b0af88225c688
      https://github.com/Katello/katello/commit/6d1e82c51bd431f1dafce697f55b0af88225c688
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-26 (Sat, 26 Jan 2013)

  Changed paths:
    M rel-eng/comps/comps-katello-pulp-server-fedora17.xml
    M rel-eng/comps/comps-katello-pulp-server-rhel6.xml

  Log Message:
  -----------
  adding pulp-builtin rpms to comps


  Commit: ddee6690c5a79ae6c19e56b6161b968f08b37c90
      https://github.com/Katello/katello/commit/ddee6690c5a79ae6c19e56b6161b968f08b37c90
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-27 (Sun, 27 Jan 2013)

  Changed paths:
    M katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb

  Log Message:
  -----------
  changing pulp configure to use ssl for qpid


  Commit: fd9108021385c7cef998c024e916d814434c08d9
      https://github.com/Katello/katello/commit/fd9108021385c7cef998c024e916d814434c08d9
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-27 (Sun, 27 Jan 2013)

  Changed paths:
    M katello-configure/katello-configure.spec
    M rel-eng/packages/katello-configure

  Log Message:
  -----------
  Automatic commit of package [katello-configure] release [1.3.4.pulpv2-1].


  Commit: 10d694858efc5d5d61f37320e0943cf794a839bc
      https://github.com/Katello/katello/commit/10d694858efc5d5d61f37320e0943cf794a839bc
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-28 (Mon, 28 Jan 2013)

  Changed paths:
    M src/katello.spec
    M src/spec/controllers/api/activation_keys_controller_spec.rb
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/changesets_controller_spec.rb
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/environments_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    M src/spec/controllers/api/gpg_keys_controller_spec.rb
    M src/spec/controllers/api/organizations_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/permissions_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/roles_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/api/tasks_controller_spec.rb
    M src/spec/controllers/api/templates_content_controller_spec.rb
    M src/spec/controllers/api/templates_controller_spec.rb
    M src/spec/controllers/api/uebercerts_controller_spec.rb
    M src/spec/controllers/api/users_controller_spec.rb

  Log Message:
  -----------
  merge conflict


  Commit: 506e033b46c6308308ff6b227b08c7d9cc0cf4aa
      https://github.com/Katello/katello/commit/506e033b46c6308308ff6b227b08c7d9cc0cf4aa
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-28 (Mon, 28 Jan 2013)

  Changed paths:
    M src/katello.spec

  Log Message:
  -----------
  fixing changelog


  Commit: 3ac6c321943e4e5e86cfc266c6a8209b90e7d990
      https://github.com/Katello/katello/commit/3ac6c321943e4e5e86cfc266c6a8209b90e7d990
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2013-01-28 (Mon, 28 Jan 2013)

  Changed paths:
    M src/katello.spec
    M src/spec/controllers/api/activation_keys_controller_spec.rb
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/changesets_controller_spec.rb
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/environments_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    M src/spec/controllers/api/gpg_keys_controller_spec.rb
    M src/spec/controllers/api/organizations_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/permissions_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/roles_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/api/tasks_controller_spec.rb
    M src/spec/controllers/api/templates_content_controller_spec.rb
    M src/spec/controllers/api/templates_controller_spec.rb
    M src/spec/controllers/api/uebercerts_controller_spec.rb
    M src/spec/controllers/api/users_controller_spec.rb

  Log Message:
  -----------
  Merge pull request #1471 from jlsherrill/pulpv2-merge

Pulpv2 merge from master


  Commit: 97f1e819fea78602b83257c9c864441d7e9d1278
      https://github.com/Katello/katello/commit/97f1e819fea78602b83257c9c864441d7e9d1278
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-28 (Mon, 28 Jan 2013)

  Changed paths:
    M rel-eng/packages/katello
    M src/katello.spec

  Log Message:
  -----------
  Automatic commit of package [katello] release [1.3.12.pulpv2-1].


  Commit: cecf2c5c2fe607cfd11f4ebac9414f2026e4f17d
      https://github.com/Katello/katello/commit/cecf2c5c2fe607cfd11f4ebac9414f2026e4f17d
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M src/app/controllers/providers_controller.rb
    M src/app/helpers/providers_helper.rb
    M src/app/helpers/sync_management_helper.rb
    M src/app/models/glue/candlepin/product.rb
    M src/app/models/glue/provider.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/views/providers/redhat/_children.html.haml
    M src/app/views/providers/redhat/show.html.haml
    M src/config/routes.rb
    A src/db/migrate/20130117110946_add_repositories_synced_to_product.rb
    M src/lib/resources/cdn.rb
    M src/lib/tasks/jsroutes.rake
    M src/lib/util/cdn_var_substitutor.rb
    M src/spec/controllers/providers_controller_spec.rb
    M src/spec/helpers/sync_management_helper_spec.rb
    M src/spec/lib/cdn_spec.rb
    M src/spec/models/provider_spec.rb

  Log Message:
  -----------
  Merge branch 'master' of github.com:Katello/katello into pulpv2

Conflicts:
	src/app/controllers/providers_controller.rb
	src/app/helpers/providers_helper.rb
	src/app/models/glue/pulp/repos.rb
	src/spec/controllers/providers_controller_spec.rb


  Commit: 4b7e335ead6925de4a157399aeb3dd77fa290058
      https://github.com/Katello/katello/commit/4b7e335ead6925de4a157399aeb3dd77fa290058
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb

  Log Message:
  -----------
  fixing sync hanging in pulpv2

based off this commit 4c8a60b81564474cc2c36c245a9e2897525811f6
but with a slightly different algorithm


  Commit: 7f2c00883e84506511e76be8aa9b782cae7a19ce
      https://github.com/Katello/katello/commit/7f2c00883e84506511e76be8aa9b782cae7a19ce
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb

  Log Message:
  -----------
  Merge pull request #1474 from jlsherrill/pulpv2

fixing sync hanging in pulpv2


  Commit: 6583a5d34f0e884e7fea1c5f5c4c17480953a389
      https://github.com/Katello/katello/commit/6583a5d34f0e884e7fea1c5f5c4c17480953a389
  Author: Justin Sherrill <jsherril@redhat.com>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M katello-configure/katello-configure.spec
    M rel-eng/packages/katello-configure

  Log Message:
  -----------
  Automatic commit of package [katello-configure] release [1.3.5.pulpv2-1].


  Commit: 0008c3a2095a19377634dad191cc31aad669e4b5
      https://github.com/Katello/katello/commit/0008c3a2095a19377634dad191cc31aad669e4b5
  Author: Eric D. Helms <ehelms@redhat.com>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M src/spec/helpers/sync_management_helper_spec.rb

  Log Message:
  -----------
  PulpV2 - Fixes broken test by stubbing Runcible method.


  Commit: e113949ef72c8ce26184e21b8125d3f07799ccd8
      https://github.com/Katello/katello/commit/e113949ef72c8ce26184e21b8125d3f07799ccd8
  Author: Eric D Helms <ericdhelms@gmail.com>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M src/app/controllers/providers_controller.rb
    M src/app/helpers/providers_helper.rb
    M src/app/helpers/sync_management_helper.rb
    M src/app/models/glue/candlepin/product.rb
    M src/app/models/glue/provider.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/views/providers/redhat/_children.html.haml
    M src/app/views/providers/redhat/show.html.haml
    M src/config/routes.rb
    A src/db/migrate/20130117110946_add_repositories_synced_to_product.rb
    M src/lib/resources/cdn.rb
    M src/lib/tasks/jsroutes.rake
    M src/lib/util/cdn_var_substitutor.rb
    M src/spec/controllers/providers_controller_spec.rb
    M src/spec/helpers/sync_management_helper_spec.rb
    M src/spec/lib/cdn_spec.rb
    M src/spec/models/provider_spec.rb

  Log Message:
  -----------
  Merge pull request #1473 from ehelms/pulpv2

Pulpv2 - Merging in master and fixing a few minor conflicts.


  Commit: e32df7bce38e2407887910903c99a02479aaf2f6
      https://github.com/Katello/katello/commit/e32df7bce38e2407887910903c99a02479aaf2f6
  Author: Justin Sherrill <jlsherrill@gmail.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M agent/etc/gofer/plugins/katelloplugin.conf
    M agent/katello-agent.spec
    M agent/src/katello/agent/katelloplugin.py
    M cli/katello-cli.spec
    R cli/src/katello/client/api/filter.py
    M cli/src/katello/client/api/product.py
    M cli/src/katello/client/api/provider.py
    M cli/src/katello/client/api/repo.py
    M cli/src/katello/client/api/utils.py
    R cli/src/katello/client/core/filters.py
    M cli/src/katello/client/core/packagegroup.py
    M cli/src/katello/client/core/product.py
    M cli/src/katello/client/core/repo.py
    M cli/src/katello/client/core/utils.py
    M cli/src/katello/client/main.py
    M cli/test/katello/tests/core/changeset/changeset_create_test.py
    R cli/test/katello/tests/core/filter/__init__.py
    R cli/test/katello/tests/core/filter/filter_add_package_test.py
    R cli/test/katello/tests/core/filter/filter_create_test.py
    R cli/test/katello/tests/core/filter/filter_data.py
    R cli/test/katello/tests/core/filter/filter_delete_test.py
    R cli/test/katello/tests/core/filter/filter_info_test.py
    R cli/test/katello/tests/core/filter/filter_list_test.py
    R cli/test/katello/tests/core/filter/filter_remove_package_test.py
    R cli/test/katello/tests/core/filter/filter_update_test.py
    M cli/test/katello/tests/core/packagegroup/packagegroup_data.py
    R cli/test/katello/tests/core/product/product_add_remove_filter_test.py
    M cli/test/katello/tests/core/product/product_create_test.py
    R cli/test/katello/tests/core/product/product_list_filter_test.py
    R cli/test/katello/tests/core/repo/repo_add_remove_filter_test.py
    M cli/test/katello/tests/core/repo/repo_data.py
    M cli/test/katello/tests/core/repo/repo_discovery_test.py
    R cli/test/katello/tests/core/repo/repo_list_filters_test.py
    M katello-configure/katello-configure.spec
    M katello-configure/lib/puppet/parser/functions/katello_pulp_url.rb
    M katello-configure/modules/katello/manifests/config.pp
    M katello-configure/modules/katello/templates/etc/katello/katello.yml.erb
    M katello-configure/modules/pulp/manifests/config.pp
    M katello-configure/modules/pulp/templates/etc/httpd/conf.d/pulp.conf.erb
    R katello-configure/modules/pulp/templates/etc/pulp/pulp.conf.erb
    A katello-configure/modules/pulp/templates/etc/pulp/server.conf.erb
    M katello-configure/upgrade-scripts/0110_migrate_pulp.sh
    M rel-eng/comps/comps-katello-pulp-server-fedora17.xml
    M rel-eng/comps/comps-katello-pulp-server-rhel6.xml
    M rel-eng/comps/comps-katello-server-fedora16.xml
    M rel-eng/comps/comps-katello-server-fedora17.xml
    M rel-eng/comps/comps-katello-server-rhel6.xml
    M rel-eng/packages/katello
    M rel-eng/packages/katello-agent
    M rel-eng/packages/katello-cli
    M rel-eng/packages/katello-cli-tests
    M rel-eng/packages/katello-configure
    M scripts/ci/katello_pull_request_tests.sh
    M scripts/system-test/cli_tests/_base_cleanup.sh
    M scripts/system-test/cli_tests/_base_setup.sh
    R scripts/system-test/cli_tests/filter.sh
    M scripts/system-test/cli_tests/product.sh
    M scripts/system-test/cli_tests/repo.sh
    M scripts/system-test/katello-cli-tests.spec
    M src/.gitignore
    M src/Gemfile
    M src/Rakefile
    M src/app/controllers/activation_keys_controller.rb
    M src/app/controllers/api/distributions_controller.rb
    M src/app/controllers/api/errata_controller.rb
    R src/app/controllers/api/filters_controller.rb
    M src/app/controllers/api/packages_controller.rb
    M src/app/controllers/api/providers_controller.rb
    R src/app/controllers/api/pulp_proxies_controller.rb
    M src/app/controllers/api/repositories_controller.rb
    M src/app/controllers/api/role_ldap_groups_controller.rb
    M src/app/controllers/api/sync_controller.rb
    M src/app/controllers/api/sync_plans_controller.rb
    M src/app/controllers/api/system_groups_controller.rb
    M src/app/controllers/api/systems_controller.rb
    M src/app/controllers/application_controller.rb
    M src/app/controllers/changesets_controller.rb
    M src/app/controllers/content_search_controller.rb
    M src/app/controllers/dashboard_controller.rb
    M src/app/controllers/errata_controller.rb
    M src/app/controllers/failed_authentication_controller.rb
    R src/app/controllers/filters_controller.rb
    M src/app/controllers/packages_controller.rb
    M src/app/controllers/products_controller.rb
    M src/app/controllers/promotions_controller.rb
    M src/app/controllers/providers_controller.rb
    M src/app/controllers/repositories_controller.rb
    M src/app/controllers/roles_controller.rb
    M src/app/controllers/search_controller.rb
    M src/app/controllers/sync_schedules_controller.rb
    M src/app/controllers/system_errata_controller.rb
    M src/app/controllers/system_group_errata_controller.rb
    M src/app/controllers/system_group_packages_controller.rb
    M src/app/controllers/system_packages_controller.rb
    M src/app/controllers/system_templates_controller.rb
    M src/app/controllers/user_sessions_controller.rb
    M src/app/helpers/application_helper.rb
    M src/app/helpers/breadcrumb_helper.rb
    M src/app/helpers/content_search_helper.rb
    M src/app/helpers/dashboard_helper.rb
    M src/app/helpers/errata_helper.rb
    M src/app/helpers/katello_url_helper.rb
    M src/app/helpers/notices_helper.rb
    M src/app/helpers/products_helper.rb
    M src/app/helpers/promotions_helper.rb
    M src/app/helpers/providers_helper.rb
    M src/app/helpers/repositories_helper.rb
    M src/app/helpers/system_errata_helper.rb
    M src/app/helpers/systems_helper.rb
    M src/app/mailers/user_mailer.rb
    M src/app/models/activation_key.rb
    M src/app/models/async_operation.rb
    A src/app/models/authorization/activation_key.rb
    A src/app/models/authorization/enforcement.rb
    A src/app/models/authorization/environment.rb
    A src/app/models/authorization/gpg_key.rb
    A src/app/models/authorization/organization.rb
    A src/app/models/authorization/product.rb
    A src/app/models/authorization/provider.rb
    A src/app/models/authorization/repository.rb
    A src/app/models/authorization/role.rb
    A src/app/models/authorization/system.rb
    A src/app/models/authorization/system_group.rb
    A src/app/models/authorization/system_template.rb
    A src/app/models/authorization/user.rb
    M src/app/models/changeset.rb
    M src/app/models/changeset_dependency.rb
    M src/app/models/changeset_erratum.rb
    M src/app/models/changeset_package.rb
    M src/app/models/changeset_user.rb
    M src/app/models/deletion_changeset.rb
    A src/app/models/distribution.rb
    M src/app/models/environment_system_group.rb
    A src/app/models/errata.rb
    R src/app/models/ext/authorization.rb
    M src/app/models/ext/indexed_model.rb
    R src/app/models/filter.rb
    M src/app/models/glue.rb
    M src/app/models/glue/candlepin/content.rb
    M src/app/models/glue/candlepin/environment.rb
    A src/app/models/glue/elastic_search/activation_key.rb
    A src/app/models/glue/elastic_search/changeset.rb
    A src/app/models/glue/elastic_search/environment.rb
    A src/app/models/glue/elastic_search/errata.rb
    A src/app/models/glue/elastic_search/gpg_key.rb
    A src/app/models/glue/elastic_search/job.rb
    A src/app/models/glue/elastic_search/notice.rb
    A src/app/models/glue/elastic_search/organization.rb
    A src/app/models/glue/elastic_search/package.rb
    A src/app/models/glue/elastic_search/pool.rb
    A src/app/models/glue/elastic_search/product.rb
    A src/app/models/glue/elastic_search/provider.rb
    A src/app/models/glue/elastic_search/repository.rb
    A src/app/models/glue/elastic_search/role.rb
    A src/app/models/glue/elastic_search/sync_plan.rb
    A src/app/models/glue/elastic_search/system.rb
    A src/app/models/glue/elastic_search/system_group.rb
    A src/app/models/glue/elastic_search/task_status.rb
    A src/app/models/glue/elastic_search/user.rb
    M src/app/models/glue/pulp/consumer.rb
    M src/app/models/glue/pulp/consumer_group.rb
    M src/app/models/glue/pulp/distribution.rb
    M src/app/models/glue/pulp/errata.rb
    R src/app/models/glue/pulp/filter.rb
    M src/app/models/glue/pulp/package.rb
    M src/app/models/glue/pulp/repo.rb
    M src/app/models/glue/pulp/repos.rb
    M src/app/models/glue/pulp/simple_package.rb
    M src/app/models/glue/pulp/user.rb
    M src/app/models/gpg_key.rb
    M src/app/models/job.rb
    M src/app/models/key_pool.rb
    M src/app/models/key_system_group.rb
    M src/app/models/kt_environment.rb
    M src/app/models/notice.rb
    M src/app/models/organization.rb
    A src/app/models/package.rb
    M src/app/models/permission.rb
    M src/app/models/permission_tag.rb
    M src/app/models/ping.rb
    M src/app/models/pool.rb
    M src/app/models/product.rb
    M src/app/models/promotion_changeset.rb
    M src/app/models/provider.rb
    M src/app/models/pulp_sync_status.rb
    M src/app/models/pulp_task_status.rb
    M src/app/models/repository.rb
    M src/app/models/resource_type.rb
    M src/app/models/role.rb
    M src/app/models/sync_plan.rb
    M src/app/models/system.rb
    M src/app/models/system_group.rb
    M src/app/models/system_system_group.rb
    M src/app/models/system_template.rb
    M src/app/models/system_template_distribution.rb
    M src/app/models/system_template_package.rb
    M src/app/models/task_status.rb
    M src/app/models/user.rb
    M src/app/models/user_notice.rb
    A src/app/models/virtual_tag.rb
    M src/app/stylesheets/katello.scss
    M src/app/stylesheets/sections/contents.scss
    M src/app/views/dashboard/_errata.haml
    M src/app/views/errata/_show.html.haml
    R src/app/views/filters/_edit.html.haml
    R src/app/views/filters/_new.html.haml
    R src/app/views/filters/_packages.html.haml
    R src/app/views/filters/_products.html.haml
    R src/app/views/filters/index.html.haml
    M src/app/views/promotions/_product.html.haml
    M src/app/views/promotions/_repo_items.html.haml
    M src/app/views/promotions/show.html.haml
    A src/app/views/providers/_new_discovered_repos.html.haml
    A src/app/views/providers/_repo_discovery.html.haml
    M src/app/views/repositories/_edit.html.haml
    M src/app/views/system_events/_event_items.html.haml
    M src/bundler.d/development.rb
    M src/bundler.d/test.rb
    M src/config/application.rb
    M src/config/assets.yml
    M src/config/environments/development.rb
    M src/config/initializers/apipie.rb
    M src/config/initializers/secret_token.rb
    M src/config/initializers/warden.rb
    M src/config/katello.template.yml
    M src/config/routes.rb
    M src/db/migrate/20110506182638_create_sync_plans.rb
    R src/db/migrate/20111006103843_create_filters.rb
    R src/db/migrate/20111014083338_filters_products.rb
    R src/db/migrate/20120123132008_filters_repositories.rb
    R src/db/migrate/20120330192143_filter_add_name.rb
    M src/db/migrate/20120420003530_create_system_system_groups.rb
    M src/db/migrate/20120515133827_create_jobs.rb
    A src/db/migrate/20120814142911_repository_add_content_id.rb
    A src/db/migrate/20120815145728_repository_add_arch.rb
    M src/db/migrate/20120820145108_add_db_indexes.rb
    M src/db/migrate/20120820203952_db_unique_indices.rb
    M src/db/migrate/20120911182916_add_labels_to_repository.rb
    A src/db/migrate/20121101224013_add_remote_id_to_users.rb
    A src/db/migrate/20121121185801_remove_filters.rb
    A src/db/migrate/20121127191652_remove_filters_permissions.rb
    A src/db/migrate/20121129223138_provider_add_repo_generation.rb
    A src/db/migrate/20121217160251_provider_add_discovery_task_id.rb
    A src/db/migrate/20130104151248_repository_add_feed.rb
    M src/db/seeds.rb
    M src/integration_spec/candlepin/consumer_api_spec.rb
    M src/integration_spec/spec_helper.rb
    M src/katello.spec
    M src/lib/katello_config.rb
    M src/lib/ldap.rb
    M src/lib/navigation/content_management.rb
    M src/lib/navigation/setup.rb
    A src/lib/repo_discovery.rb
    R src/lib/resources/pulp.rb
    M src/lib/tasks/test.rake
    M src/lib/util/errata.rb
    M src/lib/util/model_util.rb
    M src/lib/util/support.rb
    M src/lib/util/threadsession.rb
    M src/lib/validators/changeset_erratum_validator.rb
    A src/lib/validators/rolename_validator.rb
    M src/lib/validators/username_validator.rb
    R src/public/javascripts/filters.js
    M src/public/javascripts/panel.js
    M src/public/javascripts/promotion.js
    M src/public/javascripts/provider.js
    A src/public/javascripts/repo_discovery.js
    A src/public/javascripts/repo_discovery_create.js
    M src/public/javascripts/routes.js
    M src/public/javascripts/system_packages.js
    M src/public/javascripts/widgets/tipsy.custom.js
    M src/script/katello-reset-dbs
    M src/script/reset-oauth
    A src/script/ruby-linter
    M src/spec/controllers/api/changesets_content_controller_spec.rb
    M src/spec/controllers/api/custom_info_controller_spec.rb
    M src/spec/controllers/api/distributions_controller_spec.rb
    M src/spec/controllers/api/errata_controller_spec.rb
    R src/spec/controllers/api/filters_controller_spec.rb
    M src/spec/controllers/api/organization_system_info_keys_controller_spec.rb
    M src/spec/controllers/api/packages_controller_spec.rb
    M src/spec/controllers/api/products_controller_spec.rb
    M src/spec/controllers/api/providers_controller_spec.rb
    M src/spec/controllers/api/repositories_controller_spec.rb
    M src/spec/controllers/api/subscriptions_controller_spec.rb
    M src/spec/controllers/api/sync_controller_spec.rb
    M src/spec/controllers/api/system_group_errata_controller_spec.rb
    M src/spec/controllers/api/system_groups_controller_spec.rb
    M src/spec/controllers/api/systems_controller_spec.rb
    M src/spec/controllers/api/systems_packages_controller_spec.rb
    M src/spec/controllers/changeset_controller_spec.rb
    M src/spec/controllers/content_search_controller_spec.rb
    M src/spec/controllers/distributions_controller_spec.rb
    R src/spec/controllers/filters_controller_spec.rb
    M src/spec/controllers/gpg_keys_controller_spec.rb
    M src/spec/controllers/notices_controller_spec.rb
    M src/spec/controllers/organizations_controller_spec.rb
    M src/spec/controllers/packages_controller_spec.rb
    M src/spec/controllers/password_resets_controller_spec.rb
    M src/spec/controllers/promotions_controller_spec.rb
    M src/spec/controllers/providers_controller_spec.rb
    M src/spec/controllers/repositories_controller_spec.rb
    M src/spec/controllers/roles_controller_spec.rb
    M src/spec/controllers/search_controller_spec.rb
    M src/spec/controllers/sync_management_controller_spec.rb
    M src/spec/controllers/system_errata_controller_spec.rb
    M src/spec/controllers/system_events_controller_spec.rb
    M src/spec/controllers/system_group_errata_controller_spec.rb
    M src/spec/controllers/system_group_events_controller_spec.rb
    M src/spec/controllers/system_group_packages_controller_spec.rb
    M src/spec/controllers/system_packages_controller_spec.rb
    M src/spec/controllers/system_templates_controller_spec.rb
    M src/spec/controllers/systems_controller_spec.rb
    M src/spec/controllers/user_session_controller_spec.rb
    M src/spec/controllers/users_controller_spec.rb
    M src/spec/helpers/product_helper_methods.rb
    M src/spec/helpers/product_test_data.rb
    R src/spec/helpers/repo_helper_methods.rb
    M src/spec/helpers/repo_test_data.rb
    A src/spec/helpers/repository_helper_methods.rb
    M src/spec/helpers/sync_management_helper_spec.rb
    M src/spec/helpers/system_helper_methods.rb
    M src/spec/lib/navigation_spec.rb
    M src/spec/models/activation_key_spec.rb
    M src/spec/models/changeset_spec.rb
    M src/spec/models/custom_info_spec.rb
    R src/spec/models/distribution_spec.rb
    M src/spec/models/environment_spec.rb
    R src/spec/models/errata_spec.rb
    M src/spec/models/gpg_key_spec.rb
    M src/spec/models/model_spec_helper.rb
    M src/spec/models/organization_spec.rb
    M src/spec/models/permission_spec.rb
    M src/spec/models/ping_spec.rb
    M src/spec/models/product_spec.rb
    M src/spec/models/provider_spec.rb
    M src/spec/models/pulp_task_status_spec.rb
    R src/spec/models/repo_spec.rb
    R src/spec/models/repository_spec.rb
    M src/spec/models/role_spec.rb
    M src/spec/models/system_group_spec.rb
    M src/spec/models/system_spec.rb
    M src/spec/models/system_template_revision_spec.rb
    M src/spec/models/system_template_spec.rb
    M src/spec/models/task_status_spec.rb
    R src/spec/models/user_spec.rb
    M src/spec/spec_helper.rb
    M src/spec/support/shared_examples/protected_action_shared_examples.rb
    M src/spec/views/common/_search.html.haml_spec.rb
    M src/spec/views/distributions/_filelist.html.haml_spec.rb
    M src/spec/views/distributions/_show.html.haml_spec.rb
    A src/test/factories/environment_factory.rb
    A src/test/factories/environment_product_factory.rb
    A src/test/factories/organization_factory.rb
    A src/test/factories/product_factory.rb
    A src/test/factories/provider_factory.rb
    A src/test/factories/repository_factory.rb
    A src/test/factories/role_factory.rb
    A src/test/factories/user_factory.rb
    A src/test/fixtures/models/activation_keys.yml
    A src/test/fixtures/models/environment_products.yml
    A src/test/fixtures/models/environments.yml
    A src/test/fixtures/models/gpg_keys.yml
    A src/test/fixtures/models/help_tips.yml
    A src/test/fixtures/models/notices.yml
    A src/test/fixtures/models/organizations.yml
    A src/test/fixtures/models/permissions.yml
    A src/test/fixtures/models/products.yml
    A src/test/fixtures/models/providers.yml
    A src/test/fixtures/models/repositories.yml
    A src/test/fixtures/models/resource_types.yml
    A src/test/fixtures/models/roles.yml
    A src/test/fixtures/models/roles_users.yml
    A src/test/fixtures/models/system_groups.yml
    A src/test/fixtures/models/system_system_groups.yml
    A src/test/fixtures/models/system_templates.yml
    A src/test/fixtures/models/systems.yml
    A src/test/fixtures/models/user_notices.yml
    A src/test/fixtures/models/users.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_consumer.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_consumer_group.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_distribution.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_errata.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_hidden_user.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_package.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_helper.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_sync_schedule.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_tasks.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_repo_units.yml
    A src/test/fixtures/vcr_cassettes/glue_pulp_user.yml
    A src/test/fixtures/vcr_cassettes/pulp_user_exception_raised.yml
    A src/test/fixtures/vcr_cassettes/pulp_user_setup.yml
    A src/test/fixtures/vcr_cassettes/support/consumer.yml
    A src/test/fixtures/vcr_cassettes/support/repository.yml
    A src/test/fixtures/vcr_cassettes/task_support.yml
    A src/test/fixtures/zoo5/.treeinfo
    A src/test/fixtures/zoo5/CHANGESET
    A src/test/fixtures/zoo5/PULP_MANIFEST
    A src/test/fixtures/zoo5/cheetah-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/create.sh
    A src/test/fixtures/zoo5/elephant-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/empty.iso
    A src/test/fixtures/zoo5/giraffe-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/images/test1.img
    A src/test/fixtures/zoo5/images/test2.img
    A src/test/fixtures/zoo5/lion-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/monkey-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/penguin-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/repodata/06661e2a9839cf0beebcf409410ca4f93c09081f4e772fd0d03e1faf62705a11-comps.xml
  A src/test/fixtures/zoo5/repodata/0c4d57a68f9a3b13dabc6f8b01ca8958aa796167cececee04717edfc26d02f2d-other.xml.gz
  A src/test/fixtures/zoo5/repodata/298ce23f48b3613e030d19f3d9c2ff2df31c2f08479bdf94cebb87c208e48c0e-filelists.xml.gz
  A src/test/fixtures/zoo5/repodata/32c0e38317aade0c057b173ff62344e912e1bd650409c6ac31aecee78e3413af-comps.xml.gz
  A src/test/fixtures/zoo5/repodata/34d954906c7ce7aa2254e24d7be0a9049e0a2f436add023ca056123a2d48e30e-updateinfo.xml.gz
  A src/test/fixtures/zoo5/repodata/63aedd074d9f0daf7c6be8c61f91d76a962bb6ceda86b9abd2140f154c320fa2-other.sqlite.bz2
  A src/test/fixtures/zoo5/repodata/69d65cdebffc6199d3adb3e38b06ca9abaae6c1c7366805099987b28f182178d-filelists.sqlite.bz2
  A src/test/fixtures/zoo5/repodata/799241a518a4a6b11a68f8e6fbdb719875f87832f60accc0851ced0d6a0497c6-updateinfo.xml.gz
  A src/test/fixtures/zoo5/repodata/a4ea9fcdce31dc8673c7a9ba66c086bd6a16e1eff717e3896dd1cac444a1423c-primary.xml.gz
  A src/test/fixtures/zoo5/repodata/fb9b9508e148368d0edf7e03dc905b343937fd958e6531cce6380933d18c3455-primary.sqlite.bz2
  A src/test/fixtures/zoo5/repodata/repomd.xml
    A src/test/fixtures/zoo5/squirrel-0.3-0.8.noarch.rpm
    A src/test/fixtures/zoo5/updateinfo.xml
    A src/test/fixtures/zoo5/walrus-0.3-0.8.noarch.rpm
    A src/test/glue/elasticsearch/errata_test.rb
    A src/test/glue/elasticsearch/package_test.rb
    A src/test/glue/elasticsearch/repository_test.rb
    A src/test/glue/pulp/consumer_group_test.rb
    A src/test/glue/pulp/consumer_test.rb
    A src/test/glue/pulp/distribution_test.rb
    A src/test/glue/pulp/errata_test.rb
    A src/test/glue/pulp/package_test.rb
    A src/test/glue/pulp/repos_test.rb
    A src/test/glue/pulp/repository_test.rb
    A src/test/glue/pulp/user_test.rb
    R src/test/integration/fixtures/repositories/zoo5/.treeinfo
    R src/test/integration/fixtures/repositories/zoo5/CHANGESET
    R src/test/integration/fixtures/repositories/zoo5/PULP_MANIFEST
    R src/test/integration/fixtures/repositories/zoo5/cheetah-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/create.sh
    R src/test/integration/fixtures/repositories/zoo5/elephant-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/empty.iso
    R src/test/integration/fixtures/repositories/zoo5/giraffe-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/images/test1.img
    R src/test/integration/fixtures/repositories/zoo5/images/test2.img
    R src/test/integration/fixtures/repositories/zoo5/lion-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/monkey-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/penguin-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/repodata/06661e2a9839cf0beebcf409410ca4f93c09081f4e772fd0d03e1faf62705a11-comps.xml
  R src/test/integration/fixtures/repositories/zoo5/repodata/0c4d57a68f9a3b13dabc6f8b01ca8958aa796167cececee04717edfc26d02f2d-other.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/298ce23f48b3613e030d19f3d9c2ff2df31c2f08479bdf94cebb87c208e48c0e-filelists.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/32c0e38317aade0c057b173ff62344e912e1bd650409c6ac31aecee78e3413af-comps.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/34d954906c7ce7aa2254e24d7be0a9049e0a2f436add023ca056123a2d48e30e-updateinfo.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/63aedd074d9f0daf7c6be8c61f91d76a962bb6ceda86b9abd2140f154c320fa2-other.sqlite.bz2
  R src/test/integration/fixtures/repositories/zoo5/repodata/69d65cdebffc6199d3adb3e38b06ca9abaae6c1c7366805099987b28f182178d-filelists.sqlite.bz2
  R src/test/integration/fixtures/repositories/zoo5/repodata/799241a518a4a6b11a68f8e6fbdb719875f87832f60accc0851ced0d6a0497c6-updateinfo.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/a4ea9fcdce31dc8673c7a9ba66c086bd6a16e1eff717e3896dd1cac444a1423c-primary.xml.gz
  R src/test/integration/fixtures/repositories/zoo5/repodata/fb9b9508e148368d0edf7e03dc905b343937fd958e6531cce6380933d18c3455-primary.sqlite.bz2
  R src/test/integration/fixtures/repositories/zoo5/repodata/repomd.xml
    R src/test/integration/fixtures/repositories/zoo5/squirrel-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/repositories/zoo5/updateinfo.xml
    R src/test/integration/fixtures/repositories/zoo5/walrus-0.3-0.8.noarch.rpm
    R src/test/integration/fixtures/vcr_cassettes/pulp_consumer.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_consumer_group.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_consumer_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_distribution.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_errata.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_filter.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_filter_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_package.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_package_group.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_package_group_category.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_ping.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_repository.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_repository_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_repository_sync.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_roles.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_task.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_task_helper.yml
    R src/test/integration/fixtures/vcr_cassettes/pulp_user.yml
    R src/test/integration/pulp/helpers/consumer_helper.rb
    R src/test/integration/pulp/helpers/filter_helper.rb
    R src/test/integration/pulp/helpers/repository_helper.rb
    R src/test/integration/pulp/pulp_consumer_group_test.rb
    R src/test/integration/pulp/pulp_consumer_test.rb
    R src/test/integration/pulp/pulp_distribution_test.rb
    R src/test/integration/pulp/pulp_errata_test.rb
    R src/test/integration/pulp/pulp_filter_test.rb
    R src/test/integration/pulp/pulp_package_group_category_test.rb
    R src/test/integration/pulp/pulp_package_group_test.rb
    R src/test/integration/pulp/pulp_package_test.rb
    R src/test/integration/pulp/pulp_ping_test.rb
    R src/test/integration/pulp/pulp_repository_test.rb
    R src/test/integration/pulp/pulp_roles_test.rb
    R src/test/integration/pulp/pulp_task_test.rb
    R src/test/integration/pulp/pulp_user_test.rb
    R src/test/integration/pulp/test_runner.rb
    R src/test/integration/pulp/vcr_pulp_setup.rb
    A src/test/lib/repo_discovery_test.rb
    A src/test/minitest_helper.rb
    A src/test/models/authorization/activation_key_authorization_test.rb
    A src/test/models/authorization/authorization_base.rb
    A src/test/models/authorization/environment_authorization_test.rb
    A src/test/models/authorization/gpg_key_authorization_test.rb
    A src/test/models/authorization/organization_authorization_test.rb
    A src/test/models/authorization/product_authorization_test.rb
    A src/test/models/authorization/provider_authorization_test.rb
    A src/test/models/authorization/repository_authorization_test.rb
    A src/test/models/authorization/role_authorization_test.rb
    A src/test/models/authorization/system_authorization_test.rb
    A src/test/models/authorization/system_group_authorization_test.rb
    A src/test/models/authorization/system_template_authorization_test.rb
    A src/test/models/authorization/user_authorization_test.rb
    A src/test/models/package_test.rb
    A src/test/models/repository_base.rb
    A src/test/models/repository_test.rb
    A src/test/models/system_base.rb
    A src/test/models/user_base.rb
    A src/test/models/user_test.rb
    A src/test/support/auth_support.rb
    A src/test/support/consumer_support.rb
    A src/test/support/repository_support.rb
    A src/test/support/task_support.rb
    A src/test/support/user_support.rb
    A src/test/test_helper.rb

  Log Message:
  -----------
  Merge pull request #1419 from Katello/pulpv2

DO NOT MERGE   Integration with pulpv2


Compare: https://github.com/Katello/katello/compare/f7938ea06c40...e32df7bce38e


[Attachment #3 (text/plain)]

_______________________________________________
katello-commits mailing list
katello-commits@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/katello-commits


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic