← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jtv/maas/maas-not-mass into lp:maas

 

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/maas-not-mass into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/maas-not-mass/+merge/104112

No idea how this typo got to be so widespread.

Confession: I did not have a pre-imp about this.

Jeroen
-- 
https://code.launchpad.net/~jtv/maas/maas-not-mass/+merge/104112
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/maas-not-mass into lp:maas.
=== modified file 'src/maasserver/enum.py'
--- src/maasserver/enum.py	2012-04-23 05:57:31 +0000
+++ src/maasserver/enum.py	2012-04-30 13:42:23 +0000
@@ -1,7 +1,7 @@
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Enumerations meaningful to the masserver application."""
+"""Enumerations meaningful to the maasserver application."""
 
 from __future__ import (
     absolute_import,

=== modified file 'src/maasserver/static/js/morph.js'
--- src/maasserver/static/js/morph.js	2012-04-17 15:48:27 +0000
+++ src/maasserver/static/js/morph.js	2012-04-30 13:42:23 +0000
@@ -3,12 +3,12 @@
  *
  * Widget to fade and resize between two DOM nodes.
  *
- * @module Y.mass.morph
+ * @module Y.maas.morph
  */
 
 YUI.add('maas.morph', function(Y) {
 
-Y.log('loading mass.morph');
+Y.log('loading maas.morph');
 
 var module = Y.namespace('maas.morph');
 

=== modified file 'src/maasserver/static/js/tests/test_utils.js'
--- src/maasserver/static/js/tests/test_utils.js	2012-03-26 15:47:49 +0000
+++ src/maasserver/static/js/tests/test_utils.js	2012-04-30 13:42:23 +0000
@@ -4,7 +4,7 @@
 
 YUI({ useBrowserConsole: true }).add('maas.utils.tests', function(Y) {
 
-Y.log('loading mass.utils.tests');
+Y.log('loading maas.utils.tests');
 var namespace = Y.namespace('maas.utils.tests');
 
 var module = Y.maas.utils;

=== modified file 'src/maasserver/static/js/utils.js'
--- src/maasserver/static/js/utils.js	2012-04-17 15:48:27 +0000
+++ src/maasserver/static/js/utils.js	2012-04-30 13:42:23 +0000
@@ -3,12 +3,12 @@
  *
  * MAAS utilities.
  *
- * @module Y.mass.utils
+ * @module Y.maas.utils
  */
 
 YUI.add('maas.utils', function(Y) {
 
-Y.log('loading mass.utils');
+Y.log('loading maas.utils');
 var module = Y.namespace('maas.utils');
 
 // Only used to mockup io in tests.

=== modified file 'templates/module.js'
--- templates/module.js	2012-02-15 19:12:05 +0000
+++ templates/module.js	2012-04-30 13:42:23 +0000
@@ -3,12 +3,13 @@
  *
  * TODO: document me.
  *
- * @module Y.mass.sample
+ * @module Y.maas.sample
  */
 
+// TODO: Replace "sample" with module name throughout.
 YUI.add('maas.sample', function(Y) {
 
-Y.log('loading mass.sample');
+Y.log('loading maas.sample');
 var module = Y.namespace('maas.sample');
 
 // Only used to mockup io in tests.

=== modified file 'templates/test_module.js'
--- templates/test_module.js	2012-02-20 11:02:48 +0000
+++ templates/test_module.js	2012-04-30 13:42:23 +0000
@@ -2,9 +2,10 @@
  * GNU Affero General Public License version 3 (see the file LICENSE).
  */
 
+// TODO: Replace "sample" with module name throughout.
 YUI({ useBrowserConsole: true }).add('maas.sample.tests', function(Y) {
 
-Y.log('loading mass.sample.tests');
+Y.log('loading maas.sample.tests');
 var namespace = Y.namespace('maas.sample.tests');
 
 var module = Y.maas.sample;