Merge pull request #12075 from eljojo/remove_stupid

Remove "stupid" wording
Upstream-commit: 58390b60876412a70a72ee18cd85874213d73257
Component: engine
This commit is contained in:
Doug Davis
2015-04-04 12:37:38 -04:00
2 changed files with 2 additions and 2 deletions
@@ -57,7 +57,7 @@ var (
// Here we don't follow the convention of using the 1st IP of the range for the gateway.
// This is to use the same gateway IPs as the /24 ranges, which predate the /16 ranges.
// In theory this shouldn't matter - in practice there's bound to be a few scripts relying
// on the internal addressing or other stupid things like that.
// on the internal addressing or other things like that.
// They shouldn't, but hey, let's not break them unless we really have to.
"172.17.42.1/16", // Don't use 172.16.0.0/16, it conflicts with EC2 DNS 172.16.0.23
"10.0.42.1/16", // Don't even try using the entire /8, that's too intrusive
+1 -1
View File
@@ -68,7 +68,7 @@ func (s *TagStore) CmdSet(job *engine.Job) error {
}
// We have to pass an *image.Image object, even though it will be completely
// ignored in favor of the redundant json data.
// FIXME: the current prototype of Graph.Register is stupid and redundant.
// FIXME: the current prototype of Graph.Register is redundant.
img, err := image.NewImgJSON(imgJSON)
if err != nil {
return err