Beta puppetmaster is deployment-salt.eqiad.wmflabs the git repo under /var/lib/git/operations/puppet is magically auto rebased via a cronjob.
* a17af5d - (HEAD) dsh: remove unpooled codfw hosts (9 days ago) <Giuseppe Lavagetto> * 10ab3ee - Hiera-ize the Elasticsearch config (9 days ago) <Chad Horohoe>
I fixed the working copy by discarding them:
git remote update git checkout production git rebase --abort # clean some bad state git reset --hard origin/production
I guess one of the two patches was being polished up on beta.