Updated Branches:
  refs/heads/trunk 4dc18a215 -> 17f64320d

merge from 1.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17f64320
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17f64320
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17f64320

Branch: refs/heads/trunk
Commit: 17f64320d8ea0e4442dd586c14f9fa6b517b6700
Parents: 4dc18a2 112ce0c
Author: Pavel Yaskevich <[email protected]>
Authored: Tue Jun 26 00:36:22 2012 +0300
Committer: Pavel Yaskevich <[email protected]>
Committed: Tue Jun 26 00:36:22 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../org/apache/cassandra/config/KSMetaData.java    |    5 +-
 .../apache/cassandra/config/KSMetaDataTest.java    |   50 +++++++++++++++
 3 files changed, 55 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/17f64320/src/java/org/apache/cassandra/config/KSMetaData.java
----------------------------------------------------------------------

Reply via email to