Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 3.1.x down to master #157

Merged
merged 6 commits into from
Jun 3, 2014
Merged

merge 3.1.x down to master #157

merged 6 commits into from
Jun 3, 2014

Conversation

cyberious
Copy link
Contributor

No description provided.

@@ -1,5 +1,5 @@
name 'puppetlabs-ntp'
version '3.0.4'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We never released 3.0.4 or 3.1.0 did we? Should we? Are both of those blocked on testing?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no 3.1.0 is the next release.
We never did release 3.0.4 I think we decided to skip it, or did we want to do a step release before supported 3.1.0 release?

Travis Fields and others added 2 commits June 2, 2014 16:10
hunner added a commit that referenced this pull request Jun 3, 2014
merge 3.1.x down to master
@hunner hunner merged commit 9124234 into master Jun 3, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants