update
update
Merge branch 'master' of github.com:dougc333/storm

Conflicts:
	storm-test4/bin/datadelete1$datadeleteSpout.class
	storm-test4/bin/datadelete1$datadeletebolt.class
	storm-test4/bin/datadelete1.class
	storm-test4/bin/test4/demo/BookTransTop.class
	storm-test4/bin/test4/demo/FailTest.class
	storm-test4/bin/test4/demo/FilterGroupID$FilterGroupIDBolt.class
	storm-test4/bin/test4/demo/FilterGroupID$FilterGroupIDSpout.class
	storm-test4/bin/test4/demo/FilterGroupID.class
	storm-test4/bin/test4/demo/LoadPackets.class
	storm-test4/bin/test4/demo/PerfObject.class
	storm-test4/bin/test4/demo/RedisData.class
	storm-test4/bin/test4/demo/RedisPerfTest.class
	storm-test4/bin/test4/demo/RedisTest.class
	storm-test4/bin/test4/demo/ServerAddressPort.class
	storm-test4/bin/test4/demo/TestAnchor$TestBolt.class
	storm-test4/bin/test4/demo/TestAnchor$TestSpout.class
	storm-test4/bin/test4/demo/TestAnchor.class
	storm-test4/bin/test4/demo/TestBoltScheduling$TestBolt.class
	storm-test4/bin/test4/demo/TestBoltScheduling.class
	storm-test4/bin/test4/demo/TestDataDelete$DataDeleteBolt.class
	storm-test4/bin/test4/demo/TestDataDelete$DataDeleteSpout.class
	storm-test4/bin/test4/demo/TestDataDelete.class
	storm-test4/bin/test4/demo/TestDataDeleteRequest$TDDRBolt.class
	storm-test4/bin/test4/demo/TestDataDeleteRequest$TDDRSpout.class
	storm-test4/bin/test4/demo/TestDataDeleteRequest.class
	storm-test4/bin/test4/demo/TestHttpClient$HttpSpout.class
	storm-test4/bin/test4/demo/TestHttpClient$TestBolt.class
	storm-test4/bin/test4/demo/TestHttpClient.class
	storm-test4/bin/test4/demo/TestJedis.class
	storm-test4/bin/test4/demo/TestOpaque.class
	storm-test4/bin/test4/demo/TestPartitioned.class
	storm-test4/bin/test4/demo/TestPerf1$TestBolt.class
	storm-test4/bin/test4/demo/TestPerf1$TestSpout.class
	storm-test4/bin/test4/demo/TestPerf1.class
	storm-test4/bin/test4/demo/TestPerf2$TestBolt.class
	storm-test4/bin/test4/demo/TestPerf2$TestSpout.class
	storm-test4/bin/test4/demo/TestPerf2.class
	storm-test4/bin/test4/demo/TestPerf3.class
	storm-test4/bin/test4/demo/TestPerf4$TestBolt.class
	storm-test4/bin/test4/demo/TestPerf4$TestSpout.class
	storm-test4/bin/test4/demo/TestPerf4.class
	storm-test4/bin/test4/demo/TestScheduler.class
	storm-test4/bin/test4/demo/TestSimple$TestSimpleBolt.class
	storm-test4/bin/test4/demo/TestSimple.class
	storm-test4/bin/test4/demo/TestSimpleAlert.class
	storm-test4/bin/test4/demo/TestSimpleTransFail$TestSimpleTransactionBolt.class
	storm-test4/bin/test4/demo/TestSimpleTransFail$TestSimpleTransactionCommitterBolt.class
	storm-test4/bin/test4/demo/TestSimpleTransFail$Value.class
	storm-test4/bin/test4/demo/TestSimpleTransFail.class
	storm-test4/bin/test4/demo/TestSimpleTransPartialCount$BucketCountUpdater.class
	storm-test4/bin/test4/demo/TestSimpleTransPartialCount$BucketValue.class
	storm-test4/bin/test4/demo/TestSimpleTransPartialCount$Bucketize.class
	storm-test4/bin/test4/demo/TestSimpleTransPartialCount$CountValue.class
	storm-test4/bin/test4/demo/TestSimpleTransPartialCount$KeyedCountUpdater.class
	storm-test4/bin/test4/demo/TestSimpleTransPartialCount.class
	storm-test4/bin/test4/demo/TestSimpleTransZookeeper.class
	storm-test4/bin/test4/demo/TestSimpleTransaction$TestSimpleTransactionBolt.class
	storm-test4/bin/test4/demo/TestSimpleTransaction$TestSimpleTransactionCommitterBolt.class
	storm-test4/bin/test4/demo/TestSimpleTransaction$Value.class
	storm-test4/bin/test4/demo/TestSimpleTransaction.class
	storm-test4/bin/test4/demo/TestSimpleTransactionOwnSpout.class
	storm-test4/bin/test4/demo/TestSimpleTransactionRedis.class
	storm-test4/bin/test4/demo/TestSpinWait.class
	storm-test4/bin/test4/demo/TestSpout8.class
	storm-test4/bin/test4/demo/TestSpout9$OneTupleBolt.class
	storm-test4/bin/test4/demo/TestSpout9$OneTupleSpout.class
	storm-test4/bin/test4/demo/TestSpout9.class
	storm-test4/bin/test4/demo/TestSpoutScheduling$TestBolt.class
	storm-test4/bin/test4/demo/TestSpoutScheduling$TestSpout.class
	storm-test4/bin/test4/demo/TestSpoutScheduling.class
	storm-test4/bin/test4/demo/TestStatConnect.class
	storm-test4/bin/test4/demo/TestStorm$TestBolt.class
	storm-test4/bin/test4/demo/TestStorm.class
	storm-test4/bin/test4/demo/TestStorm1$TestStorm1Bolt.class
	storm-test4/bin/test4/demo/TestStorm1$TestStorm1Spout.class
	storm-test4/bin/test4/demo/TestStorm1.class
	storm-test4/bin/test4/demo/TestStorm2$TestBolt.class
	storm-test4/bin/test4/demo/TestStorm2$TestSpout.class
	storm-test4/bin/test4/demo/TestStorm2.class
	storm-test4/bin/test4/demo/TestStorm3$TestBolt.class
	storm-test4/bin/test4/demo/TestStorm3$TestSpout.class
	storm-test4/bin/test4/demo/TestStorm3.class
	storm-test4/bin/test4/demo/TestStorm4$AlertBolt.class
	storm-test4/bin/test4/demo/TestStorm4$TestBolt.class
	storm-test4/bin/test4/demo/TestStorm4$TestBoltPerf.class
	storm-test4/bin/test4/demo/TestStorm4$TestSpout.class
	storm-test4/bin/test4/demo/TestStorm4$TestSpoutPerf.class
	storm-test4/bin/test4/demo/TestStorm4.class
	storm-test4/bin/test4/demo/TestStorm4a$TestBolt.class
	storm-test4/bin/test4/demo/TestStorm4a$TestSpout.class
	storm-test4/bin/test4/demo/TestStorm4a.class
	storm-test4/bin/test4/demo/TestStorm5$EmailBolt.class
	storm-test4/bin/test4/demo/TestStorm5$EmailSpout.class
	storm-test4/bin/test4/demo/TestStorm5$FormatBolt.class
	storm-test4/bin/test4/demo/TestStorm5.class
	storm-test4/bin/test4/demo/TestStorm6$TestBolt.class
	storm-test4/bin/test4/demo/TestStorm6$TestBolt1.class
	storm-test4/bin/test4/demo/TestStorm6$TestSpout.class
	storm-test4/bin/test4/demo/TestStorm6.class
	storm-test4/bin/test4/demo/TestStorm7$GetTweeters.class
	storm-test4/bin/test4/demo/TestStorm7.class
	storm-test4/bin/test4/demo/TestStorm7a$GetTweeters.class
	storm-test4/bin/test4/demo/TestStorm7a.class
	storm-test4/bin/test4/demo/TestStorm7b$GetTweeters.class
	storm-test4/bin/test4/demo/TestStorm7b.class
	storm-test4/bin/test4/demo/TestStorm8$OneTupleBolt.class
	storm-test4/bin/test4/demo/TestStorm8$OneTupleSpout.class
	storm-test4/bin/test4/demo/TestStorm8.class
	storm-test4/bin/test4/demo/TestStormFieldsGrouping$TestBolt1.class
	storm-test4/bin/test4/demo/TestStormFieldsGrouping$TestBolt2.class
	storm-test4/bin/test4/demo/TestStormFieldsGrouping$TestSpoutLetters.class
	storm-test4/bin/test4/demo/TestStormFieldsGrouping$TestSpoutNumbers.class
	storm-test4/bin/test4/demo/TestStormFieldsGrouping.class
	storm-test4/bin/test4/demo/TestSynchronizedOutputCollector.class
	storm-test4/bin/test4/demo/TestTrans$FirstBolt.class
	storm-test4/bin/test4/demo/TestTrans$SecondBolt.class
	storm-test4/bin/test4/demo/TestTrans$TransCoordinator.class
	storm-test4/bin/test4/demo/TestTrans$TransEmitter.class
	storm-test4/bin/test4/demo/TestTrans$TransSpout.class
	storm-test4/bin/test4/demo/TestTrans.class
	storm-test4/bin/test4/demo/TestWriteICommiter$TestBolt.class
	storm-test4/bin/test4/demo/TestWriteICommiter$TestSpout.class
	storm-test4/bin/test4/demo/TestWriteICommiter.class
	storm-test4/bin/test4/demo/TestWriteToFileBolt$FileBolt.class
	storm-test4/bin/test4/demo/TestWriteToFileBolt.class
	storm-test4/bin/test4/demo/TransactionalGlobalCount$BatchCount.class
	storm-test4/bin/test4/demo/TransactionalGlobalCount$UpdateGlobalCount.class
	storm-test4/bin/test4/demo/TransactionalGlobalCount$Value.class
	storm-test4/bin/test4/demo/TransactionalGlobalCount.class
	storm-test4/bin/test4/demo/bolts/AccountIDBolt.class
	storm-test4/bin/test4/demo/bolts/ExtBaseRichBolt.class
	storm-test4/bin/test4/demo/bolts/FieldCounterBolt.class
	storm-test4/bin/test4/demo/bolts/HashtagSplitterBolt.class
	storm-test4/bin/test4/demo/bolts/NextBoltPrint.class
	storm-test4/bin/test4/demo/bolts/PacketSplitterBolt.class
	storm-test4/bin/test4/demo/bolts/RandomFailureBolt.class
	storm-test4/bin/test4/demo/bolts/RedisCommiterCommiterBolt.class
	storm-test4/bin/test4/demo/bolts/ServerBolt.class
	storm-test4/bin/test4/demo/bolts/TestImpBasicBolt.class
	storm-test4/bin/test4/demo/bolts/UserHashtagJoinBolt.class
	storm-test4/bin/test4/demo/bolts/UserSplitterBolt.class
	storm-test4/bin/test4/demo/bolts/WriteToFileBolt.class
	storm-test4/bin/test4/demo/bolts/tweets/simple/bolts/HashtagSplitterBolt.class
	storm-test4/bin/test4/demo/datadelete1$datadeleteSpout.class
	storm-test4/bin/test4/demo/datadelete1$datadeletebolt.class
	storm-test4/bin/test4/demo/datadelete1.class
	storm-test4/bin/test4/demo/spouts/FileSpout.class
	storm-test4/bin/test4/demo/spouts/FileSpoutMetadata.class
	storm-test4/bin/test4/demo/spouts/FileSpoutTransactionalSpout$FileSpoutTransactionCoordinator.class
	storm-test4/bin/test4/demo/spouts/FileSpoutTransactionalSpout$FileSpoutTransactionEmitter.class
	storm-test4/bin/test4/demo/spouts/FileSpoutTransactionalSpout.class
	storm-test4/bin/test4/demo/spouts/ModifiedWordSpout.class
	storm-test4/bin/test4/demo/spouts/PacketSpoutCoordinator.class
	storm-test4/bin/test4/demo/spouts/PacketSpoutEmitter.class
	storm-test4/bin/test4/demo/spouts/PacketTransSpout.class
	storm-test4/bin/test4/demo/spouts/RQ.class
	storm-test4/bin/test4/demo/spouts/RedisSpout.class
	storm-test4/bin/test4/demo/spouts/TestInfiniteFileSpout.class
	storm-test4/bin/test4/demo/spouts/TestMetadata.class
	storm-test4/bin/test4/demo/spouts/TransactionMetadata.class
	storm-test4/bin/test4/demo/spouts/TransactionsSpouts.class
	storm-test4/bin/test4/demo/spouts/TweetsTransactionalSpout.class
	storm-test4/bin/test4/demo/spouts/TweetsTransactionalSpoutCoordinator.class
	storm-test4/bin/test4/demo/spouts/TweetsTransactionalSpoutEmitter.class
	storm-test4/bin/test4/examples/AckFailDelegate.class
	storm-test4/bin/test4/examples/AckFailMapTracker.class
	storm-test4/bin/test4/examples/AckTracker.class
	storm-test4/bin/test4/examples/BatchNumberList.class
	storm-test4/bin/test4/examples/BatchProcessWord.class
	storm-test4/bin/test4/examples/BatchRepeatA.class
	storm-test4/bin/test4/examples/BoltTracker.class
	storm-test4/bin/test4/examples/CompleteTopologyParam.class
	storm-test4/bin/test4/examples/CountingBatchBolt.class
	storm-test4/bin/test4/examples/CountingCommitBolt.class
	storm-test4/bin/test4/examples/FeederSpout.class
	storm-test4/bin/test4/examples/FixedTuple.class
	storm-test4/bin/test4/examples/FixedTupleSpout.class
	storm-test4/bin/test4/examples/IdentityBolt.class
	storm-test4/bin/test4/examples/KeyedCountingBatchBolt.class
	storm-test4/bin/test4/examples/KeyedCountingCommitterBolt.class
	storm-test4/bin/test4/examples/KeyedSummingBatchBolt.class
	storm-test4/bin/test4/examples/MemoryTransactionalSpout$Coordinator.class
	storm-test4/bin/test4/examples/MemoryTransactionalSpout$Emitter.class
	storm-test4/bin/test4/examples/MemoryTransactionalSpout.class
	storm-test4/bin/test4/examples/MemoryTransactionalSpoutMeta.class
	storm-test4/bin/test4/examples/MkClusterParam.class
	storm-test4/bin/test4/examples/MkTupleParam.class
	storm-test4/bin/test4/examples/MockedSources.class
	storm-test4/bin/test4/examples/NGrouping.class
	storm-test4/bin/test4/examples/NonRichBoltTracker.class
	storm-test4/bin/test4/examples/OpaqueMemoryTransactionalSpout$Coordinator.class
	storm-test4/bin/test4/examples/OpaqueMemoryTransactionalSpout$Emitter.class
	storm-test4/bin/test4/examples/OpaqueMemoryTransactionalSpout.class
	storm-test4/bin/test4/examples/PrepareBatchBolt.class
	storm-test4/bin/test4/examples/SpoutTracker$SpoutTrackOutputCollector.class
	storm-test4/bin/test4/examples/SpoutTracker.class
	storm-test4/bin/test4/examples/TestAggregatesCounter.class
	storm-test4/bin/test4/examples/TestConfBolt.class
	storm-test4/bin/test4/examples/TestGlobalCount.class
	storm-test4/bin/test4/examples/TestJob.class
	storm-test4/bin/test4/examples/TestPlannerBolt.class
	storm-test4/bin/test4/examples/TestPlannerSpout.class
	storm-test4/bin/test4/examples/TestSerObject.class
	storm-test4/bin/test4/examples/TestWordCounter.class
	storm-test4/bin/test4/examples/TestWordSpout.class
	storm-test4/bin/test4/examples/TrackedTopology.class
	storm-test4/bin/test4/examples/TupleCaptureBolt.class
	storm-test4/bin/test4/opaque/bolts/DB.class
	storm-test4/bin/test4/opaque/bolts/RedisOpaqueCommiter.class
	storm-test4/bin/test4/trident/TestTrident1.class
merge