public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/kariosdb'

Browse Source 
Conflicts:
	public/test/test-main.js
This commit is contained in:
Torkel Ödegaard
2015-06-25 18:34:41 +02:00
parent 24bab47f14 dc70894d83
commit 9266d3789b
10 changed files with 1357 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/mkdocs.yml
+1
View File
@@ -60,6 +60,7 @@ pages:
- ['datasources/graphite.md', 'Data Sources', 'Graphite']
- ['datasources/influxdb.md', 'Data Sources', 'InfluxDB']
- ['datasources/opentsdb.md', 'Data Sources', 'OpenTSDB']
- ['datasources/kairosdb.md', 'Data Sources', 'KairosDB']
- ['project/building_from_source.md', 'Project', 'Building from source']
- ['project/cla.md', 'Project', 'Contributor License Agreement']