cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject [4/9] git commit: Merge branch 'cassandra-1.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1
Date Tue, 07 Feb 2012 20:56:12 GMT
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/9b315df3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b315df3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b315df3

Branch: refs/heads/trunk
Commit: 9b315df3894804b970bbca447c6faa884eaf7bcc
Parents: 7b1dd3d 2522878
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Feb 7 13:10:53 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Feb 7 13:10:53 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    3 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   20 +++++++
 .../cassandra/db/compaction/CompactionManager.java |   19 +++----
 .../apache/cassandra/db/index/SecondaryIndex.java  |    8 +++-
 .../cassandra/db/index/SecondaryIndexManager.java  |   16 ++++++-
 .../apache/cassandra/db/index/keys/KeysIndex.java  |    5 ++
 .../apache/cassandra/db/marshal/CompositeType.java |    5 ++
 .../apache/cassandra/service/StorageService.java   |    9 ++-
 .../cassandra/service/StorageServiceMBean.java     |    2 +-
 src/java/org/apache/cassandra/tools/NodeCmd.java   |    1 -
 .../org/apache/cassandra/tools/SSTableImport.java  |    4 +-
 test/system/__init__.py                            |    2 +-
 test/system/test_thrift_server.py                  |   40 +++++++--------
 test/unit/org/apache/cassandra/db/DefsTest.java    |    5 +-
 14 files changed, 93 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message