[4/6] git commit: merge from 1.2

2014-02-28 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b80b97d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b80b97d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b80b97d

[4/6] git commit: merge from 1.2

2013-12-27 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a211f48 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a211f48 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a211f48

[4/6] git commit: merge from 1.2

2013-12-19 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8062cd8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8062cd8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8062cd8

[4/6] git commit: merge from 1.2

2013-12-13 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3796f5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3796f5f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3796f5f

[4/6] git commit: merge from 1.2

2013-12-05 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/667e3db9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/667e3db9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/667e3db9

[4/6] git commit: merge from 1.2

2013-11-26 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/504f66dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/504f66dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/504f66dc

[4/6] git commit: merge from 1.2

2013-11-20 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26d1b68c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26d1b68c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26d1b68c

[4/6] git commit: merge from 1.2

2013-11-16 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7a7edea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7a7edea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7a7edea

[4/6] git commit: merge from 1.2

2013-11-04 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/424fb481 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/424fb481 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/424fb481

[4/6] git commit: merge from 1.2

2013-11-04 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0eb517e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0eb517e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0eb517e

[4/6] git commit: merge from 1.2

2013-10-30 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/392be16b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/392be16b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/392be16b

[4/6] git commit: merge from 1.2

2013-10-17 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/229da372 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/229da372 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/229da372

[4/6] git commit: merge from 1.2

2013-10-15 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1e594bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1e594bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1e594bf

[4/6] git commit: merge from 1.2

2013-10-14 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f557a777 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f557a777 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f557a777

[4/6] git commit: merge from 1.2

2013-10-09 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d0fae099 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0fae099 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0fae099

[4/6] git commit: merge from 1.2

2013-10-08 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21ab8f81 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21ab8f81 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21ab8f81

[4/6] git commit: merge from 1.2

2013-10-06 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9b624a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9b624a7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9b624a7

[4/6] git commit: merge from 1.2

2013-10-04 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27967f95 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27967f95 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27967f95

[4/6] git commit: merge from 1.2

2013-10-03 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff7d341e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff7d341e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff7d341e

[4/6] git commit: merge from 1.2

2013-10-03 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef69bd53 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef69bd53 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef69bd53

[4/6] git commit: merge from 1.2

2013-10-02 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02d5ef3e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02d5ef3e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02d5ef3e

[4/6] git commit: merge from 1.2

2013-09-23 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52b4fc39 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52b4fc39 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52b4fc39

[4/6] git commit: merge from 1.2

2013-09-17 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83b0b2fb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83b0b2fb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83b0b2fb

[4/6] git commit: merge from 1.2

2013-09-17 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e0d9513 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e0d9513 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e0d9513

[4/6] git commit: merge from 1.2

2013-09-12 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7881170 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7881170 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7881170

[4/6] git commit: merge from 1.2

2013-09-01 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27df1bdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27df1bdd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27df1bdd

[4/6] git commit: merge from 1.2

2013-08-28 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d4b51d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d4b51d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d4b51d5

[4/6] git commit: merge from 1.2

2013-08-27 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2383430d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2383430d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2383430d