Merge branch 'cassandra-3.0' into trunk
* cassandra-3.0:
Establish consistent distinction between non-existing partition and NULL
value for LWTs on static columns
If CF has no clustering columns, any row cache is full partition cache
(CASSANDRA-12499)
Project:
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/beaa2b1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/beaa2b1b
Diff:
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/d4d71cd3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4d71cd3
Diff:
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/44838920
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44838920
Diff:
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/94ca7695
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94ca7695
Diff:
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/a0e8de99
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0e8de99
Diff:
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/ccacf7d1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccacf7d1
Diff:
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/f5b2660b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5b2660b
Diff:
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/72cb851e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72cb851e
Diff:
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/93f77c74
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93f77c74
Diff:
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/b3a8486d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3a8486d
Diff:
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/7e473771
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7e473771
Diff:
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/7139f959
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7139f959
Diff:
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/d5f1175f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5f1175f
Diff:
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/9bfe6135
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bfe6135
Diff:
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:
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/3f79c5ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f79c5ba
Diff:
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/f7666d5f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7666d5f
Diff:
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/735bd65d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/735bd65d
Diff:
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/8f189d11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f189d11
Diff:
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/85c52bb7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85c52bb7
Diff:
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/fca83d81
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fca83d81
Diff:
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/82189ee3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82189ee3
Diff:
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/1b876bc6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b876bc6
Diff:
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/fb33f383
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb33f383
Diff:
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/30d5b654
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30d5b654
Diff:
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/5995de3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5995de3b
Diff:
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/15f17adf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15f17adf
Diff:
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/a252e3f7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a252e3f7
Diff:
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/f7a19b3e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7a19b3e
Diff:
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/e017d89a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e017d89a
Diff:
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/fcdc4e1d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcdc4e1d
Diff:
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/5dd2247d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5dd2247d
Diff:
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/09c94a66
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09c94a66
Diff:
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/6ef817a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ef817a5
Diff:
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/0e3da95d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e3da95d
Diff:
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/1cb9a02b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1cb9a02b
Diff:
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/42f7611d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42f7611d
Diff:
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/e5c4e5e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5c4e5e6
Diff:
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/bcd921c3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcd921c3
Diff:
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/fa070551
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa070551
Diff:
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/e0dce5f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0dce5f8
Diff:
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/a29778a4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a29778a4
Diff:
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/f1e45028
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1e45028
Diff:
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/092281fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/092281fe
Diff:
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/e44e21ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e44e21ce
Diff:
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/21b134c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21b134c2
Diff:
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/e75ebc4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e75ebc4f
Diff:
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/1ecb7a4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ecb7a4f
Diff:
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/1944e402
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1944e402
Diff:
Merge branch 'cassandra-3.0' into trunk
Conflicts:
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e66e97c
Tree:
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/a3c2d142
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3c2d142
Diff:
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/55b6e8a0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55b6e8a0
Diff:
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/9068a31f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9068a31f
Diff:
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/79628dd7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79628dd7
Diff:
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/c2ee6bac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2ee6bac
Diff:
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/2dbf029f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2dbf029f
Diff:
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/676054a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/676054a5
Diff:
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/a1f331f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1f331f1
Diff:
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/f03783be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f03783be
Diff:
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/b6d5f2cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6d5f2cf
Diff:
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/8902074a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8902074a
Diff:
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/288f2cf4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/288f2cf4
Diff:
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/ed9343ed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed9343ed
Diff:
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/4f51341b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f51341b
Diff:
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/f207869e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f207869e
Diff:
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/de49ed84
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de49ed84
Diff:
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/7d2a96ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d2a96ef
Diff:
68 matches
Mail list logo