~jacekn/charm-grafana/+git/grafana-charm:master

Branch merges

Propose for merging

Merged into ~prometheus-charmers/charm-grafana:master at revision 7540bfadb1cd717ad1c3b44872aa142e97e8308a

David Lawson (community): Approve on 2018-02-07

Diff: 13 lines (+1/-1)

1 file modified

reactive/grafana.py (+1/-1)

api

Merged into ~prometheus-charmers/charm-grafana:master at revision 5279db94cfbbff8f1d38d1a1bbc739b1521075a9

Tom Haddon: Approve on 2016-12-01

Diff: 12 lines (+1/-0)

1 file modified

metadata.yaml (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

7540bfa... by Jacek Nykis on 2018-02-07

Ignore datasource name when checking if it exists. Allows for human readable names to be configured in web UI

b5f40d0... by Jamon Camisso <email address hidden> on 2018-01-31

[jacekn,r=jamon] Merge branch 'master' of git+ssh://git.launchpad.net/~jacekn/grafana-charm

c523def... by Jacek Nykis on 2018-01-31

Fix dashboard_backup script to write valid JSON. Fixes LP #1718221

12f9a02... by Brad Marshall on 2017-11-21

[brad-marshall, r=tcuthbert] Merge branch 'action-user-mgmt' of git+ssh://git.launchpad.net/~brad-marshall/grafana-charm

2bf4bbf... by Jamon Camisso on 2017-10-18

Merge branch 'add-mysql-datasource' of git+ssh://git.launchpad.net/~rharding/grafana-charm

d78ca59... by Richard Harding on 2017-10-18

Merge branch 'master' of git+ssh://git.launchpad.net/grafana-charm into add-mysql-datasource

e2c9dc0... by Richard Harding on 2017-10-18

Flake8 cleanup per reviewj

4ff589e... by Brad Marshall on 2017-10-18

[brad-marshall, r=hloeung] Fixes race condition with setting user password
(Closes: LP#1684831)

a82a300... by Brad Marshall on 2017-10-18

Refactor the for loop a little to be less complicated

784e48b... by Brad Marshall on 2017-10-18

Added loop to check if we have any users with a time delay to avoid race condition
on install