diff --git a/CHANGELOG b/CHANGELOG index ede0318ef2..f3b1e407fa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ -3.0-alpha-136-g485bddf -- Merged master branch 2.2-folsom-79-g13cd2ad into grizzly +3.0-alpha-174-g94a98d6 +- Merge from master branch +- Rsyslog tuning +- Puppet debug output +- Centos 6.4 2.1-folsom-docs-324-g61d1599 - Grizzly support for centos simple