~hloeung/charm-graylog:master

Branch merges

Propose for merging

Merged into ~graylog-charmers/charm-graylog:master at revision dd389e338deb18ead5fd209a88f91b97d252af21

David Lawson (community): Approve on 2019-03-05

Diff: 322 lines (+69/-42)

9 files modified

Makefile (+5/-10)
files/check_graylog_health.py (+1/-1)
lib/logextract.py (+7/-7)
reactive/graylog.py (+5/-4)
requirements.txt (+1/-0)
tox.ini (+27/-0)
unit_tests/graylog.py (+3/-3)
unit_tests/requirements.txt (+6/-0)
unit_tests/test_logextract.py (+14/-17)

api

Merged into ~graylog-charmers/charm-graylog:master at revision efc18399977fbf5e6bd8a6fd2b8d745293b24382

Haw Loeung: Needs Resubmitting on 2019-03-05

Joel Sing (community): Approve (+1) on 2019-03-05

Diff: 532 lines (+236/-45)

11 files modified

.gitignore (+7/-3)
Makefile (+5/-10)
config.yaml (+5/-0)
files/check_graylog_health.py (+1/-1)
lib/logextract.py (+7/-7)
reactive/graylog.py (+69/-4)
requirements.txt (+1/-0)
tox.ini (+27/-0)
unit_tests/requirements.txt (+6/-0)
unit_tests/test_graylog.py (+94/-3)
unit_tests/test_logextract.py (+14/-17)

api

Merged into ~graylog-charmers/charm-graylog:master at revision 06407309cf45ca05f8389e77fb8172f9ece37ee7

Graylog Charmers: Pending requested 2019-01-08

Diff: 13 lines (+1/-1)

1 file modified

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

api

Merged into ~graylog-charmers/charm-graylog:master at revision b9240cb9b78f4d6ef6b845ae6e382cd3c9087cb0

Stuart Bishop (community): Approve on 2017-10-19

Diff: 45 lines (+17/-4)

2 files modified

config.yaml (+1/-1)
reactive/graylog.py (+16/-3)

api

Merged into ~graylog-charmers/charm-graylog:master at revision 563edabd6693a99dd94c4c2d207f144bf261d5fb

Graylog Charmers: Pending requested 2017-09-04

Diff: 51 lines (+7/-7)

1 file modified

reactive/graylog.py (+7/-7)

api

Merged into ~graylog-charmers/charm-graylog:master at revision 5721b047d3891063b6a2a882e4139027cde487c5

Junien F: Approve on 2017-08-30

Diff: 69 lines (+16/-5)

2 files modified

lib/graylogapi.py (+6/-4)
reactive/graylog.py (+10/-1)

api

Merged into ~graylog-charmers/charm-graylog:master at revision fa853dc4a119c7365141d0c7356188a4230a4de9

Barry Price: Approve on 2017-08-30

Diff: 80 lines (+17/-9)

2 files modified

lib/graylogapi.py (+2/-2)
reactive/graylog.py (+15/-7)

api

Merged into ~graylog-charmers/charm-graylog:master at revision 2e4537129541a4b45218baef4da8957aa049d1be

Paul Collins: Approve on 2017-08-29

Diff: 372 lines (+246/-19)

4 files modified

Makefile (+5/-2)
files/check_graylog_health.py (+121/-0)
lib/graylogapi.py (+88/-17)
reactive/graylog.py (+32/-0)

api

Merged into ~graylog-charmers/charm-graylog:master at revision 6b0a9a63e3323de17154858460270344e705a826

Barry Price: Approve on 2017-08-24

Diff: 508 lines (+206/-113)

6 files modified

dev/null (+0/-11)
lib/graylogapi.py (+131/-0)
reactive/graylog.py (+41/-89)
tests/10-basic.py (+12/-5)
tests/20-clustered.py (+11/-4)
unit_tests/graylog.py (+11/-4)

api

Merged into ~graylog-charmers/charm-graylog:master at revision d4a13948f3a8df359a55bdeaa0ebdccb456db792

Tim Kuhlman (community): Approve on 2017-08-23

Diff: 367 lines (+247/-15)

5 files modified

TODO (+1/-2)
config.yaml (+11/-0)
metadata.yaml (+1/-1)
reactive/graylog.py (+169/-11)
unit_tests/graylog.py (+65/-1)

api

