log
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   app1/zookeeper-1/bin/data/version-2/log.700000001
#	new file:   app1/zookeeper-1/bin/data/version-2/snapshot.600000032
#	new file:   app1/zookeeper-1/bin/data/version-2/snapshot.700000001
#	new file:   app1/zookeeper-1/bin/data/version-2/snapshot.800000000
#	new file:   app1/zookeeper-1/bin/data/version-2/snapshot.900000000
#	new file:   app1/zookeeper-2/bin/data/version-2/log.700000001
#	new file:   app1/zookeeper-2/bin/data/version-2/snapshot.600000032
#	new file:   app1/zookeeper-2/bin/data/version-2/snapshot.800000000
#	new file:   app1/zookeeper-2/bin/data/version-2/snapshot.a00000000
#	new file:   app1/zookeeper-3/bin/data/version-2/log.700000001
#	new file:   app1/zookeeper-3/bin/data/version-2/snapshot.600000032
#	new file:   app1/zookeeper-3/bin/data/version-2/snapshot.700000001
#	new file:   app1/zookeeper-3/bin/data/version-2/snapshot.900000000
#	new file:   app2/client/target/classes/com/depeng/feature/Client.class
#	new file:   app2/client/target/classes/com/depeng/feature/job/FeatureJob$1.class
#	new file:   app2/client/target/classes/com/depeng/feature/job/FeatureJob.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/ZkClientUtil.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/ZkFeatureJobClient$1.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/ZkFeatureJobClient$2.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/ZkFeatureJobClient$3.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/ZkFeatureJobClient.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/common/ChildData.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/common/Constant.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/common/EventNodeCache$1.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/common/EventNodeCache$2.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/common/EventNodeCache$3.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/common/EventNodeCache$4.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/common/EventNodeCache$5.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/common/EventNodeCache$State.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/common/EventNodeCache.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/common/NotifyEventType.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/common/Path.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/common/ZkFeatureJobMember.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/config/ConfigService.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/listener/MemberUpdateListener.class
#	new file:   app2/client/target/classes/com/depeng/feature/zk/listener/NotifyEventListener.class
#	new file:   app2/client/target/classes/conf/config.properties
#	new file:   app2/client/target/test-classes/com/depeng/feature/zk/testcase/ZkFeatureJobClientEventNotifyTest.class
#	new file:   app2/client/target/test-classes/com/depeng/feature/zk/testcase/ZkFeatureJobClientMemberChangeTest.class
#	new file:   app2/client/target/test-classes/com/depeng/feature/zk/testcase/ZkFeatureJobClientTest.class
#	new file:   app2/client/target/test-classes/logback.xml
#	modified:   app2/featureJob/.idea/workspace.xml
#	modified:   app2/featureJob/target/classes/com/depeng/feature/zk/ZkFeatureJobClient$2.class
#	modified:   app2/featureJob/target/classes/com/depeng/feature/zk/ZkFeatureJobClient$3.class
#	modified:   app2/featureJob/target/classes/com/depeng/feature/zk/ZkFeatureJobClient.class
#	modified:   app2/featureJob/target/classes/com/depeng/feature/zk/common/Constant.class
#
Merge remote-tracking branch 'origin/master'

Conflicts:
	app2/featureJob/.idea/compiler.xml
	app2/featureJob/.idea/encodings.xml
	app2/featureJob/.idea/misc.xml
	app2/featureJob/.idea/modules.xml
	app2/featureJob/.idea/workspace.xml
	app2/featureJob/featureJob.iml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app2/featureJob/.idea/compiler.xml
	app2/featureJob/.idea/encodings.xml
	app2/featureJob/.idea/misc.xml
	app2/featureJob/.idea/modules.xml
	app2/featureJob/.idea/workspace.xml
	app2/featureJob/featureJob.iml