Merge branch 'cassandra-1.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c2ded6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c2ded6e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c2ded6e Branch: refs/heads/trunk Commit: 6c2ded6e98f017183665a80d947400b8774b4b21 Parents: 099f04e edd7f45 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Feb 6 17:05:01 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Feb 6 17:05:01 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 23 ++++- NEWS.txt | 8 ++ conf/cassandra-env.sh | 1 + conf/cassandra.yaml | 7 + src/java/org/apache/cassandra/cli/CliClient.java | 10 +-- src/java/org/apache/cassandra/config/Config.java | 14 +++ .../cassandra/config/DatabaseDescriptor.java | 5 + .../org/apache/cassandra/cql/jdbc/JdbcDate.java | 12 ++- .../org/apache/cassandra/db/ColumnFamilyStore.java | 23 ++-- src/java/org/apache/cassandra/db/SystemTable.java | 2 +- .../apache/cassandra/db/commitlog/CommitLog.java | 3 +- src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- .../apache/cassandra/hadoop/BulkRecordWriter.java | 88 +++++++++++---- .../cassandra/hadoop/pig/CassandraStorage.java | 87 +++++++++++--- .../apache/cassandra/io/sstable/SSTableReader.java | 5 +- .../cassandra/net/OutboundTcpConnection.java | 5 + .../cassandra/net/OutboundTcpConnectionPool.java | 17 ++- .../org/apache/cassandra/security/SSLFactory.java | 10 ++ .../apache/cassandra/streaming/FileStreamTask.java | 1 + .../cassandra/streaming/IncomingStreamReader.java | 1 + .../apache/cassandra/thrift/CassandraServer.java | 1 + .../apache/cassandra/cql/jdbc/ClientUtilsTest.java | 7 +- 22 files changed, 259 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c2ded6e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