Superseded for merging into ~graylog-charmers/charm-graylog:master

Tim Kuhlman (community): Needs Fixing on 2017-08-16

Diff: 367 lines (+247/-15)

5 files modified

TODO (+1/-2)
config.yaml (+11/-0)
metadata.yaml (+1/-1)
reactive/graylog.py (+169/-11)
unit_tests/graylog.py (+65/-1)

api

Merged into ~graylog-charmers/charm-graylog:master at revision 7365f24b6e56724e4bb497c5eee45fd662249698

Stuart Bishop (community): Approve on 2017-08-07

Diff: 27 lines (+8/-0)

2 files modified

reactive/graylog.py (+2/-0)
unit_tests/graylog.py (+6/-0)

api

Merged into ~graylog-charmers/charm-graylog:master at revision f4fea609d83abdafa7ccb245fedd38f129afdd9f

Graylog Charmers: Pending requested 2017-08-03

Diff: 19 lines (+2/-1)

1 file modified

reactive/graylog.py (+2/-1)

api

Merged into ~graylog-charmers/charm-graylog:master at revision d40fde7d4e61600973062b166d34c086dc202a38

Graylog Charmers: Pending requested 2017-08-03

Diff: 94 lines (+34/-20)

1 file modified

reactive/graylog.py (+34/-20)

api

Merged into ~graylog-charmers/charm-graylog:master at revision a1df06068a9df2f9b5e1ead2d12ec040ea1e5a77

Graylog Charmers: Pending requested 2017-08-03

Diff: 179 lines (+124/-1)

3 files modified

config.yaml (+40/-0)
layer.yaml (+3/-0)
reactive/graylog.py (+81/-1)

api

Merged into ~graylog-charmers/charm-graylog:master at revision 7e5e9eae89b90d7e574b80cadd5807221a6223bb

Tim Kuhlman (community): Needs Fixing on 2017-08-03

Diff: 96 lines (+17/-12)

2 files modified

.gitignore (+1/-0)
reactive/graylog.py (+16/-12)

api

Rejected for merging into ~graylog-charmers/charm-graylog:master

Haw Loeung: Needs Fixing on 2017-08-03

Diff: 258 lines (+139/-13)

4 files modified

.gitignore (+1/-0)
config.yaml (+40/-0)
layer.yaml (+3/-0)
reactive/graylog.py (+95/-13)

api

Merged into ~graylog-charmers/charm-graylog:master at revision 12ff00f104ba6725c12308936d3a366aa2e8a391

Stuart Bishop (community): Approve on 2017-07-25

Diff: 22 lines (+3/-2)

1 file modified

reactive/graylog.py (+3/-2)

api

Merged into ~graylog-charmers/charm-graylog:master at revision 1abfa8c18229b48e416fb2ca178bdab2faeffa0a

Barry Price: Approve on 2017-07-25

Diff: 94 lines (+49/-0)

4 files modified

config.yaml (+17/-0)
layer.yaml (+1/-0)
metadata.yaml (+3/-0)
reactive/graylog.py (+28/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

efc1839... by Haw Loeung on 2019-03-05

Add option to tune JVM heap size - LP: #1807565

Reviewed-on: https://code.launchpad.net/~hloeung/graylog-charm/+git/graylog-charm/+merge/361477
Reviewed-by: Joel Sing <email address hidden>

62a0100... by Haw Loeung on 2019-03-05

Minor nitpick fixes

0fe6300... by Haw Loeung on 2019-03-05

Fixed to ignore tox and bits from make unit test

382a5b9... by Haw Loeung on 2019-03-05

Fixed based on feedback

14a687e... by Haw Loeung on 2019-03-05

Merge branch 'master' of https://git.launchpad.net/graylog-charm

486d601... by Haw Loeung on 2019-03-05

Switch to using tox and pytest for both lint and unit tests

dd389e3... by Haw Loeung on 2019-03-05

Switch to using tox and pytest for both lint and unit tests

Reviewed-on: https://code.launchpad.net/~hloeung/graylog-charm/+git/graylog-charm/+merge/363941
Reviewed-by: David Lawson <email address hidden>

348be86... by Haw Loeung on 2019-03-05

Fix PEP W605

f09322f... by Haw Loeung on 2019-03-05

Switch to using tox and pytest for both lint and unit tests

1d8dd99... by Haw Loeung on 2019-03-05

Removed PEP ignores and PEP errors