Merge pull request redhat-openstack#136 from mhaskel/merge_1.2.x

Merge 1.2.x

CHANGELOG.md

@@ -1,3 +1,15 @@
+##2014-11-11 - Supported Releases 1.2.0
+###Summary
+
+This is primarily a bugfix release, but also includes documentation updates and synchronization of files with modulesync.
+
+####Features
+- Synchronized files using modulesync
+- Improved documentation with a warning about old, manually installed inifile with PE3.3+
+
+####Bugfixes
+- Fix issue where single character settings were not being saved
+
 ##2014-09-30 - Supported Releases 1.1.4
 ###Summary
 

metadata.json

@@ -1,12 +1,12 @@
 {
   "name": "puppetlabs-inifile",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "author": "Puppet Labs",
   "summary": "Resource types for managing settings in INI files",
   "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-inifile",
   "project_page": "https://github.com/puppetlabs/puppetlabs-inifile",
-  "issues_url": "https://github.com/puppetlabs/puppetlabs-inifile/issues",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -43,7 +43,9 @@
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
-        "11 SP1"
+        "10 SP4",
+        "11 SP1",
+        "12"
       ]
     },
     {