[5/7] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

2017-07-14 Thread bdeggleston
Merge branch cassandra-2.2 into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88d2ac4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88d2ac4f Diff:

[5/7] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

2017-07-14 Thread blerer
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2445cfb/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java -- diff --cc src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java index

[5/7] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-08-31 Thread yukim
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b56def49 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b56def49 Diff:

[5/7] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-06-14 Thread carl
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a91219e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a91219e1 Diff:

[5/7] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-02-24 Thread jasobrown
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6239778 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6239778 Diff:

[5/7] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-02-24 Thread jasobrown
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7e0c301 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7e0c301 Diff:

[5/7] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-18 Thread tylerhobbs
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74070ee4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74070ee4 Diff:

[5/7] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-10 Thread aleksey
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e64a9d0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e64a9d0 Diff:

[5/7] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-09-08 Thread benedict
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/CompactionManager.java src/java/org/apache/cassandra/utils/FBUtilities.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[5/7] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-08-21 Thread benedict
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: src/java/org/apache/cassandra/io/util/SequentialWriter.java src/java/org/apache/cassandra/utils/concurrent/Transactional.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: