update branch from master, fix merge conflicts, fix rubocop style failures
Description
Description
Details
Details
- Provenance
George Hansper <george@hansper.id.au> Authored on Mar 1 2018, 5:48 AM olasd Pushed on Mar 2 2018, 11:02 AM - Parents
- rSPPG70f15cf32cc5: Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-postgresql…
rSPPG8177489d15bc: Merge pull request #951 from hasegeli/master - Branches
- Unknown
- Tags
- Unknown
Event Timeline
George Hansper <george@hansper.id.au> committed rSPPG9a5ffdb4e92f: update branch from master, fix merge conflicts, fix rubocop style failures (authored by George Hansper <george@hansper.id.au>).Mar 1 2018, 5:48 AM2018-03-01 05:48:49 (UTC+1)
Merged Changes
Merged Changes