renamed:    forest-core/src/main/java/fengfei/forest/slice/Resource.java -> forest-core/src/main/java/fengfei/forest/slice/SliceResource.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/Failover.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/Navigator.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/Plotter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/Slice.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/SliceRegistry.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/SliceResource.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/config/Config.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/config/DefaultRouterFactory.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/example/AccuracyRouterExample.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/example/NavigableRouterExample.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/AbstractRouter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/AbstractSlice.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/AccuracyRouter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/HashPlotter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/LoopPlotter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/NavigableRouter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/NullSlice.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/ReadWriteSlice.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/RemainderPlotter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/ResourceTribe.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/AccuracyRouterEqualityTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/AccuracyRouterReadWriteTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/NavigableRouterMutiRangeTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/NavigableRouterTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/ReadWriteSliceHashTest.java
	modified:   forest-database/src/example/java/fengfei/forest/example/HashAccuracyExample.java
	modified:   forest-database/src/example/java/fengfei/forest/example/RangeSliceExample.java
	modified:   forest-database/src/main/java/fengfei/forest/slice/database/DatabaseRouter.java
	modified:   forest-database/src/main/java/fengfei/forest/slice/database/PoolableDatabaseRouter.java
	modified:   forest-database/src/main/java/fengfei/forest/slice/database/PoolableServerResource.java
modified:   forest-database/src/main/java/fengfei/forest/slice/database/ServerResource.java

	forest-core/src/main/java/fengfei/forest/slice/Resource.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/Failover.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/Navigator.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/Plotter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/Slice.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/SliceRegistry.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/SliceResource.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/config/Config.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/config/DefaultRouterFactory.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/example/AccuracyRouterExample.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/example/NavigableRouterExample.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/AbstractRouter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/AbstractSlice.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/AccuracyRouter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/HashPlotter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/LoopPlotter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/NavigableRouter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/NullSlice.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/ReadWriteSlice.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/RemainderPlotter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/ResourceTribe.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/AccuracyRouterEqualityTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/AccuracyRouterReadWriteTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/NavigableRouterMutiRangeTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/NavigableRouterTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/ReadWriteSliceHashTest.java
	modified:   forest-database/src/example/java/fengfei/forest/example/HashAccuracyExample.java
	modified:   forest-database/src/example/java/fengfei/forest/example/RangeSliceExample.java
	modified:   forest-database/src/main/java/fengfei/forest/slice/database/DatabaseRouter.java
	modified:   forest-database/src/main/java/fengfei/forest/slice/database/PoolableDatabaseRouter.java
	modified:   forest-database/src/main/java/fengfei/forest/slice/database/PoolableServerResource.java
	modified:   forest-database/src/main/java/fengfei/forest/slice/database/ServerResource.java
dev...
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/AccuracyRouterEqualityTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/AccuracyRouterReadWriteTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/NavigableRouterMutiRangeTest.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/Slice.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/SliceRegistry.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/SliceResource.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/config/Config.java
        modified:   forest-core/src/main/java/fengfei/forest/slice/config/DefaultRouterFactory.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/example/AccuracyRouterExample.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/example/NavigableRouterExample.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/AbstractRouter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/AbstractSlice.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/AccuracyRouter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/NavigableRouter.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/NullSlice.java
	modified:   forest-core/src/main/java/fengfei/forest/slice/impl/ReadWriteSlice.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/AccuracyRouterEqualityTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/AccuracyRouterReadWriteTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/NavigableRouterMutiRangeTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/NavigableRouterTest.java
	modified:   forest-core/src/test/java/fengfei/forest/slice/impl/ReadWriteSliceHashTest.java
	modified:   forest-database/pom.xml
	modified:   forest-database/src/example/java/fengfei/forest/example/HashAccuracyExample.java
	modified:   forest-database/src/example/java/fengfei/forest/example/RangeSliceExample.java
	modified:   forest-database/src/main/java/fengfei/forest/slice/database/DatabaseRouter.java
	modified:   forest-database/src/main/java/fengfei/forest/slice/database/PoolableDatabaseRouter.java
	modified:   forest-database/src/main/java/fengfei/forest/slice/database/ServerResource.java
	modified:   forest-dbutils/src/main/java/fengfei/forest/database/pool/DruidPoolableDataSourceFactory.java
Merge branch 'forest-x1'

Conflicts:
	forest-core/src/main/java/fengfei/forest/slice/Navigator.java
	forest-core/src/main/java/fengfei/forest/slice/Slice.java
	forest-core/src/main/java/fengfei/forest/slice/impl/AccuracyRouter.java
	forest-core/src/main/java/fengfei/forest/slice/impl/NavigableRouter.java