[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2017-01-05 Thread dikang
Merge branch 'cassandra-3.X' into trunk * cassandra-3.X: Use new token allocation for non bootstrap case as well. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d384e781 Tree: http://git-wip-us.apache.org/repos/asf

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2017-01-03 Thread jasobrown
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b137bd97 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b137bd97 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-27 Thread dikang
Merge branch 'cassandra-3.X' into trunk * cassandra-3.X: More fixes to the TokenAllocation Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88b7126a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88b7126

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-23 Thread paulo
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55fe548f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55fe548f Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-22 Thread dbrosius
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da414762 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da414762 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-14 Thread jmckenzie
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dad5b96e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dad5b96e Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-13 Thread snazy
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d596a47c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d596a47c Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-12 Thread jasobrown
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a92ca615 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a92ca615 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-12 Thread jasobrown
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5364310b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5364310b Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-12 Thread jasobrown
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c0fa054 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c0fa054 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-09 Thread dikang
Merge branch 'cassandra-3.X' into trunk * cassandra-3.X: add method to get size of endpoints to TokenMetadata Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8049ae1 Tree: http://git-wip-us.apache.org/repos/asf/cas

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-07 Thread aleksey
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a6ad9e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a6ad9e6 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-07 Thread aleksey
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96ff08c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96ff08c1 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-06 Thread dikang
Merge branch 'cassandra-3.X' into trunk * cassandra-3.X: Expose time spent waiting in thread pool queue Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ea0579d Tree: http://git-wip-us.apache.org/repos/asf/cassandra

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-05 Thread samt
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc70e490 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc70e490 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-04 Thread jjirsa
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce631bdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce631bdd Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-02 Thread dikang
Merge branch 'cassandra-3.X' into trunk * cassandra-3.X: NoReplicationTokenAllocator should support zero replication factor Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04687c3a Tree: http://git-wip-us.apache.org

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-29 Thread jasobrown
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6622f873 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6622f873 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-28 Thread jasobrown
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b93e96a9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b93e96a9 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-28 Thread jasobrown
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8fb01dd2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fb01dd2 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-27 Thread stefania
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f8d9076 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f8d9076 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-16 Thread samt
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b9a8061 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b9a8061 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-14 Thread dikang
Merge branch 'cassandra-3.X' into trunk * cassandra-3.X: Add the range limit for the split ratio in PartitionerTestCase. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/394a4745 Tree: http://git-wip-us.apache.org/re

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-14 Thread slebresne
Merge branch 'cassandra-3.X' into trunk * cassandra-3.X: example/triggers build fail. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65098d00 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65098d00 Dif

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-13 Thread stefania
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16490a48 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16490a48 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-07 Thread jake
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/459946ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/459946ae Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-03 Thread stefania
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22a3db06 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22a3db06 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-02 Thread snazy
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8fcedf54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fcedf54 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-31 Thread mshuler
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e84a8f39 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e84a8f39 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-27 Thread samt
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0919ae2c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0919ae2c Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-27 Thread snazy
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93a06b9e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93a06b9e Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-26 Thread samt
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/516bdfcd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/516bdfcd Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-25 Thread aleksey
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d40809d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d40809d Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch cassandra-3.X into trunk

2016-10-25 Thread blerer
Merge branch cassandra-3.X into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c728d2e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c728d2e Diff: http://git-wip-us.apache.org/repos/asf/cassandra

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-24 Thread stefania
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d4fd903 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d4fd903 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-23 Thread stefania
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3c720607 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c720607 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-20 Thread zznate
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42da0eaf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42da0eaf Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-20 Thread stefania
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d340329 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d340329 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-19 Thread carl
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b756cca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b756cca Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-18 Thread jjirsa
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d7918df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d7918df Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-17 Thread stefania
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4705c28 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4705c28 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-17 Thread mshuler
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d478f45d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d478f45d Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-17 Thread mshuler
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e66305de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e66305de Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-14 Thread aleksey
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3a0130d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3a0130d Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-12 Thread stefania
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ab4666c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ab4666c Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-11 Thread aleksey
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/231a9370 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/231a9370 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-10 Thread jake
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be2b8cde Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be2b8cde Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-10 Thread jake
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25a3759f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25a3759f Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-06 Thread stefania
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/324bd718 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/324bd718 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-05 Thread snazy
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/670b99b9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/670b99b9 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-04 Thread stefania
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13a46f07 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13a46f07 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-04 Thread aleksey
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c819cb85 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c819cb85 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-04 Thread snazy
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/353bfdde Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/353bfdde Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-04 Thread snazy
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb227618 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb227618 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-04 Thread snazy
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ddd7b90 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ddd7b90 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-09-30 Thread yukim
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d4478ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d4478ba Diff: http://git-wip-us.apache.org/repos/asf/cassand

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-09-29 Thread slebresne
Merge branch 'cassandra-3.X' into trunk * cassandra-3.X: cdc column addition still breaks schema migration tasks Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c18968b1 Tree: http://git-wip-us.apache.org/repos/asf/