nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-26 08:03:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4430658932762ead3661231492b8074f144ea4b6' into influxdb-php

Browse Source 
Conflicts:
	lib/influxdb-php/.gitignore
	lib/influxdb-php/README.md
This commit is contained in:
Dave Bell
2016-03-29 23:06:15 +01:00
parent a9b50a47dd 4430658932
commit 79c7540fa7
29 changed files with 2085 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/influxdb-php/tests/unit/AdminTest.php
+1 -1
View File
@@ -47,7 +47,7 @@ class AdminTest extends AbstractTest
public function testShowUsers()
{
$testJson = file_get_contents(dirname(__FILE__) . '/result-test-users.example.json');
$testJson = file_get_contents(dirname(__FILE__) . '/json/result-test-users.example.json');
$clientMock = $this->getClientMock();
$testResult = new ResultSet($testJson);