Merge branch 'cassandra-3.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/4ca7a8cf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ca7a8cf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ca7a8cf Branch: refs/heads/trunk Commit: 4ca7a8cfdc5f56dd072baf63917785f36212ed89 Parents: 4f5845e fca24e1 Author: Benjamin Lerer <[email protected]> Authored: Thu Dec 3 21:39:24 2015 +0100 Committer: Benjamin Lerer <[email protected]> Committed: Thu Dec 3 21:39:34 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/stress/settings/SettingsCommandUser.java | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ca7a8cf/CHANGES.txt ----------------------------------------------------------------------
