1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fbe8b29e5..05a320f3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  5 17:53:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_flock): returns false on EAGAIN if non-blocking.
+	  [ruby-core:15795]
+
 Web Mar  5 17:43:43 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* transcode.c (transcode_loop): Adjusted detection of invalid