Merge pull request #23435 from thaJeztah/carry-23352-peaceful-zen

[carry 23352] update peaceful zen
This commit is contained in:
Sebastiaan van Stijn 2016-06-10 23:23:16 +02:00 committed by GitHub
commit 29283143be

View file

@ -54,6 +54,7 @@ var (
"naughty",
"nauseous",
"nostalgic",
"peaceful",
"pedantic",
"pensive",
"prickly",
@ -73,6 +74,7 @@ var (
"thirsty",
"tiny",
"trusting",
"zen",
}
// Docker, starting from 0.7.x, generates names from notable scientists and hackers.