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

[carry 23352] update peaceful zen Upstream-commit: 29283143be0c2d31775dd540433d5a09fc3d1ffc Component: engine
2016-06-10 23:23:16 +02:00
parent 3c63c67eb1 df727cdb81
commit 7e10f5f788
1 changed files with 2 additions and 0 deletions
@@ -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.