From: Christos Zoulas <christos@zoulas.com>
Date: Fri, 20 Mar 2009 20:11:05 +0000 (-0400)
Subject: Merge branch 'master' of git://git.fsl.cs.sunysb.edu/am-utils-6.2
X-Git-Tag: am-utils-6_2_rc1~23
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=4fad3c2da05ba9079f5a3bc762e0221c2dd884a4;p=am-utils-6.2.git

Merge branch 'master' of git://git.fsl.cs.sunysb.edu/am-utils-6.2
---

4fad3c2da05ba9079f5a3bc762e0221c2dd884a4
diff --cc ChangeLog
index 0cae7776,36a43c99..34cdd2b5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,4 +1,10 @@@
- 2009-02-13  Christos Zoulas <christos@zoulas.com>
++2009-03-20  Christos Zoulas <christos@zoulas.com>
 +
 +	* Fix largefile re-definitions
 +
 +	* Fix compilation error caused in previous patch
 +
- 2009-02-12  Christos Zoulas <christos@zoulas.com>
+ 2009-02-19  Christos Zoulas <christos@zoulas.com>
  
  	* Add a synchronous unmount amq rpc that will wait for the remote
  	  filesystem to be unmounted, or return an error. Enabled by amq -uu