Merge "Switch to oslo_log"
This commit is contained in:
commit
f0471d42b8
|
@ -20,9 +20,9 @@ from designateclient.v1.records import Record # noqa
|
||||||
from django.conf import settings # noqa
|
from django.conf import settings # noqa
|
||||||
|
|
||||||
from horizon import exceptions
|
from horizon import exceptions
|
||||||
import logging
|
|
||||||
|
|
||||||
from openstack_dashboard.api.base import url_for # noqa
|
from openstack_dashboard.api.base import url_for # noqa
|
||||||
|
from oslo_log import log as logging
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.views import generic
|
from django.views import generic
|
||||||
import functools
|
import functools
|
||||||
import logging
|
|
||||||
import requests
|
import requests
|
||||||
from requests.exceptions import HTTPError
|
from requests.exceptions import HTTPError
|
||||||
|
|
||||||
|
@ -24,6 +23,7 @@ from horizon import exceptions
|
||||||
from openstack_dashboard.api import base
|
from openstack_dashboard.api import base
|
||||||
from openstack_dashboard.api.rest import urls
|
from openstack_dashboard.api.rest import urls
|
||||||
from openstack_dashboard.api.rest import utils as rest_utils
|
from openstack_dashboard.api.rest import utils as rest_utils
|
||||||
|
from oslo_log import log as logging
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
import functools
|
import functools
|
||||||
import logging
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from designateclient import exceptions as designate_exceptions
|
from designateclient import exceptions as designate_exceptions
|
||||||
|
@ -27,6 +26,7 @@ from horizon import messages
|
||||||
from designatedashboard import api
|
from designatedashboard import api
|
||||||
from designatedashboard.dashboards.project.dns_domains.utils\
|
from designatedashboard.dashboards.project.dns_domains.utils\
|
||||||
import limit_records_to_fips
|
import limit_records_to_fips
|
||||||
|
from oslo_log import log as logging
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
|
@ -11,8 +11,6 @@
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
import logging
|
|
||||||
|
|
||||||
from django.core import urlresolvers
|
from django.core import urlresolvers
|
||||||
from django.utils.translation import ugettext_lazy as _ # noqa
|
from django.utils.translation import ugettext_lazy as _ # noqa
|
||||||
|
|
||||||
|
@ -23,6 +21,7 @@ from horizon.utils import memoized
|
||||||
from designatedashboard import api
|
from designatedashboard import api
|
||||||
|
|
||||||
from openstack_dashboard import policy
|
from openstack_dashboard import policy
|
||||||
|
from oslo_log import log as logging
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
# The order of packages is significant, because pip processes them in the order
|
# The order of packages is significant, because pip processes them in the order
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
oslo.log>=3.11.0 # Apache-2.0
|
||||||
pbr>=1.8 # Apache-2.0
|
pbr>=1.8 # Apache-2.0
|
||||||
Babel>=2.3.4 # BSD
|
Babel>=2.3.4 # BSD
|
||||||
python-designateclient>=1.5.0 # Apache-2.0
|
python-designateclient>=1.5.0 # Apache-2.0
|
||||||
|
|
Loading…
Reference in New Issue