Skip to content
Commits on Feb 9, 2012
  1. @jsomara
  2. @jsomara

    Merge commit 'katello-0.1.228-1' into BRANDING

    Conflicts:
    	cli/katello-cli.spec
    	puppet/katello-configure.spec
    	rel-eng/packages/katello
    	rel-eng/packages/katello-cli
    	rel-eng/packages/katello-configure
    	src/katello.spec
    jsomara committed Feb 9, 2012
Commits on Feb 8, 2012
  1. @jsomara
  2. @jsomara
  3. @lzap
  4. @lzap
  5. @tstrachota
  6. @tstrachota
  7. @tstrachota
  8. @tstrachota
  9. @tstrachota
  10. @lzap
  11. @lzap
  12. @mccun934
  13. @mccun934
  14. @mccun934
  15. @mccun934
Commits on Feb 7, 2012
  1. @bbuckingham

    activation keys - remove 'allocated' from model and code

    This commit removes 'allocated' from the key_pools.  In the initial
    implementation for activation keys, we allowed the user to assign
    a quantity (allocation) of a given subscription to the key.  After
    discussion, we decided to revamp it to no longer associate quantity
    and instead have the keys used with 'auto-subscribe'. This approach
    eliminated the need to have several different keys to meet the needs
    of consumers (e.g. 2 socket, 4 socket...etc).
    bbuckingham committed Feb 7, 2012
  2. @parthaa
  3. @bbuckingham

    788149 - activation keys - fix format_time error

    Added format_time to the application controller for access from
    controllers.  The alternative would be to expose the application helper
    within the controllers; however, noticed that we have explicitly
    set 'clear_helpers' on the application controller, so chose not to go
    that path.
    bbuckingham committed Feb 7, 2012
  4. @mccun934

    788228 - increasing to 16MB limit for file uploads

    Previous limit of 256k was far to small for manifest uploads
    mccun934 committed Feb 7, 2012
  5. @mccun934
  6. @mccun934
  7. @mccun934
  8. @mccun934

    Merge remote branch 'katello/master' into branding

    Conflicts:
    	agent/katello-agent.spec
    	cli/katello-cli.spec
    	rel-eng/packages/katello
    	rel-eng/packages/katello-agent
    	src/katello.spec
    mccun934 committed Feb 7, 2012
  9. @iNecas
  10. @lzap
  11. @iNecas

    768254 - fix cli unit tests

    iNecas committed Feb 7, 2012
  12. @lzap
  13. @lzap
  14. @iNecas
  15. @iNecas
  16. @iNecas

    768254 - scope products API by organization

    We referrence products by candlepin id. However there are more products in
    Katello assigned to a CP product (e.g. after importing manifest to more
    organizations).
    
    We might choose to refference products using Katello id, but
    this would cause troubles with rhsm, because we are mirroring CP API and in
    case subscription manager was using CP /products API, it would behave
    differently for plain Candlepin and Katello proxy.
    
    Therefore all the requests beginning with:
    
      /api/products/:product_id/...
    
    were transformed to:
    
      /api/organizations/:organization_name/products/:product_id/...
    iNecas committed Feb 7, 2012
  17. @lzap
  18. @lzap
Something went wrong with that request. Please try again.