charm-k8s-ingress

Merge ~pjdc/charm-k8s-ingress/+git/charm-k8s-ingress:docstring-typo into charm-k8s-ingress:master

  1. Git
  2. lp:~pjdc/charm-k8s-ingress/+git/charm-k8s-ingress
  3. docstring-typo
  4. Merge into master
Proposed by Paul Collins
Status: Merged
Approved by: Tom Haddon
Approved revision: 1bda79da4cf36917f836cabd91a2555de66b8df3
Merged at revision: c2187df9c09c8a9a0d06c00f557d0305e60d7902
Proposed branch: ~pjdc/charm-k8s-ingress/+git/charm-k8s-ingress:docstring-typo
Merge into: charm-k8s-ingress:master
Diff against target: 21 lines (+2/-2)
1 file modified
lib/charms/nginx_ingress_integrator/v0/ingress.py (+2/-2)
Reviewer Review Type Date Requested Status
Paul Collins Needs Resubmitting
Tom Haddon Needs Fixing
Review via email: mp+402170@code.launchpad.net

Commit message

fix key name in docstring

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
Tom Haddon (mthaddon) wrote :

Ah, thanks - can you increment the patch number while you're there, and then I can just merge and publish the new version? This is the LIBPATCH variable.

review: Needs Fixing
Revision history for this message
Paul Collins (pjdc) wrote :

> Ah, thanks - can you increment the patch number while you're there, and then I
> can just merge and publish the new version? This is the LIBPATCH variable.

Done!

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

Change successfully merged at revision c2187df9c09c8a9a0d06c00f557d0305e60d7902

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/charms/nginx_ingress_integrator/v0/ingress.py b/lib/charms/nginx_ingress_integrator/v0/ingress.py
2index 688a77c..196c314 100644
3--- a/lib/charms/nginx_ingress_integrator/v0/ingress.py
4+++ b/lib/charms/nginx_ingress_integrator/v0/ingress.py
5@@ -13,7 +13,7 @@ Import `IngressRequires` in your charm, with two required options:
6 - service-port (required)
7 - limit-rps
8 - limit-whitelist
9- - max_body-size
10+ - max-body-size
11 - retry-errors
12 - service-namespace
13 - session-cookie-max-age
14@@ -56,7 +56,7 @@ LIBAPI = 0
15
16 # Increment this PATCH version before using `charmcraft publish-lib` or reset
17 # to 0 if you are raising the major API version
18-LIBPATCH = 5
19+LIBPATCH = 6
20
21 logger = logging.getLogger(__name__)
22

Subscribers

People subscribed via source and target branches

to all changes: