You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2017/01/11 07:18:09 UTC

[13/14] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 0d813176af2a217c185b33158af57e9d0e08ebef
Parents: 699eff0 1553d86
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Jan 11 08:16:45 2017 +0100
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed Jan 11 08:16:45 2017 +0100

----------------------------------------------------------------------
 build.xml                                                      | 6 +++---
 .../org/apache/cassandra/db/ColumnFamilyStoreCQLHelper.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------