py@tarp:~/wikimedia/puppet/manifests$ git status
# On branch production
# Your branch is ahead of 'origin/production' by 5 commits.
#
nothing to commit (working directory clean)


py@tarp:~/wikimedia/puppet/manifests$ git diff origin/production production
diff --git a/manifests/site.pp b/manifests/site.pp
index f996c55..5a296cf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1364,6 +1364,15 @@ node /mw[1-5]?[0-9]\.pmtpa\.wmnet/ {
                memcached
 }

+node /mw6[0-1]\.pmtpa\.wmnet/ {
+       include applicationserver::bits
+
+}
+
+node /mw(6[2-9]|7[0-4])\.pmtpa\.wmnet/ {
+       include applicationserver::api
+
+}

 node "lily.knams.wikimedia.org" {
        $cluster = "misc_esams"


git log:

commit ba9fcafb878cd445abe1f90d5eb0f9333c517637
Author: pyoungmeister <py@wikimedia.org>
Date:   Fri Oct 7 13:56:27 2011 -0400

    attempt to check in

    Change-Id: I8991818eec761ad66063a5f20cc9e25a08a4898b

commit 37b1f59936df2655907dec5808a575c3368f7cb1
Author: pyoungmeister <py@wikimedia.org>
Date:   Fri Oct 7 13:52:34 2011 -0400

    ugh extra ,

    Change-Id: I5111e16bf82bdf85189f98d69f050c45badaacbd

commit 3cab17b40a0a3763adb5454de2265474a3d50941
Merge: 1da4b44 d2b4179
Author: pyoungmeister <py@wikimedia.org>
Date:   Fri Oct 7 13:50:24 2011 -0400

    Merge branch 'production' of ssh://gerrit.wikimedia.org:29418/operations/pup

commit 1da4b44b4ceeb8b2caef579ec721dbf1c1273a2a
Author: pyoungmeister <py@wikimedia.org>
Date:   Fri Oct 7 13:47:41 2011 -0400

    regex redo

    Change-Id: I757aa14715e5e1bb592f72325161e185120ecc00

commit d2b417934c5602cf3a0dbc1eb7e80bdcfee1de29
Merge: f3a9c86 36d80bf
Author: Mark Bergsma <mark@wikimedia.org>
Date:   Fri Oct 7 16:58:29 2011 +0000

    Merge "Merge remote-tracking branch 'origin/iptables' into production" into

commit 36d80bf5d1b574c01c54abe8fdf0d225ed5a8f71
Merge: f3a9c86 c613f60
Author: Mark Bergsma <mark@wikimedia.org>
Date:   Fri Oct 7 18:56:20 2011 +0200

    Merge remote-tracking branch 'origin/iptables' into production

    Change-Id: If36f77d9ce8e536560691601dec8e6777cb22b02

commit f3a9c8690c82f6ca028bfdafa38c88cb819182f4
Merge: e61e0bf 1144cb7
Author: Mark Bergsma <mark@wikimedia.org>
Date:   Fri Oct 7 16:48:05 2011 +0000

    Merge "Ignore .project (for eclipse/geppetto)" into production
commit 1144cb782160903b7d7a91ee24984da6e42b3159
Author: Mark Bergsma <mark@wikimedia.org>
Date:   Fri Oct 7 18:47:20 2011 +0200

    Ignore .project (for eclipse/geppetto)

    Change-Id: Ia38fdee82c8e98653f81a4a71f25d9dbb0bf18e8

commit fa6ca27184fb50c907453ed0d7e4865cdf842f94
Author: pyoungmeister <py@wikimedia.org>
Date:   Fri Oct 7 12:35:46 2011 -0400

    puppetization for mw 60-74

    Change-Id: Ib4e954802065331be077e664adeee9796986a831

commit e61e0bf1645db2de0363864f82e53a46627c6cbc
Merge: bb2ae71 3537e70
Author: Mark Bergsma <mark@wikimedia.org>
Date:   Fri Oct 7 16:26:27 2011 +0000

    Merge "Add empty classes to satisfy geppetto" into production

commit 3537e70570ce3ca5aa3507bc083d2a12869711c8
Author: Mark Bergsma <mark@wikimedia.org>
Date:   Fri Oct 7 18:13:32 2011 +0200

    Add empty classes to satisfy geppetto

    Change-Id: I9758b0e0962f5407c375477fc49fffda6e69d017

commit c613f60590330427fc2343513ed59d955ab3cc02
Author: Mark Bergsma <mark@wikimedia.org>
Date:   Thu Oct 6 12:30:24 2011 +0200

    Break up ridiculously long lines

    Change-Id: I5be974f2bb964b0c32d9a47c8073bc659bb626d9


py@tarp:~/wikimedia/puppet/manifests$ git pull
Already up-to-date.