Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Add IPSources into config.json.sample, omitting NetInfo #370

Merged
merged 1 commit into from
Nov 24, 2015
Merged

Conversation

sargun
Copy link
Contributor

@sargun sargun commented Nov 24, 2015

No description provided.

@@ -93,7 +93,7 @@ The configured name will always be converted to a FQDN by ensuring it ends with
`enforceRFC952` will enforce an older, more strict set of rules for DNS labels. For details, see the [RFC-952](https://tools.ietf.org/html/rfc952). The default value is `false`.

`IPSources` defines a fallback list of IP sources for task records,
sorted by priority. The default value is: `["netinfo", "mesos", "host"]`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the default coded value hasn't changed (it's different than what's in config.json.sample, but that's not the same thing as "the default")

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basically, leave "The default value is ..." sentence as-is here

@jdef
Copy link
Contributor

jdef commented Nov 24, 2015

lgtm

sargun added a commit that referenced this pull request Nov 24, 2015
Add IPSources into config.json.sample, omitting NetInfo
@sargun sargun merged commit 81c176b into master Nov 24, 2015
@sttts sttts removed the WIP label Nov 24, 2015
@sargun sargun deleted the fix-netinfo branch November 24, 2015 19:50
@sargun sargun restored the fix-netinfo branch September 14, 2016 20:53
@sargun sargun deleted the fix-netinfo branch September 14, 2016 20:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants