~ballot/charm-graylog/+git/charm-graylog:lp1896484

Branch merges

Propose for merging

Merged into charm-graylog:master at revision 87ea7c490cff1597e04cee9484457701892f19c8

Xav Paice (community): Approve on 2021-01-26

Joe Guo (community): Needs Fixing on 2020-09-24

Paul Goins: Approve on 2020-09-24

Diff: 23 lines (+3/-2)

1 file modified

src/lib/charms/layer/graylog/api.py (+3/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

50a4dc0... by Benjamin Allot on 2020-09-21

Blackened

41c4060... by Benjamin Allot on 2020-09-21

Return as JSON the content only if not empty

Fixes: LP#1896484

308b77b... by Paul Goins on 2020-08-13

Removed file-level noqa exclusions and a no-op test.

d5e127b... by Alvaro Uria on 2020-08-11

Fix extra lint checks for 20.08 charm release

bfe1978... by Alvaro Uria on 2020-08-11

Blackened repository to 88 lines

e3ad3cd... by Alvaro Uria on 2020-08-10

Relocate func tests

a0c3d8c... by Alvaro Uria on 2020-08-10

Linting: first pass; Add unit test requirement

5bdd800... by Alvaro Uria on 2020-08-10

Update Makefile and tox.ini

330ea19... by Alvaro Uria on 2020-08-10

Merge branch 'vultaire/protected-upgrades'

Reviewed-on: https://code.launchpad.net/~vultaire/charm-graylog/+git/graylog-charm/+merge/385686
Reviewed-by: Drew Freiberger <email address hidden>
Reviewed-by: Xav Paice <email address hidden>
Reviewed-by: Alvaro Uria <email address hidden>

24d8b9d... by Paul Goins on 2020-08-07

Fix per Alvaro Aluria: add retries to test