[Reddwarf-commits] SF.net SVN: reddwarf:[154] sgs-server/branches/tjb-write-cache/sgs-server/ src

[<owe...@us...>]

Revision: 154
          http://reddwarf.svn.sourceforge.net/reddwarf/?rev=154&view=rev
Author:   owenkellett
Date:     2010-12-10 13:49:38 +0000 (Fri, 10 Dec 2010)

Log Message:
-----------
merge changes from trunk

Modified Paths:
--------------
    sgs-server/branches/tjb-write-cache/sgs-server/src/main/java/com/sun/sgs/impl/util/lock/BasicLocker.java
    sgs-server/branches/tjb-write-cache/sgs-server/src/main/java/com/sun/sgs/impl/util/lock/Lock.java
    sgs-server/branches/tjb-write-cache/sgs-server/src/main/java/com/sun/sgs/impl/util/lock/LockAttemptResult.java
    sgs-server/branches/tjb-write-cache/sgs-server/src/main/java/com/sun/sgs/impl/util/lock/LockConflict.java
    sgs-server/branches/tjb-write-cache/sgs-server/src/main/java/com/sun/sgs/impl/util/lock/LockManager.java
    sgs-server/branches/tjb-write-cache/sgs-server/src/main/java/com/sun/sgs/impl/util/lock/Locker.java
    sgs-server/branches/tjb-write-cache/sgs-server/src/main/java/com/sun/sgs/impl/util/lock/TxnLocker.java
    sgs-server/branches/tjb-write-cache/sgs-server/src/test/java/com/sun/sgs/test/impl/util/lock/TestLockManager.java
    sgs-server/branches/tjb-write-cache/sgs-server/src/test/java/com/sun/sgs/test/impl/util/lock/TestMultiLockManager.java
    sgs-server/branches/tjb-write-cache/sgs-server/src/test/java/com/sun/sgs/test/impl/util/lock/TestTxnLockManager.java

Property Changed:
----------------
    sgs-server/branches/tjb-write-cache/sgs-server/src/main/java/com/sun/sgs/impl/util/lock/
    sgs-server/branches/tjb-write-cache/sgs-server/src/test/java/com/sun/sgs/test/impl/util/lock/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.