[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-09-04 Thread aleksey
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76508213 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76508213 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-09-03 Thread jasobrown
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c99f37e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c99f37e1 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-28 Thread aleksey
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7932119d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7932119d Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-26 Thread aleksey
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ce04564 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ce04564 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-25 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/11d1edcc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11d1edcc Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-25 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/191cedfd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/191cedfd Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-20 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d494c78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d494c78 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-20 Thread aleksey
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd40a618 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd40a618 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-19 Thread marcuse
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd692ba7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd692ba7 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-19 Thread aleksey
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4ac8d59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4ac8d59 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-18 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5549680e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5549680e Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-15 Thread jake
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54fbb0ab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54fbb0ab Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-14 Thread jake
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1040b520 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1040b520 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-13 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a7235e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a7235e9 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-12 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9b463ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9b463ef Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-12 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3060ccc9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3060ccc9 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-12 Thread jake
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25c335f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25c335f7 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-11 Thread aleksey
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/334969fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/334969fd Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-11 Thread aleksey
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50ee3a70 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50ee3a70 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-11 Thread aleksey
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1fee6152 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fee6152 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-10 Thread aleksey
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7c994e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7c994e2 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-07 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c2bbefa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c2bbefa Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-07 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/tools/SSTableExport.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddda5414 Tree: http://git-wip-us.apache.org/r

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-06 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9394f0d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9394f0d9 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-05 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6602f76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6602f76 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-04 Thread aleksey
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/077d3ce7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/077d3ce7 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-02 Thread dbrosius
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d06dd10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d06dd10 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-01 Thread jake
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f0413be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f0413be Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-31 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93942bad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93942bad Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-30 Thread marcuse
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63407db7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63407db7 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-30 Thread marcuse
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3da7d9e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3da7d9e2 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-30 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d6b7326 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d6b7326 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-29 Thread aleksey
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db962390 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db962390 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-24 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee180495 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee180495 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-22 Thread tylerhobbs
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0b88878 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0b88878 Diff: http

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-09 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89842578 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89842578 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-08 Thread aleksey
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04944f0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04944f0c Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-07 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59a8504c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59a8504c Diff: http

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-03 Thread marcuse
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0bfdebc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0bfdebc Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-01 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27747583 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27747583 Diff: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-06-30 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d677e790 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d677e790 Diff: http://git-wip-us.apache.org/repos/a