Merge pull request #138 from bmjen/rebase-master

Rebase from master

Author: DavidS

CHANGELOG.md

@@ -13,6 +13,13 @@ bugfixes and a metadata update to support Puppet Enterprise 2015.3.x.
 ####Test Improvements
 - Improves Windows testing.
 
+##2015-07-20 - Supported Release 1.3.1
+###Summary
+This release updates the metadata for the upcoming release of PE as well as an additional bugfix.
+
+####Bugfixes
+- Fixes Puppet.newtype deprecation warning
+
 ##2015-04-14 - Supported Release 1.3.0
 ###Summary
 Remove openssl command line tool from requirements

lib/puppet/type/java_ks.rb

@@ -5,7 +5,7 @@
   ensurable do
 
     desc 'Has three states: present, absent, and latest.  Latest
-      will compare the on disk MD5 fingerprint of the certificate and to that
+      will compare the on disk MD5 fingerprint of the certificate to that
       in keytool to determine if insync? returns true or false.  We redefine
       insync? for this paramerter to accomplish this.'