Cmjohnson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393772 )
Change subject: Merge branch 'production' of https://gerrit.wikimedia.org/r/p/operations/puppet into production ...................................................................... Merge branch 'production' of https://gerrit.wikimedia.org/r/p/operations/puppet into production Change-Id: I6c3dd2ae83e381d5057d272a912a57e414ec7c90 --- M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/72/393772/1 diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 index 2da2755..ff2a7ea 100644 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -6335,7 +6335,7 @@ fixed-address stat1004.eqiad.wmnet; } -<<<<<<< HEAD (c2e622 Removing mentions of decom server strontium) +<<<<<<< HEAD host subra { hardware ethernet D4:AE:52:AD:62:75; fixed-address subra.codfw.wmnet; @@ -6354,7 +6354,7 @@ fixed-address stat1006.eqiad.wmnet; option pxelinux.pathprefix "stretch-installer/"; filename "stretch-installer/debian-installer/amd64/pxelinux.0"; ->>>>>>> BRANCH (e5dbb3 Log more detailed info in Varnish slow request log) +>>>>>>> e5dbb35fa7d15d856637fcbf7dd0ac50c26003d2 } host tegmen { -- To view, visit https://gerrit.wikimedia.org/r/393772 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c3dd2ae83e381d5057d272a912a57e414ec7c90 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Cmjohnson <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
