Revision 425474

Jump to revision:
Author:	chirino
Date:	Tue Jul 25 18:17:57 2006 UTC (18 years, 4 months ago)
Changed paths:	5
Log Message:	Merged in fixes from trunk

Changed paths

Path	Details
incubator/activemq/branches/activemq-4.0/activeio/activeio-core/src/main/java/org/apache/activeio/journal/active/ControlFile.java	modified , text changed
incubator/activemq/branches/activemq-4.0/activeio/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalImpl.java	modified , text changed
incubator/activemq/branches/activemq-4.0/activeio/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalLockedException.java (Copied from incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalLockedException.java, r425473)	added
incubator/activemq/branches/activemq-4.0/activeio/activeio-core/src/test/java/org/apache/activeio/journal/JournalPerfToolSupport.java	modified , text changed
incubator/activemq/branches/activemq-4.0/activeio/activeio-core/src/test/java/org/apache/activeio/journal/active/JournalPerfTool.java	modified , text changed