cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/9] git commit: Merge branch 'cassandra-1.1' into trunk
Date Thu, 19 Apr 2012 20:54:42 GMT
Updated Branches:
  refs/heads/cassandra-1.1 991c2a25b -> 5cd473632
  refs/heads/cassandra-1.1.0 43a472e13 -> 36a9f9bd8
  refs/heads/trunk 9b6156ba7 -> 7b3349f6e


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

Branch: refs/heads/trunk
Commit: 7b3349f6ece013b2c17644ddad6ba87ab2ba5105
Parents: 9b6156b 5cd4736
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Apr 19 15:54:06 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Apr 19 15:54:06 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 ++
 bin/cqlsh                                          |    2 +-
 build.xml                                          |   12 +++++-------
 src/java/org/apache/cassandra/cql3/Cql.g           |    4 +---
 .../cql3/statements/AlterTableStatement.java       |    2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b3349f6/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b3349f6/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------


Mime
View raw message