{"push_id":662826085,"size":4,"distinct_size":1,"ref":"refs/heads/master","head":"2c16bde9de816aee06d85c26880d7669278527a7","before":"4e194ce8cb84303e426b14c4663321e86dbbbcd3","commits":[{"sha":"2dec5d4d9f2d0ac242690dda013eafea4f020da0","author":{"email":"9a57a9061ef4db8ceb272540291c4d4639a38a6f@puppetlabs.com","name":"Eric Thompson"},"message":"(PUP-4419) create acceptance to ensure client does not overwrite server-set variables\n\nThis change adds an acceptance test that ensures the proper function of\ntrusted_server_facts setting and $server_facts puppet variable.\nIt has to restart the master twice, along with several agent runs, unfortunately.","distinct":false,"url":"https://api.github.com/repos/puppetlabs/puppet/commits/2dec5d4d9f2d0ac242690dda013eafea4f020da0"},{"sha":"34875d77696520b324705c6350b605e438b8f53b","author":{"email":"c9b95f68e70c94c25d52b81728f3cf400a673cf9@puppetlabs.com","name":"Hailee Kenney"},"message":"Merge pull request #3926 from er0ck/acceptance/stable/PUP-4419-create_acceptance_to_ensure_client_does_not_overwrite_server-set_variables\n\n(PUP-4419) create acceptance to ensure no overwrite of server-set variables","distinct":false,"url":"https://api.github.com/repos/puppetlabs/puppet/commits/34875d77696520b324705c6350b605e438b8f53b"},{"sha":"f767f4339187d5efbe4003012e7ca97c3951cd12","author":{"email":"c028c213ed5efcf30c3f4fc7361dbde0c893c5b7@puppetlabs.com","name":"Josh Cooper"},"message":"(PUP-4436) Relax regexp to handle carriage return on 2003\n\nThe acceptance test fails on 2003, because the messages in the event log\ncontains a trailing carriage return \"\\r\" as can be seen from the\nmessage:\n\n    U5OCQ1AVU5DNJ72,Could not retrieve catalog; skipping run\n    ,Error\n\nThe same test doesn't fail on 2012, because the message does not contain\na carriage return:\n\n    REQSRXS29NWN1ZY,Could not retrieve catalog; skipping run,Error\n\nI verified that puppet is not calling Win32 ReportEvent with a\ncarriage return. Instead, it seems 2003 always adds a carriage return to\nevents as can be seen when copying the message to the clipboard:\n\n    Description:\n    Could not retrieve catalog; skipping run\n\nThis commit adds back the extra .* in the regexp to account for 2003 vs\nlater differences.\n\n[skip ci]","distinct":false,"url":"https://api.github.com/repos/puppetlabs/puppet/commits/f767f4339187d5efbe4003012e7ca97c3951cd12"},{"sha":"2c16bde9de816aee06d85c26880d7669278527a7","author":{"email":"5fa21ba918749479f1a2164cc11f556766c4eb5f@puppetlabs.com","name":"Michael Smith"},"message":"Merge remote-tracking branch 'origin/stable'","distinct":true,"url":"https://api.github.com/repos/puppetlabs/puppet/commits/2c16bde9de816aee06d85c26880d7669278527a7"}]}