Updated Branches: refs/heads/trunk 70523977c -> 1ec84642b
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ec84642 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ec84642 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ec84642 Branch: refs/heads/trunk Commit: 1ec84642b70d3ade141562a0800497a7b044f076 Parents: 7052397 b69fd1a Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Apr 17 09:29:44 2012 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Apr 17 09:29:44 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 7 ++++ .../org/apache/cassandra/config/CFMetaData.java | 6 ++-- .../org/apache/cassandra/config/KSMetaData.java | 2 +- src/java/org/apache/cassandra/config/Schema.java | 8 ++++ src/java/org/apache/cassandra/cql/Cql.g | 2 + src/java/org/apache/cassandra/cql3/Cql.g | 2 + .../statements/CreateColumnFamilyStatement.java | 7 ++-- .../cql3/statements/CreateKeyspaceStatement.java | 9 ++--- src/java/org/apache/cassandra/db/Directories.java | 7 +++- .../cassandra/service/AntiEntropyService.java | 22 +++++++++-- .../apache/cassandra/service/StorageService.java | 29 +++++++++++++++ .../cassandra/service/StorageServiceMBean.java | 13 +++++++ src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++ 13 files changed, 99 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ec84642/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ec84642/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ec84642/src/java/org/apache/cassandra/config/KSMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ec84642/src/java/org/apache/cassandra/config/Schema.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ec84642/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ec84642/src/java/org/apache/cassandra/cql3/statements/CreateKeyspaceStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ec84642/src/java/org/apache/cassandra/db/Directories.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ec84642/src/java/org/apache/cassandra/service/AntiEntropyService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ec84642/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ec84642/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ec84642/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------