cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/4] git commit: Merge branch 'cassandra-1.1' into trunk
Date Mon, 14 May 2012 23:10:15 GMT
Updated Branches:
  refs/heads/cassandra-1.1 f58a51bc5 -> 68bae3131
  refs/heads/trunk 347b5775e -> 19ce000b2


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/19ce000b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19ce000b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19ce000b

Branch: refs/heads/trunk
Commit: 19ce000b2d0958efc3803e6b365d70f4737e588c
Parents: 347b577 68bae31
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon May 14 18:10:03 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon May 14 18:10:03 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../org/apache/cassandra/config/CFMetaData.java    |   31 ++++++++++----
 .../cql3/statements/DropIndexStatement.java        |   17 +++++---
 .../cassandra/cql3/statements/SelectStatement.java |    7 ++-
 4 files changed, 37 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/19ce000b/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
----------------------------------------------------------------------

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


Mime
View raw message