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/e9995c9b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9995c9b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9995c9b Branch: refs/heads/trunk Commit: e9995c9b5d67998b1e6db7e725bd20c2ebcadaab Parents: c63ee74 7920ebe Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Nov 7 21:37:08 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Nov 7 21:37:08 2014 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/db/SystemKeyspace.java | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9995c9b/src/java/org/apache/cassandra/db/SystemKeyspace.java ----------------------------------------------------------------------