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/63393eb2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63393eb2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63393eb2 Branch: refs/heads/trunk Commit: 63393eb2488d1bb7760f927685f1dfefd6c6558a Parents: 1e7962c a182ea0 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Fri Aug 1 21:39:56 2014 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Fri Aug 1 21:39:56 2014 +0100 ---------------------------------------------------------------------- .../stress/settings/SettingsColumn.java | 31 ++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63393eb2/tools/stress/src/org/apache/cassandra/stress/settings/SettingsColumn.java ---------------------------------------------------------------------- diff --cc tools/stress/src/org/apache/cassandra/stress/settings/SettingsColumn.java index e48b49c,4b4e0b0..ecdef29 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsColumn.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsColumn.java @@@ -41,10 -44,9 +44,10 @@@ public class SettingsColumn implements { public final int maxColumnsPerKey; - public transient final List<ByteBuffer> names; + public transient List<ByteBuffer> names; public final List<String> namestrs; public final String comparator; + public final String timestamp; public final boolean variableColumnCount; public final boolean slice; public final DistributionFactory sizeDistribution;
