Code

Merge 3.2.x into master#218

Code

Merged

cmurphy merged 4 commits intopuppetlabs:masterpuppetlabs/puppetlabs-ntp:masterfrom underscorgan:testunderscorgan/puppetlabs-ntp:testCopy head branch name to clipboardOct 31, 2014

+72-26

Commits

Commits on Oct 23, 2014

• Add SLES12 support as it has changed to Systemd

  

  Travis Fields

  committed
  8491dd6

  Copy full SHA for 8491dd6

Commits on Oct 31, 2014

• Fix spec tests and update to use stdlib 3.2.x branch for spec acceptance testing

  

  Travis Fields

  committed
  be63c07

  Copy full SHA for be63c07

• Merge pull request puppetlabs#217 from cyberious/Sles12

  Show description for 177aebf
  

  Morgan Haskel

  committed
  177aebf

  Copy full SHA for 177aebf

• Merge remote-tracking branch 'upstream/3.2.x' into test

  

  Morgan Haskel

  committed
  5a63a51

  Copy full SHA for 5a63a51