Merge commit '849a438690aa97a361227781108cc90355dcbcd9' 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/78a3d2bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78a3d2bb
Diff: http://git-
http://git-wip-us.apache.org/repos/asf/cassandra/blob/849a4386/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
--
diff --git
a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
b/
Fix commit log replay after out-of-order flush completion.
Patch by Benedict Elliott Smith; reviewed by Branimir Lambov for
CASSANDRA-9669
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/849a4386
Tree: http://git-wip-
Fix commit log replay after out-of-order flush completion.
Patch by Benedict Elliott Smith; reviewed by Branimir Lambov for
CASSANDRA-9669
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/849a4386
Tree: http://git-wip-
http://git-wip-us.apache.org/repos/asf/cassandra/blob/78a3d2bb/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-CompressionInfo.db
--
diff --cc
test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-b
http://git-wip-us.apache.org/repos/asf/cassandra/blob/849a4386/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
--
diff --git
a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
b/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/78a3d2bb/src/java/org/apache/cassandra/db/lifecycle/View.java
--
diff --cc src/java/org/apache/cassandra/db/lifecycle/View.java
index b62c7e3,fba1627..17062b4
--- a/src/java/org
Merge commit '78a3d2bba95b9efcda152a157f822f4970f22636' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9ac0506
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9ac0506
Diff: http://git-
Merge commit '849a438690aa97a361227781108cc90355dcbcd9' 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/78a3d2bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78a3d2bb
Diff: http://git-
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd39d73a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd39d73a
Diff: http://git-wip-us.apache.org/repos/asf/cassand
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac62a603
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac62a603
Diff: http://git-wip-us.apache.org/repos/asf
Pass the proper Op.Order when index partitions
patch by slebresne; reviewed by Stefania for CASSANDRA-11905
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8540415a
Tree: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac62a603
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac62a603
Diff: http://git-wip-us.apache.org/repos/asf
ns
patch by slebresne; reviewed by Stefania for CASSANDRA-11905
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8540415a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8540415a
Diff: http://git-wip-us.apache.o
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78d303db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78d303db
Diff: http://git-wip-us.apache.org/repos/asf/cassand
Pass the proper Op.Order when index partitions
patch by slebresne; reviewed by Stefania for CASSANDRA-11905
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6837452e
Tree: http://git-wip-us.apache.org/repos/asf
Pass the proper Op.Order when index partitions
patch by slebresne; reviewed by Stefania for CASSANDRA-11905
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8540415a
Tree: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 96b7603d9 -> 31be903a7
Fix JSON update with prepared statements
patch by slebresne; reviewed by thobbs for CASSANDRA-10631
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.
Merge commit '31be903a74864e58980e0e22fd993a280c9138b3' 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/b5fef752
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5fef752
Diff: http://git-
Fix JSON update with prepared statements (patch for 3.0)
patch by slebresne; reviewed by thobbs for CASSANDRA-10631
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cbd7762
Tree: http://git-wip-us.apache.org/repos
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 71bca7800 -> 2cbd77625
Fix JSON update with prepared statements
patch by slebresne; reviewed by thobbs for CASSANDRA-10631
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.
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/5fd65f3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fd65f3b
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 c2ea8c4fc -> 5fd65f3b7
Fix JSON update with prepared statements
patch by slebresne; reviewed by thobbs for CASSANDRA-10631
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.
Merge commit '31be903a74864e58980e0e22fd993a280c9138b3' 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/b5fef752
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5fef752
Diff: http://git-
Merge commit '31be903a74864e58980e0e22fd993a280c9138b3' 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/b5fef752
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5fef752
Diff: http://git-
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/5fd65f3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fd65f3b
Diff: http://git-wip-us.apache.org/repos/asf
Fix JSON update with prepared statements (patch for 3.0)
patch by slebresne; reviewed by thobbs for CASSANDRA-10631
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cbd7762
Tree: http://git-wip-us.apache.org/repos
Fix JSON update with prepared statements (patch for 3.0)
patch by slebresne; reviewed by thobbs for CASSANDRA-10631
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cbd7762
Tree: http://git-wip-us.apache.org/repos
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/24f842a0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24f842a0
Diff: http://git-wip-us.apache.org/repos/asf/cassand
Repository: cassandra
Updated Branches:
refs/heads/trunk 10eda8b57 -> 24f842a07
Fix JSON update with prepared statements
patch by slebresne; reviewed by thobbs for CASSANDRA-10631
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 3d99418cf -> cdf0485b2
Refuse counters as map keys
patch by michaeledge; reviewed by slebresne for CASSANDRA-10760
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 31be903a7 -> 8bfdd65c0
Refuse counters as map keys
patch by michaeledge; reviewed by slebresne for CASSANDRA-10760
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bfdd65c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bfdd65c
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
is merge is necessary,
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64a3bfd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64a3bfd2
Diff: http://git-wip
Merge branch 'cassandra-2.2' into cassandra-3.0
is merge is necessary,
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64a3bfd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64a3bfd2
Diff: http://git-wip
Merge branch 'cassandra-2.2' into cassandra-3.0
is merge is necessary,
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64a3bfd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64a3bfd2
Diff: http://git-wip
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bfdd65c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bfdd65c
Diff: http://git-wip-us.apache.org/repos/asf
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/811ffa7b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/811ffa7b
Diff: http://git-wip-us.apache.org/repos/asf/cassand
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 5fd65f3b7 -> b7ead2b33
Refuse counters as map keys
patch by michaeledge; reviewed by slebresne for CASSANDRA-10760
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/
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/b7ead2b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7ead2b3
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bfdd65c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bfdd65c
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 2cbd77625 -> 64a3bfd29
Refuse counters as map keys
patch by michaeledge; reviewed by slebresne for CASSANDRA-10760
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bfdd65c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bfdd65c
Diff: http://git-wip-us.apache.org/repos/asf
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/b7ead2b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7ead2b3
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/trunk 24f842a07 -> 811ffa7bf
Refuse counters as map keys
patch by michaeledge; reviewed by slebresne for CASSANDRA-10760
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassan
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 cdf0485b2 -> b5b9f7106
Force encoding charset when computed prepared statement IDs
patch by Stefan Podkowinski; reviewed by slebresne for CASSANDRA-10755
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Com
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4f3dbac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4f3dbac
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 8bfdd65c0 -> e4f3dbac0
Force encoding charset when computed prepared statement IDs
patch by Stefan Podkowinski; reviewed by slebresne for CASSANDRA-10755
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Com
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4f3dbac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4f3dbac
Diff: http://git-wip-us.apache.org/repos/asf
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/f4dab0f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4dab0f9
Diff: http://git-wip-us.apache.org/repos/asf
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/f4dab0f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4dab0f9
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4f3dbac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4f3dbac
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 b7ead2b33 -> 0e5aa51d1
Force encoding charset when computed prepared statement IDs
patch by Stefan Podkowinski; reviewed by slebresne for CASSANDRA-10755
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Com
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 64a3bfd29 -> f4dab0f9b
Force encoding charset when computed prepared statement IDs
patch by Stefan Podkowinski; reviewed by slebresne for CASSANDRA-10755
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Com
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/0e5aa51d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e5aa51d
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/trunk fa92ae66d -> 4901af68a
Merge from 3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4901af68
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 44164bc3a -> 4378b58bb
Don't throw assertion error on old key cache keys just skip serializing them.
patch by aweisberg; reviewed by slebresne for CASSANDRA-10778
Project: http://git-wip-us.apache.org/repos/asf/cassan
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/3e531527
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e531527
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 b2b4f1550 -> 3e5315277
Don't throw assertion error on old key cache keys just skip serializing them.
patch by aweisberg; reviewed by slebresne for CASSANDRA-10778
Project: http://git-wip-us.apache.org/repos/asf/cassan
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/3e531527
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e531527
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/trunk 19ff0e412 -> 2cc34dfef
Don't throw assertion error on old key cache keys just skip serializing them.
patch by aweisberg; reviewed by slebresne for CASSANDRA-10778
Project: http://git-wip-us.apache.org/repos/asf/cassandra/rep
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/2cc34dfe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cc34dfe
Diff: http://git-wip-us.apache.org/repos/asf/cassand
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 9784be5e0 -> fffa6d8e6
Remove Index.indexes() method from 2ndary index API
patch by slebresne; reviewed by beobal for CASSANDRA-10690
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 ebb1f8d16 -> b815c781a
Remove Index.indexes() method from 2ndary index API
patch by slebresne; reviewed by beobal for CASSANDRA-10690
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
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/b815c781
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b815c781
Diff: http://git-wip-us.apache.org/repos/asf
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/4f5845eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f5845eb
Diff: http://git-wip-us.apache.org/repos/asf/cassand
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/b815c781
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b815c781
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/trunk 0cb117cd3 -> 4f5845eb5
Remove Index.indexes() method from 2ndary index API
patch by slebresne; reviewed by beobal for CASSANDRA-10690
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 814bc7065 -> 1e978df3a
Fix bug with range tombstone in reverse queries and Partition test coverage
patch by blambov; reviewed by slebresne for CASSANDRA-10059
Project: http://git-wip-us.apache.org/repos/asf/cassandra/r
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/fd5cb43d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd5cb43d
Diff: http://git-wip-us.apache.org/repos/asf
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/fd5cb43d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd5cb43d
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 29c653de6 -> fd5cb43da
Fix bug with range tombstone in reverse queries and Partition test coverage
patch by blambov; reviewed by slebresne for CASSANDRA-10059
Project: http://git-wip-us.apache.org/repos/asf/cassandra/r
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/220f253f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/220f253f
Diff: http://git-wip-us.apache.org/repos/asf/cassand
Repository: cassandra
Updated Branches:
refs/heads/trunk 79f4bdb20 -> 220f253fb
Fix bug with range tombstone in reverse queries and Partition test coverage
patch by blambov; reviewed by slebresne for CASSANDRA-10059
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: h
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 879c49bb7 -> c8493c41e
Explicitly handle SSL handshake errors during connect()
patch by Stefan Podkowinski; reviewed by aweisberg for CASSANDRA-10816
Any IOException before this patch has just been logged to debug and
retried in
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/9ee3a087
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ee3a087
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 587fd9f77 -> 9ee3a0870
Explicitly handle SSL handshake errors during connect()
patch by Stefan Podkowinski; reviewed by aweisberg for CASSANDRA-10816
Any IOException before this patch has just been logged to debug and
retried in
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 f6deca3db -> 9135340a1
Warn if system_traces not available for CASSANDRA-9628
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9135340a
Tree: http://g
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 4f3e47bf9 -> b4d3ac40b
Warn if system_traces not available for CASSANDRA-9628
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9135340a
Tree: http://g
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4d3ac40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4d3ac40
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4d3ac40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4d3ac40
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 a7a03887c -> 37ca86b94
Warn if system_traces not available for CASSANDRA-9628
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9135340a
Tree: http://g
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/37ca86b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37ca86b9
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4d3ac40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4d3ac40
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/trunk 6f5e8358d -> 4d6fdaae9
Warn if system_traces not available for CASSANDRA-9628
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9135340a
Tree: http://git-wip-u
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d6fdaae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d6fdaae
Diff: http://git-wip-us.apache.org/repos/asf/cassand
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/37ca86b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37ca86b9
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 9135340a1 -> 95dab2730
Rename copy.py to copyutil.py in cqlshlib
explanation
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-w
Fix 2 cqlshlib tests
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7dd6b7de
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dd6b7de
Diff
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 b4d3ac40b -> 7dd6b7de2
Rename copy.py to copyutil.py in cqlshlib
explanation
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-w
Merge commit '95dab2730da5a046ffdd550e72c66d1847cf9d8f' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1425f311
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1425f311
Diff: http://git-
Merge commit '95dab2730da5a046ffdd550e72c66d1847cf9d8f' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1425f311
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1425f311
Diff: http://git-
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 37ca86b94 -> b55523e97
Rename copy.py to copyutil.py in cqlshlib
explanation
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-w
Fix 2 cqlshlib tests
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7dd6b7de
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dd6b7de
Diff
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/b55523e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b55523e9
Diff: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/trunk 4d6fdaae9 -> 105ccb3d2
Rename copy.py to copyutil.py in cqlshlib
explanation
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.ap
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/105ccb3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/105ccb3d
Diff: http://git-wip-us.apache.org/repos/asf/cassand
Fix 2 cqlshlib tests
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7dd6b7de
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dd6b7de
Diff
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/b55523e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b55523e9
Diff: http://git-wip-us.apache.org/repos/asf
Merge commit '95dab2730da5a046ffdd550e72c66d1847cf9d8f' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1425f311
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1425f311
Diff: http://git-
501 - 600 of 5538 matches
Mail list logo