Merge pull request jhoblitt#2 from jhoblitt/feature/v1.2.0

Feature/v1.2.0

Author: Joshua Hoblitt

.fixtures.yml

@@ -1,7 +1,7 @@
 fixtures:
   repositories:
-    "stdlib":
-      repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-      ref: "4.2.0"
+    stdlib:
+      repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
+      ref: '4.2.0'
   symlinks:
-    "pureftpd": "#{source_dir}"
+    pureftpd: "#{source_dir}"

.gitignore

@@ -1,6 +1,11 @@
-pkg/
-spec/fixtures/
+.bundle
 Gemfile.lock
 *.orig
-*.rej
 *.patch
+pkg/
+*.rej
+.rspec_system/
+spec/fixtures/manifests/
+spec/fixtures/modules/
+*.swp
+.vagrant

CHANGELOG.md

@@ -1,5 +1,29 @@
 
 #### [Current]
+ * [554f1a8](../../commit/554f1a8) - __(Joshua Hoblitt)__ add boilerplate Versioning/See Also sections to README
+ * [aee2b37](../../commit/aee2b37) - __(Joshua Hoblitt)__ remove README section on stdlib
+
+This section has not be relevant since commit
+e1962ecd9dc93278121523e3d6d35e740af172ca.
+
+ * [6afbfdc](../../commit/6afbfdc) - __(Joshua Hoblitt)__ add `:require => false` to all Gemfile gems
+ * [aecaa3a](../../commit/aecaa3a) - __(Joshua Hoblitt)__ change .fixtures.yml to use https:// instead of git://
+ * [0fba3b0](../../commit/0fba3b0) - __(Joshua Hoblitt)__ update .gitignore
+ * [dc7b383](../../commit/dc7b383) - __(Joshua Hoblitt)__ Merge pull request [#1](../../issues/1) from jhoblitt/feature/drop_bundled_merge_function
+
+Feature/drop bundled merge function
+ * [68dc8fc](../../commit/68dc8fc) - __(Joshua Hoblitt)__ remove bundled pureftpd_merge() function
+
+The pureftpd_merge() function included in this module is a copy of the
+stdlib merge() function from commit id
+f496005bf3db8a5202bf9c16daf9a524b178c67a.  This version of merge()
+includes a critical bug fix that was commit after the stdlib 4.1.0
+release.  Now that stdlib 4.2.0 has been released (finally!) with the
+needed fix, bundling a version of the merge() function in this module is
+no longer necessary.
+
+#### v1.1.0
+ * [95265a0](../../commit/95265a0) - __(Joshua Hoblitt)__ bump version to v1.1.0
  * [56637b4](../../commit/56637b4) - __(Joshua Hoblitt)__ update travis matrix
  * [e1962ec](../../commit/e1962ec) - __(Joshua Hoblitt)__ give up all hope of a post stdlib 4.1.0 release happening
 

Gemfile

@@ -6,9 +6,7 @@ else
   gem 'puppet', :require => false
 end
 
-gem 'rake'
-gem 'puppetlabs_spec_helper'
-gem 'puppet-lint'
-gem 'puppet-syntax'
-
-# vim:ft=ruby
+gem 'rake',                   :require => false
+gem 'puppetlabs_spec_helper', :require => false
+gem 'puppet-lint',            :require => false
+gem 'puppet-syntax',          :require => false

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2012-2013 Joshua Hoblitt <[email protected]>
+Copyright (C) 2012-2014 Joshua Hoblitt <[email protected]>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

Modulefile

@@ -1,5 +1,5 @@
 name 'jhoblitt-pureftpd'
-version '1.1.0'
+version '1.2.0'
 
 author 'Joshua Hoblitt <[email protected]>'
 license 'Apache + GPLv3'

README.md

@@ -17,9 +17,10 @@ Puppet pureftpd Module
     * [Enabling MYSQL Authentication](#enabling-mysql-authentication)
     * [Enabling PGSQL Authentication](#enabling-pgsql-authentication)
 4. [Limitations](#limitations)
-    * [`stdlib`](#stdlib)
     * [Tested Platforms](#tested-platforms)
-5. [Support](#support)
+5. [Versioning](#versioning)
+6. [Support](#support)
+7. [See Also](#see-also)
 
 
 Overview
@@ -438,22 +439,26 @@ that have been introduced in subsequent releases.  Any configuration values
 present in a stable `pure-ftpd` release but not supported by this module should
 be considered a bug.
 
-### `stdlib` 
-
-This module is dependent upon this patch to the [`merge`
-function](https://github.com/puppetlabs/puppetlabs-stdlib/commit/f496005bf3db8a5202bf9c16daf9a524b178c67a)
-in `stdlib`, which as of 2013-09-22 is not part of a stable `stdlib` release.
-The present latest version is `4.1.0` and presumably the required patch will be
-part of a `4.1.1` or `4.2.0` release.
-
 ### Tested Platforms
 
 * el6.x
 
 
+Versioning
+----------
+
+This module is versioned according to the [Semantic Versioning
+2.0.0](http://semver.org/spec/v2.0.0.html) specification.
+
+
 Support
 -------
 
 Please log tickets and issues at
 [github](https://github.com/jhoblitt/puppet-pureftpd/issues)
 
+
+See Also
+--------
+
+* [`pure-ftpd`](http://www.pureftpd.org/project/pure-ftpd)