Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55f2fb70 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55f2fb70 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55f2fb70 Branch: refs/heads/trunk Commit: 55f2fb70efff765b222d33e921bdf35a13b14d27 Parents: bde7615 9b2c467 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Jun 3 14:17:49 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Jun 3 14:17:49 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/SystemKeyspace.java | 32 ++++++++++++-------- 2 files changed, 20 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55f2fb70/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55f2fb70/src/java/org/apache/cassandra/db/SystemKeyspace.java ----------------------------------------------------------------------
