cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Date Fri, 30 Mar 2012 14:50:08 GMT
Updated Branches:
  refs/heads/cassandra-1.1 33f66e4fb -> 79354482a


Merge branch 'cassandra-1.1.0' 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/79354482
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79354482
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79354482

Branch: refs/heads/cassandra-1.1
Commit: 79354482aa5faf12dd375c7a7e9b9b2ebd3cd378
Parents: 33f66e4 adc0931
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Mar 30 16:49:51 2012 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Mar 30 16:49:51 2012 +0200

----------------------------------------------------------------------
 CHANGES.txt                                        |    3 ++
 NEWS.txt                                           |    3 +-
 conf/cassandra.yaml                                |    4 ---
 examples/client_only/conf/cassandra.yaml           |    4 ---
 src/java/org/apache/cassandra/cli/Cli.g            |    4 +-
 src/java/org/apache/cassandra/cli/CliClient.java   |   20 ++++++++++----
 src/java/org/apache/cassandra/config/Config.java   |    2 -
 .../cassandra/config/DatabaseDescriptor.java       |   10 -------
 .../db/columniterator/SSTableNamesIterator.java    |    2 +-
 .../db/columniterator/SSTableSliceIterator.java    |    2 +-
 .../db/compaction/AbstractCompactionIterable.java  |   13 ++++++++-
 .../db/compaction/CompactionIterable.java          |    7 +----
 .../db/compaction/ParallelCompactionIterable.java  |    4 +--
 .../apache/cassandra/io/sstable/SSTableReader.java |    2 +-
 .../cassandra/net/IncomingTcpConnection.java       |    4 +-
 .../cassandra/io/sstable/SSTableReaderTest.java    |    2 +-
 16 files changed, 40 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/79354482/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/79354482/NEWS.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/79354482/src/java/org/apache/cassandra/cli/Cli.g
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/79354482/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/79354482/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/79354482/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/79354482/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/79354482/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------


Mime
View raw message