Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fca24e1f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fca24e1f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fca24e1f Branch: refs/heads/trunk Commit: fca24e1fc0d707adeb77471aa349ab9491ea0e97 Parents: b815c78 4b01e8f Author: Benjamin Lerer <[email protected]> Authored: Thu Dec 3 21:37:38 2015 +0100 Committer: Benjamin Lerer <[email protected]> Committed: Thu Dec 3 21:37:47 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/fca24e1f/CHANGES.txt ----------------------------------------------------------------------
