Merge branch 'cassandra-2.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/18f062cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18f062cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18f062cf

Branch: refs/heads/trunk
Commit: 18f062cf041c65cdb8f8e8626bec9bd4e30541a2
Parents: 5001e98 a224e58
Author: Jake Luciani <j...@apache.org>
Authored: Tue Jun 24 15:36:16 2014 -0400
Committer: Jake Luciani <j...@apache.org>
Committed: Tue Jun 24 15:36:16 2014 -0400

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/cql3/DeleteTest.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to