cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [5/5] git commit: Merge branch 'cassandra-2.0' into trunk
Date Thu, 19 Sep 2013 10:37:29 GMT
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 54f41a9f58414dbb595554ff5b2aa4b98cb7c3ec
Parents: 0cec93c a0abadf
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Sep 19 12:37:17 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Sep 19 12:37:17 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt                                         |  2 ++
 .../org/apache/cassandra/config/CFMetaData.java     | 15 ++++++++++++++-
 .../cassandra/cql3/statements/Restriction.java      | 16 ++++++++++++++++
 .../cassandra/cql3/statements/SelectStatement.java  |  7 ++++++-
 .../org/apache/cassandra/tools/SSTableImport.java   |  7 ++++++-
 5 files changed, 44 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/54f41a9f/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/54f41a9f/src/java/org/apache/cassandra/cql3/statements/Restriction.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/54f41a9f/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------


Mime
View raw message