openstack/cinder
Code Issues Proposed changes

Merge "Use googleapiclient import instead of apiclient"

Browse Source
This commit is contained in:
Jenkins 2016-03-11 17:47:12 +00:00 committed by Gerrit Code Review
commit a131d73ab1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/backup/drivers/google.py
View File

@ -30,9 +30,9 @@ import base64
import hashlib
import httplib2
from apiclient import discovery
from apiclient import errors
from apiclient import http
from googleapiclient import discovery
from googleapiclient import errors
from googleapiclient import http
from oauth2client import client
from oslo_config import cfg
from oslo_log import log as logging

2
cinder/tests/unit/backup/fake_google_client.py
View File

@ -18,7 +18,7 @@ import json
import os
import zlib
from apiclient import errors
from googleapiclient import errors
from oauth2client import client
from oslo_utils import units
import six