Remove unneeded content for cqlsh

Removed all java code/logic to only install cqlsh
Can still build deb with:
 debuild -rfakeroot -k<your_gpg_key_id>
Merge branch 'cassandra-tools-1.2.5' into trunk

Conflicts:
	bin/cassandra
	bin/cassandra-cli
	bin/json2sstable
	bin/nodetool
	bin/sstable2json
	bin/sstablekeys
	bin/sstableloader
	build.xml
	conf/cassandra.yaml
	debian/cassandra.install
	examples/client_only/src/ClientOnlyExample.java
	examples/hadoop_word_count/src/WordCount.java
	examples/hadoop_word_count/src/WordCountCounters.java
	examples/hadoop_word_count/src/WordCountSetup.java
	examples/pig/test/test_storage.pig
	src/java/org/apache/cassandra/auth/Auth.java
	src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
	src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
	src/java/org/apache/cassandra/cache/AutoSavingCache.java
	src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java
	src/java/org/apache/cassandra/cache/ICache.java
	src/java/org/apache/cassandra/cache/InstrumentingCache.java
	src/java/org/apache/cassandra/cache/SerializingCache.java
	src/java/org/apache/cassandra/cache/SerializingCacheProvider.java
	src/java/org/apache/cassandra/cli/CliClient.java
	src/java/org/apache/cassandra/cli/CliMain.java
	src/java/org/apache/cassandra/client/RingCache.java
	src/java/org/apache/cassandra/config/Avro.java
	src/java/org/apache/cassandra/config/CFMetaData.java
	src/java/org/apache/cassandra/config/ColumnDefinition.java
	src/java/org/apache/cassandra/config/Config.java
	src/java/org/apache/cassandra/config/ConfigurationLoader.java
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
	src/java/org/apache/cassandra/config/KSMetaData.java
	src/java/org/apache/cassandra/config/Schema.java
	src/java/org/apache/cassandra/cql/AlterTableStatement.java
	src/java/org/apache/cassandra/cql/CFPropDefs.java
	src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
	src/java/org/apache/cassandra/cql/DeleteStatement.java
	src/java/org/apache/cassandra/cql/DropIndexStatement.java
	src/java/org/apache/cassandra/cql/QueryProcessor.java
	src/java/org/apache/cassandra/cql/StatementType.java
	src/java/org/apache/cassandra/cql/UpdateStatement.java
	src/java/org/apache/cassandra/cql3/Attributes.java
	src/java/org/apache/cassandra/cql3/CFDefinition.java
	src/java/org/apache/cassandra/cql3/CFPropDefs.java
	src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
	src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java
	src/java/org/apache/cassandra/cql3/Constants.java
	src/java/org/apache/cassandra/cql3/Cql.g
	src/java/org/apache/cassandra/cql3/KSPropDefs.java
	src/java/org/apache/cassandra/cql3/Lists.java
	src/java/org/apache/cassandra/cql3/PropertyDefinitions.java
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/ResultSet.java
	src/java/org/apache/cassandra/cql3/UntypedResultSet.java
	src/java/org/apache/cassandra/cql3/UpdateParameters.java
	src/java/org/apache/cassandra/cql3/statements/AlterKeyspaceStatement.java
	src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
	src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
	src/java/org/apache/cassandra/cql3/statements/CreateKeyspaceStatement.java
	src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
	src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/cql3/statements/RawSelector.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/Selection.java
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
	src/java/org/apache/cassandra/db/AbstractThreadUnsafeSortedColumns.java
	src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
	src/java/org/apache/cassandra/db/AtomicSortedColumns.java
	src/java/org/apache/cassandra/db/BatchlogManager.java
	src/java/org/apache/cassandra/db/CollationController.java
	src/java/org/apache/cassandra/db/Column.java
	src/java/org/apache/cassandra/db/ColumnFamily.java
	src/java/org/apache/cassandra/db/ColumnFamilySerializer.java
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
	src/java/org/apache/cassandra/db/ColumnIndex.java
	src/java/org/apache/cassandra/db/ColumnSerializer.java
	src/java/org/apache/cassandra/db/ConsistencyLevel.java
	src/java/org/apache/cassandra/db/CounterColumn.java
	src/java/org/apache/cassandra/db/CounterMutation.java
	src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java
	src/java/org/apache/cassandra/db/CounterUpdateColumn.java
	src/java/org/apache/cassandra/db/DataTracker.java
	src/java/org/apache/cassandra/db/DecoratedKey.java
	src/java/org/apache/cassandra/db/DefinitionsUpdateVerbHandler.java
	src/java/org/apache/cassandra/db/DefsTable.java
	src/java/org/apache/cassandra/db/DeletedColumn.java
	src/java/org/apache/cassandra/db/DeletionInfo.java
	src/java/org/apache/cassandra/db/DeletionTime.java
	src/java/org/apache/cassandra/db/Directories.java
	src/java/org/apache/cassandra/db/ExpiringColumn.java
	src/java/org/apache/cassandra/db/HintedHandOffManager.java
	src/java/org/apache/cassandra/db/IMutation.java
	src/java/org/apache/cassandra/db/Memtable.java
	src/java/org/apache/cassandra/db/MigrationRequestVerbHandler.java
	src/java/org/apache/cassandra/db/OnDiskAtom.java
	src/java/org/apache/cassandra/db/RangeSliceCommand.java
	src/java/org/apache/cassandra/db/RangeTombstone.java
	src/java/org/apache/cassandra/db/ReadCommand.java
	src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
	src/java/org/apache/cassandra/db/ReadResponse.java
	src/java/org/apache/cassandra/db/ReadVerbHandler.java
	src/java/org/apache/cassandra/db/RetriedSliceFromReadCommand.java
	src/java/org/apache/cassandra/db/Row.java
	src/java/org/apache/cassandra/db/RowIndexEntry.java
	src/java/org/apache/cassandra/db/RowIteratorFactory.java
	src/java/org/apache/cassandra/db/RowMutation.java
	src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
	src/java/org/apache/cassandra/db/RowPosition.java
	src/java/org/apache/cassandra/db/SchemaCheckVerbHandler.java
	src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
	src/java/org/apache/cassandra/db/SliceFromReadCommand.java
	src/java/org/apache/cassandra/db/SliceQueryPager.java
	src/java/org/apache/cassandra/db/SnapshotCommand.java
	src/java/org/apache/cassandra/db/SystemTable.java
	src/java/org/apache/cassandra/db/Table.java
	src/java/org/apache/cassandra/db/TreeMapBackedSortedColumns.java
	src/java/org/apache/cassandra/db/TruncateResponse.java
	src/java/org/apache/cassandra/db/TruncateVerbHandler.java
	src/java/org/apache/cassandra/db/Truncation.java
	src/java/org/apache/cassandra/db/WriteResponse.java
	src/java/org/apache/cassandra/db/WriteType.java
	src/java/org/apache/cassandra/db/columniterator/IdentityQueryFilter.java
	src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
	src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
	src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java
	src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
	src/java/org/apache/cassandra/db/commitlog/BatchCommitLogExecutorService.java
	src/java/org/apache/cassandra/db/commitlog/CommitLog.java
	src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java
	src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
	src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
	src/java/org/apache/cassandra/db/commitlog/PeriodicCommitLogExecutorService.java
	src/java/org/apache/cassandra/db/commitlog/ReplayPosition.java
	src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java
	src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
	src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java
	src/java/org/apache/cassandra/db/compaction/CompactionController.java
	src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
	src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
	src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
	src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
	src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
	src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
	src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
	src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
	src/java/org/apache/cassandra/db/compaction/Scrubber.java
	src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
	src/java/org/apache/cassandra/db/filter/ColumnCounter.java
	src/java/org/apache/cassandra/db/filter/ColumnSlice.java
	src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
	src/java/org/apache/cassandra/db/filter/IDiskAtomFilter.java
	src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
	src/java/org/apache/cassandra/db/filter/QueryFilter.java
	src/java/org/apache/cassandra/db/filter/QueryPath.java
	src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
	src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
	src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
	src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
	src/java/org/apache/cassandra/db/index/SecondaryIndex.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
	src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java
	src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
	src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
	src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
	src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
	src/java/org/apache/cassandra/db/marshal/AbstractType.java
	src/java/org/apache/cassandra/db/marshal/CollectionType.java
	src/java/org/apache/cassandra/db/marshal/CompositeType.java
	src/java/org/apache/cassandra/db/marshal/ListType.java
	src/java/org/apache/cassandra/db/marshal/MapType.java
	src/java/org/apache/cassandra/db/marshal/SetType.java
	src/java/org/apache/cassandra/dht/AbstractBounds.java
	src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
	src/java/org/apache/cassandra/dht/BootStrapper.java
	src/java/org/apache/cassandra/dht/IPartitioner.java
	src/java/org/apache/cassandra/dht/LocalPartitioner.java
	src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
	src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
	src/java/org/apache/cassandra/dht/RandomPartitioner.java
	src/java/org/apache/cassandra/dht/Token.java
	src/java/org/apache/cassandra/gms/EndpointState.java
	src/java/org/apache/cassandra/gms/FailureDetector.java
	src/java/org/apache/cassandra/gms/GossipDigest.java
	src/java/org/apache/cassandra/gms/GossipDigestAck.java
	src/java/org/apache/cassandra/gms/GossipDigestAck2.java
	src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
	src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java
	src/java/org/apache/cassandra/gms/GossipDigestSyn.java
	src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
	src/java/org/apache/cassandra/gms/GossipShutdownVerbHandler.java
	src/java/org/apache/cassandra/gms/Gossiper.java
	src/java/org/apache/cassandra/gms/HeartBeatState.java
	src/java/org/apache/cassandra/gms/IEndpointStateChangeSubscriber.java
	src/java/org/apache/cassandra/gms/IFailureDetectionEventListener.java
	src/java/org/apache/cassandra/gms/IFailureDetector.java
	src/java/org/apache/cassandra/gms/IFailureNotification.java
	src/java/org/apache/cassandra/gms/TokenSerializer.java
	src/java/org/apache/cassandra/gms/VersionedValue.java
	src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
	src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
	src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
	src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
	src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java
	src/java/org/apache/cassandra/hadoop/ConfigHelper.java
	src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
	src/java/org/apache/cassandra/io/ISSTableSerializer.java
	src/java/org/apache/cassandra/io/ISerializer.java
	src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
	src/java/org/apache/cassandra/io/compress/CompressedThrottledReader.java
	src/java/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.java
	src/java/org/apache/cassandra/io/sstable/ColumnStats.java
	src/java/org/apache/cassandra/io/sstable/Component.java
	src/java/org/apache/cassandra/io/sstable/Descriptor.java
	src/java/org/apache/cassandra/io/sstable/IndexHelper.java
	src/java/org/apache/cassandra/io/sstable/IndexSummary.java
	src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
	src/java/org/apache/cassandra/io/sstable/KeyIterator.java
	src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java
	src/java/org/apache/cassandra/io/sstable/SSTable.java
	src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
	src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
	src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
	src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
	src/java/org/apache/cassandra/io/sstable/SSTableReader.java
	src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
	src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
	src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
	src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
	src/java/org/apache/cassandra/io/util/IAllocator.java
	src/java/org/apache/cassandra/io/util/JEMallocAllocator.java
	src/java/org/apache/cassandra/io/util/Memory.java
	src/java/org/apache/cassandra/io/util/MemoryInputStream.java
	src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
	src/java/org/apache/cassandra/io/util/NativeAllocator.java
	src/java/org/apache/cassandra/io/util/RandomAccessReader.java
	src/java/org/apache/cassandra/io/util/SegmentedFile.java
	src/java/org/apache/cassandra/io/util/SequentialWriter.java
	src/java/org/apache/cassandra/io/util/ThrottledReader.java
	src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
	src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
	src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
	src/java/org/apache/cassandra/net/AsyncOneResponse.java
	src/java/org/apache/cassandra/net/CallbackInfo.java
	src/java/org/apache/cassandra/net/CompactEndpointSerializationHelper.java
	src/java/org/apache/cassandra/net/IAsyncCallback.java
	src/java/org/apache/cassandra/net/IVerbHandler.java
	src/java/org/apache/cassandra/net/IncomingTcpConnection.java
	src/java/org/apache/cassandra/net/MessageDeliveryTask.java
	src/java/org/apache/cassandra/net/MessageIn.java
	src/java/org/apache/cassandra/net/MessageOut.java
	src/java/org/apache/cassandra/net/MessagingService.java
	src/java/org/apache/cassandra/net/OutboundTcpConnection.java
	src/java/org/apache/cassandra/net/ResponseVerbHandler.java
	src/java/org/apache/cassandra/net/sink/IMessageSink.java
	src/java/org/apache/cassandra/net/sink/SinkManager.java
	src/java/org/apache/cassandra/service/AbstractRowResolver.java
	src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
	src/java/org/apache/cassandra/service/ActiveRepairService.java
	src/java/org/apache/cassandra/service/AsyncRepairCallback.java
	src/java/org/apache/cassandra/service/CacheService.java
	src/java/org/apache/cassandra/service/CacheServiceMBean.java
	src/java/org/apache/cassandra/service/CassandraDaemon.java
	src/java/org/apache/cassandra/service/ClientState.java
	src/java/org/apache/cassandra/service/GCInspector.java
	src/java/org/apache/cassandra/service/IResponseResolver.java
	src/java/org/apache/cassandra/service/MigrationManager.java
	src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
	src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
	src/java/org/apache/cassandra/service/ReadCallback.java
	src/java/org/apache/cassandra/service/RowDataResolver.java
	src/java/org/apache/cassandra/service/RowDigestResolver.java
	src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
	src/java/org/apache/cassandra/service/StorageProxy.java
	src/java/org/apache/cassandra/service/StorageProxyMBean.java
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/service/StorageServiceMBean.java
	src/java/org/apache/cassandra/service/TruncateResponseHandler.java
	src/java/org/apache/cassandra/streaming/FileStreamTask.java
	src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
	src/java/org/apache/cassandra/streaming/PendingFile.java
	src/java/org/apache/cassandra/streaming/ReplicationFinishedVerbHandler.java
	src/java/org/apache/cassandra/streaming/StreamHeader.java
	src/java/org/apache/cassandra/streaming/StreamIn.java
	src/java/org/apache/cassandra/streaming/StreamInSession.java
	src/java/org/apache/cassandra/streaming/StreamOut.java
	src/java/org/apache/cassandra/streaming/StreamReply.java
	src/java/org/apache/cassandra/streaming/StreamReplyVerbHandler.java
	src/java/org/apache/cassandra/streaming/StreamRequest.java
	src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java
	src/java/org/apache/cassandra/streaming/StreamingRepairTask.java
	src/java/org/apache/cassandra/streaming/compress/CompressedFileStreamTask.java
	src/java/org/apache/cassandra/thrift/CassandraServer.java
	src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java
	src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
	src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
	src/java/org/apache/cassandra/thrift/ThriftConversion.java
	src/java/org/apache/cassandra/thrift/ThriftServer.java
	src/java/org/apache/cassandra/thrift/ThriftValidation.java
	src/java/org/apache/cassandra/tools/BulkLoader.java
	src/java/org/apache/cassandra/tools/NodeCmd.java
	src/java/org/apache/cassandra/tools/NodeProbe.java
	src/java/org/apache/cassandra/tools/SSTableExport.java
	src/java/org/apache/cassandra/tools/SSTableImport.java
	src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java
	src/java/org/apache/cassandra/tools/Shuffle.java
	src/java/org/apache/cassandra/tools/StandaloneScrubber.java
	src/java/org/apache/cassandra/tracing/TraceState.java
	src/java/org/apache/cassandra/tracing/Tracing.java
	src/java/org/apache/cassandra/transport/CBCodec.java
	src/java/org/apache/cassandra/transport/CBUtil.java
	src/java/org/apache/cassandra/transport/Frame.java
	src/java/org/apache/cassandra/transport/Message.java
	src/java/org/apache/cassandra/transport/RequestThreadPoolExecutor.java
	src/java/org/apache/cassandra/transport/SimpleClient.java
	src/java/org/apache/cassandra/transport/messages/AuthenticateMessage.java
	src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
	src/java/org/apache/cassandra/transport/messages/ErrorMessage.java
	src/java/org/apache/cassandra/transport/messages/EventMessage.java
	src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java
	src/java/org/apache/cassandra/transport/messages/OptionsMessage.java
	src/java/org/apache/cassandra/transport/messages/PrepareMessage.java
	src/java/org/apache/cassandra/transport/messages/QueryMessage.java
	src/java/org/apache/cassandra/transport/messages/ReadyMessage.java
	src/java/org/apache/cassandra/transport/messages/RegisterMessage.java
	src/java/org/apache/cassandra/transport/messages/ResultMessage.java
	src/java/org/apache/cassandra/transport/messages/StartupMessage.java
	src/java/org/apache/cassandra/transport/messages/SupportedMessage.java
	src/java/org/apache/cassandra/utils/BloomFilterSerializer.java
	src/java/org/apache/cassandra/utils/BooleanSerializer.java
	src/java/org/apache/cassandra/utils/ByteBufferUtil.java
	src/java/org/apache/cassandra/utils/CLibrary.java
	src/java/org/apache/cassandra/utils/EstimatedHistogram.java
	src/java/org/apache/cassandra/utils/ExpiringMap.java
	src/java/org/apache/cassandra/utils/FBUtilities.java
	src/java/org/apache/cassandra/utils/FilterFactory.java
	src/java/org/apache/cassandra/utils/IMergeIterator.java
	src/java/org/apache/cassandra/utils/IntervalTree.java
	src/java/org/apache/cassandra/utils/MergeIterator.java
	src/java/org/apache/cassandra/utils/MerkleTree.java
	src/java/org/apache/cassandra/utils/SimpleCondition.java
	src/java/org/apache/cassandra/utils/StatusLogger.java
	src/java/org/apache/cassandra/utils/StreamingHistogram.java
	src/java/org/apache/cassandra/utils/Throttle.java
	src/java/org/apache/cassandra/utils/UUIDGen.java
	src/java/org/apache/cassandra/utils/UUIDSerializer.java
	src/java/org/apache/cassandra/utils/obs/IBitSet.java
	src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
	src/java/org/apache/cassandra/utils/obs/OpenBitSet.java
	src/resources/org/apache/cassandra/cli/CliHelp.yaml
	src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
	test/conf/cassandra.yaml
	test/data/corrupt-sstables/Keyspace1-Standard3-ja-1-Data.db
	test/data/corrupt-sstables/Keyspace1-Standard3-ja-1-Index.db
	test/data/corrupt-sstables/Keyspace1-Standard3-ja-1-Statistics.db
	test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Statistics.db
	test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Statistics.db
	test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Statistics.db
	test/long/org/apache/cassandra/db/LongTableTest.java
	test/long/org/apache/cassandra/db/MeteredFlusherTest.java
	test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java
	test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
	test/long/org/apache/cassandra/utils/LongBitSetTest.java
	test/long/org/apache/cassandra/utils/LongBloomFilterTest.java
	test/system/test_thrift_server.py
	test/unit/org/apache/cassandra/AbstractSerializationsTester.java
	test/unit/org/apache/cassandra/SchemaLoader.java
	test/unit/org/apache/cassandra/Util.java
	test/unit/org/apache/cassandra/cache/CacheProviderTest.java
	test/unit/org/apache/cassandra/cli/CliTest.java
	test/unit/org/apache/cassandra/client/TestRingCache.java
	test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
	test/unit/org/apache/cassandra/config/CFMetaDataTest.java
	test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java
	test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
	test/unit/org/apache/cassandra/config/DefsTest.java
	test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
	test/unit/org/apache/cassandra/db/CleanupTest.java
	test/unit/org/apache/cassandra/db/CollationControllerTest.java
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
	test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
	test/unit/org/apache/cassandra/db/CommitLogTest.java
	test/unit/org/apache/cassandra/db/CounterColumnTest.java
	test/unit/org/apache/cassandra/db/CounterMutationTest.java
	test/unit/org/apache/cassandra/db/DirectoriesTest.java
	test/unit/org/apache/cassandra/db/HintedHandOffTest.java
	test/unit/org/apache/cassandra/db/KeyCacheTest.java
	test/unit/org/apache/cassandra/db/KeyCollisionTest.java
	test/unit/org/apache/cassandra/db/MultitableTest.java
	test/unit/org/apache/cassandra/db/NameSortTest.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
	test/unit/org/apache/cassandra/db/ReadMessageTest.java
	test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
	test/unit/org/apache/cassandra/db/RecoveryManager3Test.java
	test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
	test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
	test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
	test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
	test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
	test/unit/org/apache/cassandra/db/RemoveColumnTest.java
	test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
	test/unit/org/apache/cassandra/db/RowCacheTest.java
	test/unit/org/apache/cassandra/db/RowIterationTest.java
	test/unit/org/apache/cassandra/db/RowTest.java
	test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java
	test/unit/org/apache/cassandra/db/SerializationsTest.java
	test/unit/org/apache/cassandra/db/TableTest.java
	test/unit/org/apache/cassandra/db/TimeSortTest.java
	test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
	test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
	test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java
	test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
	test/unit/org/apache/cassandra/db/context/CounterContextTest.java
	test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
	test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
	test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
	test/unit/org/apache/cassandra/dht/BootStrapperTest.java
	test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
	test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
	test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
	test/unit/org/apache/cassandra/io/sstable/SSTableMetadataSerializerTest.java
	test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
	test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java
	test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java
	test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
	test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
	test/unit/org/apache/cassandra/locator/TokenMetadataTest.java
	test/unit/org/apache/cassandra/service/AntiEntropyServiceCounterTest.java
	test/unit/org/apache/cassandra/service/AntiEntropyServiceStandardTest.java
	test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java
	test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
	test/unit/org/apache/cassandra/service/MoveTest.java
	test/unit/org/apache/cassandra/service/RelocateTest.java
	test/unit/org/apache/cassandra/service/RemoveTest.java
	test/unit/org/apache/cassandra/service/RowResolverTest.java
	test/unit/org/apache/cassandra/service/SerializationsTest.java
	test/unit/org/apache/cassandra/service/StorageServiceServerTest.java
	test/unit/org/apache/cassandra/streaming/SerializationsTest.java
	test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
	test/unit/org/apache/cassandra/streaming/compress/CompressedInputStreamTest.java
	test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
	test/unit/org/apache/cassandra/tools/SSTableExportTest.java
	test/unit/org/apache/cassandra/tools/SSTableImportTest.java
	test/unit/org/apache/cassandra/utils/BitSetTest.java
	test/unit/org/apache/cassandra/utils/BloomFilterTest.java
	test/unit/org/apache/cassandra/utils/BytesReadTrackerTest.java
	test/unit/org/apache/cassandra/utils/EncodedStreamsTest.java
	test/unit/org/apache/cassandra/utils/IntervalTreeTest.java
	test/unit/org/apache/cassandra/utils/SerializationsTest.java
Merge branch 'trunk' into cassandra-tools-1.2.5