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

2017-06-15 Thread mshuler
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/5b8ae9f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b8ae9f0 Diff: http://git-wip-us.apache.org/repos/asf

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

2017-02-09 Thread snazy
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/a696ab33 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a696ab33 Diff: http://git-wip-us.apache.org/repos/asf

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

2017-01-11 Thread blerer
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/219f6ee8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/219f6ee8 Diff: http://git-wip-us.apache.org/repos/asf/c

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

2016-10-10 Thread mshuler
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/84552867 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84552867 Diff: http://git-wip-us.apache.org/repos/asf

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

2016-01-15 Thread jake
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/7aa4dc52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7aa4dc52 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-12-03 Thread blerer
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/4b01e8fc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b01e8fc Diff: http://git-wip-us.apache.org/repos/asf

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

2015-12-02 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/d7068fd7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7068fd7 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-12-02 Thread marcuse
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/bb6973a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb6973a6 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-12-02 Thread marcuse
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/ad84add7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad84add7 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-27 Thread snazy
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/56965fd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56965fd6 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-27 Thread snazy
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/b166f5f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b166f5f3 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-27 Thread blerer
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b430eee/src/java/org/apache/cassandra/index/SecondaryIndexManager.java -- diff --cc src/java/org/apache/cassandra/index/SecondaryIndexManager.java index df8e38d,000..ba2c68

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

2015-11-27 Thread snazy
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/e8091d5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8091d5f Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-26 Thread slebresne
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

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

2015-11-25 Thread marcuse
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/71bca780 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71bca780 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-25 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/5fd6c545 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fd6c545 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-23 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/9fe790d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9fe790d7 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-20 Thread slebresne
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/8a0615b4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a0615b4 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-20 Thread marcuse
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/d1c3c674 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1c3c674 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-20 Thread marcuse
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/f4ae3448 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4ae3448 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-19 Thread snazy
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/747e5fd4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/747e5fd4 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-18 Thread marcuse
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/12fd5d27 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12fd5d27 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-18 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/2753f95e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2753f95e Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-17 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/63a9f9b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63a9f9b8 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-17 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/aa21bd29 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa21bd29 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-12 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/9f056a91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f056a91 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-11-09 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/a2043324 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2043324 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-10-21 Thread slebresne
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/c9413211 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9413211 Diff: http://git-wip-us.apache.org/repos/asf