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/51a6f0f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51a6f0f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51a6f0f7 Branch: refs/heads/trunk Commit: 51a6f0f7facb4eed17d34702f9527ac7fd1aef75 Parents: e775254 530c9f5 Author: Benedict Elliott Smith <[email protected]> Authored: Thu Sep 11 11:28:36 2014 +0700 Committer: Benedict Elliott Smith <[email protected]> Committed: Thu Sep 11 11:28:36 2014 +0700 ---------------------------------------------------------------------- .../org/apache/cassandra/stress/settings/SettingsCommandUser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
