Skip to content

Commit

Permalink
Merge pull request #29563 from alprs/fix-influx_deprecated_method
Browse files Browse the repository at this point in the history
Fix a call to deprecated method in python-influxdb
  • Loading branch information
Mike Place committed Dec 9, 2015
2 parents f29e0a7 + 7c69c17 commit 21437f9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion salt/modules/influx.py
Expand Up @@ -221,7 +221,7 @@ def user_list(database=None, user=None, password=None, host=None, port=None):
client = _client(user=user, password=password, host=host, port=port)
if database:
client.switch_database(database)
return client.get_database_users()
return client.get_list_users()
return client.get_list_cluster_admins()


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/modules/influx_test.py
Expand Up @@ -35,7 +35,7 @@ def delete_database(self, name):
def switch_database(self, name):
return name

def get_database_users(self):
def get_list_users(self):
return USER_LIST

def get_list_cluster_admins(self):
Expand Down

0 comments on commit 21437f9

Please sign in to comment.