Code

merge Master back up to 3.1.x#159

Code

Merged

apenney merged 8 commits intopuppetlabs:3.1.xpuppetlabs/puppetlabs-ntp:3.1.xfrom

cyberious:3.1.xcyberious/puppetlabs-ntp:3.1.xCopy head branch name to clipboard

Jun 3, 2014

Commits

Commits on Dec 16, 2013

• fix documentation - manage_service -> service_manage

  

  Nathan Sullivan

  committed
  240c768

  Copy full SHA for 240c768

Commits on Feb 7, 2014

• add parameter to set a log file

  darix

  committed
  54ec7f9

  Copy full SHA for 54ec7f9

• only check the log file if it is actually used.

  darix

  committed
  c474fd3

  Copy full SHA for c474fd3

Commits on May 14, 2014

• Merge pull request #152 from apenney/tighten-dependencies

  Show description for 0db1d4f
  

  Ashley Penney

  committed
  0db1d4f

  Copy full SHA for 0db1d4f

Commits on May 15, 2014

• Merge pull request #117 from CpuID/master

  Show description for aed8d0c
  cyberious

  committed
  aed8d0c

  Copy full SHA for aed8d0c

Commits on Jun 3, 2014

• Merge pull request #122 from darix/add_log_file_param

  Show description for f2a41ea
  cyberious

  committed
  f2a41ea

  Copy full SHA for f2a41ea

• Merge branch 'master' into 3.1.x

  

  Travis Fields

  committed
  f3d9114

  Copy full SHA for f3d9114

• Fix restrict_spec test

  

  Travis Fields

  committed
  198ea79

  Copy full SHA for 198ea79