cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 12 Jun 2014 19:12:29 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql/AbstractModification.java
	src/java/org/apache/cassandra/cql/DeleteStatement.java
	src/java/org/apache/cassandra/cql/UpdateStatement.java


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

Branch: refs/heads/trunk
Commit: 34e6bd509aeef555f8dc35ed85dab33484e12465
Parents: 1637498 c94caec
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu Jun 12 14:12:22 2014 -0500
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu Jun 12 14:12:22 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 --
 .../apache/cassandra/cql3/UpdateParameters.java | 19 +++----------
 .../cql3/statements/DeleteStatement.java        |  2 +-
 .../apache/cassandra/db/CounterMutation.java    |  3 --
 .../cassandra/thrift/CassandraServer.java       | 29 ++++++++------------
 5 files changed, 17 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/34e6bd50/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------


Mime
View raw message