From 95c2e6c639bee09d15796a8ca74ee4b2f4593a6d Mon Sep 17 00:00:00 2001
From: josh <josh@3f5042e3-fb1d-0410-be18-d6ca2573e517>
Date: Wed, 27 Jun 2007 20:03:21 +0000
Subject: [PATCH] FORMAT:		added new items to changelog

git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@89 3f5042e3-fb1d-0410-be18-d6ca2573e517
---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1aa682a..dcc9d9e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 Maui 3.2.6p20
   - Fixed a potential security issue when Maui is used with some PBS configurations.
   - Fixed a bug pertaining to Maui's resource policy ExtendedViolation time (thanks goes to Nick Sonneveld).
+  - Fixed a bug with generic consumable floating resources which prevented them from working when a job also requested a 'mem' resource (thanks to Jeffrey Reed for the fix).
+  - Fixed typos in MPBSI.c that may have caused undesirable side-effects (thanks to Jeffrey Reed for the fix).
 
 Maui 3.2.6p19