MAAS

Merge lp:~jtv/maas/onerlooked into lp:~maas-committers/maas/trunk

  1. onerlooked
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 3366
Proposed branch: lp:~jtv/maas/onerlooked
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/maasserver/migrations/0103_candidate_names.py (+1/-1)
To merge this branch: bzr merge lp:~jtv/maas/onerlooked
Reviewer Review Type Date Requested Status
Newell Jensen (community) Approve
Review via email: mp+241603@code.launchpad.net

Commit message

Fix typo in candidate words for node names: “onerlooked.”

Description of the change

I didn't bother patching up the existing word entry if it's already in the database. This fix will only benefit new installations.

Jeroen

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) wrote :

Er, empty diff…

Revision history for this message
Newell Jensen (newell-jensen) :
review: Approve
Revision history for this message
Graham Binns (gmb) wrote :

> Ahem. Actually commit: fix typo -- onerlooked should be overlooked...

Happens to the best of us.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/maasserver/migrations/0103_candidate_names.py'
--- src/maasserver/migrations/0103_candidate_names.py 2014-08-15 10:24:24 +0000
+++ src/maasserver/migrations/0103_candidate_names.py 2014-11-12 18:52:01 +0000
@@ -96,7 +96,7 @@
96nervous new next nice nifty nimble nippy nocturnal noisy nonstop normal96nervous new next nice nifty nimble nippy nocturnal noisy nonstop normal
97notable noted noteworthy novel noxious numb nutritious nutty obedient97notable noted noteworthy novel noxious numb nutritious nutty obedient
98obese oblong obvious occasional odd oddball offbeat offensive official98obese oblong obvious occasional odd oddball offbeat offensive official
99oily old onerlooked only open optimal optimistic opulent orange orderly99oily old overlooked only open optimal optimistic opulent orange orderly
100ordinary organic original ornate ornery other our outgoing outlandish100ordinary organic original ornate ornery other our outgoing outlandish
101outlying outrageous outstanding oval overcooked overdue overjoyed101outlying outrageous outstanding oval overcooked overdue overjoyed
102palatable pale paltry parallel parched partial passionate past pastel102palatable pale paltry parallel parched partial passionate past pastel