summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Helwig <jacob@puppetlabs.com>2011-04-06 16:24:07 -0700
committerJacob Helwig <jacob@puppetlabs.com>2011-04-06 16:24:07 -0700
commit6e02daa1ed56f9758226f4e640ec419395868728 (patch)
tree0466b18e80415458ea16d35d9eec38263c0a6c31
parent5b10173364a56458e3f2e8a44298722cda9321e7 (diff)
parent6b97242d5ca2cc28cc11e6f253f76fda90255d7f (diff)
downloadfacter-6e02daa1ed56f9758226f4e640ec419395868728.tar.gz
facter-6e02daa1ed56f9758226f4e640ec419395868728.tar.xz
facter-6e02daa1ed56f9758226f4e640ec419395868728.zip
Merge branch 'master' into next
* master: Update CHANGELOG for 1.5.9rc5 Ensures that ARP facts are returned only on EC2 hosts
-rw-r--r--CHANGELOG4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0112360..43382d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.5.9rc5
+========
+acf0bb2 Ensures that ARP facts are returned only on EC2 hosts
+
1.5.9rc4
========
09b9f9b (#6795) Update tests to reflect changed exec