NTP Charm

Merge ~axino/ntp-charm/+git/ntp-charm:axino into ntp-charm:master

  1. Git
  2. lp:~axino/ntp-charm/+git/ntp-charm
  3. axino
  4. Merge into master
Proposed by Junien F
Status: Merged
Approved by: Gareth Woolridge
Approved revision: 22b18c683867ef14730ee906e2032ba7f9a2f9f3
Merged at revision: 2535272b52b32c8c201791a7cbf8d22bea51946f
Proposed branch: ~axino/ntp-charm/+git/ntp-charm:axino
Merge into: ntp-charm:master
Diff against target: 12 lines (+1/-1)
1 file modified
README.md (+1/-1)
Reviewer Review Type Date Requested Status
Junien F Approve
Canonical IS Reviewers Pending
Review via email: mp+389069@code.launchpad.net

Commit message

README : fix typo

To post a comment you must log in.
Revision history for this message
Junien F (axino) wrote :

self-approving this

review: Approve
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
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change cannot be self approved, setting status to needs review.

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

Change successfully merged at revision 2535272b52b32c8c201791a7cbf8d22bea51946f

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index 972ff85..d5fbc86 100644
3--- a/README.md
4+++ b/README.md
5@@ -79,7 +79,7 @@ Rate-limited clients
6 By default, ntpd puts a per-IP rate-limit on client requests. This can be
7 problematic if, for example, you have a lot of hosts NATed behind a single IP.
8 You can configure ntpd to not rate-limit requests coming from specific IPs or
9-networks by using the `unlimited_clients` config option. It is a space-separated
10+networks by using the `unlimited_clients` config option. It is a comma-separated
11 list of IPs and networks. Networks must be specified in the `<network_address>
12 mask <network_mask>` form. For example :
13

Subscribers

People subscribed via source and target branches

to all changes: