Telegraf Charm

Merge ~xavpaice/charm-telegraf:bug/1686638 into charm-telegraf:master

  1. Git
  2. lp:~xavpaice/charm-telegraf
  3. bug/1686638
  4. Merge into master
Proposed by Xav Paice
Status: Merged
Approved by: James Troup
Approved revision: 33b59c6cb037f428ad9ce1171936d778b4a2d92c
Merged at revision: 56eb64970184bd0d2b2f0c9ab1b314aa3fa414fd
Proposed branch: ~xavpaice/charm-telegraf:bug/1686638
Merge into: charm-telegraf:master
Diff against target: 11 lines (+1/-1)
1 file modified
src/reactive/telegraf.py (+1/-1)
Reviewer Review Type Date Requested Status
Celia Wang Approve
Canonical IS Reviewers Pending
Review via email: mp+400854@code.launchpad.net

Commit message

Change disabled_plugins to sorted list if lxc

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Celia Wang (ziyiwang) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 56eb64970184bd0d2b2f0c9ab1b314aa3fa414fd

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/reactive/telegraf.py b/src/reactive/telegraf.py
2index 75a6ed0..11c2208 100644
3--- a/src/reactive/telegraf.py
4+++ b/src/reactive/telegraf.py
5@@ -306,7 +306,7 @@ def get_disabled_plugins():
6 "softnet_stat",
7 }
8 disabled_plugins_lxd.update(set(disabled_plugins))
9- disabled_plugins = list(disabled_plugins_lxd)
10+ disabled_plugins = sorted(disabled_plugins_lxd)
11 return disabled_plugins
12
13

Subscribers

People subscribed via source and target branches

to all changes: