~ubuntu-branches/ubuntu/vivid/keystone/vivid

« back to all changes in this revision

Viewing changes to keystone/catalog/controllers.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2013-10-02 11:46:14 UTC
  • mfrom: (1.1.37)
  • Revision ID: package-import@ubuntu.com-20131002114614-pw4xkjdvowr9u34w
Tags: 1:2013.2~rc1-0ubuntu1
* New upstream version.
* debian/control:
  - Add versioned dependencies to python-pbr, python-dogpile.cache,
    python-oslo.config, python-webob, python-pam, python-sqlalchemy,
    python-testtools, and python-requests.
  - Added python-greenlet, python-requests, python-netifaces,
    and python-setuptools as a build dependency.
  - Dropped python-swift, python-unittest, python-d2to1,
    as a build dependency.
  - Bumped versioned depends for python-keystoneclient.
* debian/patches/disable-oauth2.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
# vim: tabstop=4 shiftwidth=4 softtabstop=4
2
2
 
3
 
# Copyright 2012 OpenStack LLC
 
3
# Copyright 2012 OpenStack Foundation
4
4
# Copyright 2012 Canonical Ltd.
5
5
#
6
6
# Licensed under the Apache License, Version 2.0 (the "License"); you may