IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into alerting

Browse Source 
Conflicts:
	conf/sample.ini
This commit is contained in:
Torkel Ödegaard
2016-08-17 10:03:33 +02:00
parent 434332f02d 6fae5a3b4e
commit 05697d5ecd
14 changed files with 119 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docker/blocks/postgres/fig
View File

@@ -3,5 +3,6 @@ postgrestest:
environment:
POSTGRES_USER: grafana
POSTGRES_PASSWORD: password
POSTGRES_DATABASE: grafana
ports:
- "5432:5432"