diff options
| author | liu lei <leolovenet@gmail.com> | 2016-11-17 03:23:49 +0800 |
|---|---|---|
| committer | liu lei <leolovenet@gmail.com> | 2016-11-17 03:23:49 +0800 |
| commit | 0acd15dd4aae24a0366fafce03679c51feed779d (patch) | |
| tree | 538f308b83d2a2332fd943a09639d0ed58ffc645 /python.d/redis.chart.py | |
| parent | 7d5c114516ae6cce23803807d5893d7a617ae243 (diff) | |
| parent | 2ba7db38468400e1b1e8365e30ee8f3b776b9215 (diff) | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# python.d/python_modules/base.py
# python.d/redis.chart.py
Diffstat (limited to 'python.d/redis.chart.py')
| -rw-r--r-- | python.d/redis.chart.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/python.d/redis.chart.py b/python.d/redis.chart.py index 56561ee095..7ed343de49 100644 --- a/python.d/redis.chart.py +++ b/python.d/redis.chart.py @@ -99,6 +99,7 @@ class Service(SocketService): Get data from socket :return: dict """ +<<<<<<< HEAD if self.passwd: info_request = self.request self.request = "AUTH " + self.passwd + "\r\n" @@ -108,6 +109,8 @@ class Service(SocketService): return None self.request = info_request +======= +>>>>>>> upstream/master response = self._get_raw_data() if response is None: # error has already been logged |