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

2015-08-03 Thread jasobrown
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d39d4d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d39d4d5 Diff:

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

2015-08-03 Thread marcuse
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1415d7e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1415d7e9 Diff:

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

2015-07-29 Thread marcuse
Merge branch 'cassandra-2.2' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2015-07-29 Thread yukim
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38ff10d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38ff10d3 Diff:

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

2015-07-24 Thread slebresne
Merge branch 'cassandra-2.2' into trunk Conflicts: src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java src/java/org/apache/cassandra/service/pager/SliceQueryPager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2015-07-23 Thread jmckenzie
Merge branch 'cassandra-2.2' into trunk Conflicts: test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9126687 Tree:

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

2015-07-23 Thread jmckenzie
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1f5c4f7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f5c4f7b Diff:

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

2015-07-22 Thread slebresne
Merge branch 'cassandra-2.2' into trunk Conflicts: src/java/org/apache/cassandra/schema/LegacySchemaTables.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/daa3fe61 Tree:

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

2015-07-21 Thread aleksey
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f94b168a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f94b168a Diff:

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

2015-07-21 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ece5cfc6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ece5cfc6 Diff:

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

2015-07-20 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6686386 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6686386 Diff:

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

2015-07-18 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2eda224d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2eda224d Diff:

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

2015-07-18 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/030762aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/030762aa Diff:

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

2015-07-16 Thread blerer
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b968ba4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b968ba4e Diff:

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

2015-07-16 Thread slebresne
Merge branch 'cassandra-2.2' into trunk Conflicts: test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4feaa7a3 Tree:

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

2015-07-15 Thread slebresne
Merge branch 'cassandra-2.2' into trunk Conflicts: test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a83407f8 Tree:

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

2015-07-12 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7dff1501 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dff1501 Diff:

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

2015-07-09 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c59c1f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c59c1f5 Diff:

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

2015-07-09 Thread tylerhobbs
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/81ba5616 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81ba5616 Diff:

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

2015-07-08 Thread jake
Merge branch 'cassandra-2.2' into trunk 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/2ae41639 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ae41639 Diff:

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

2015-07-07 Thread benedict
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9423109d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9423109d Diff:

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

2015-07-07 Thread tylerhobbs
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6af030a9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6af030a9 Diff:

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

2015-07-07 Thread jake
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db68d1cf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db68d1cf Diff:

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

2015-07-02 Thread yukim
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f3fdf37 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f3fdf37 Diff:

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

2015-07-01 Thread tylerhobbs
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2bdf41c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bdf41c6 Diff:

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

2015-06-30 Thread jake
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f90a36d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f90a36d3 Diff:

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

2015-06-26 Thread marcuse
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60e8d2bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60e8d2bf Diff:

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

2015-06-26 Thread marcuse
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d4b33a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d4b33a5 Diff:

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

2015-06-26 Thread tylerhobbs
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/288ffca7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/288ffca7 Diff:

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

2015-06-26 Thread samt
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00a34c79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00a34c79 Diff:

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

2015-06-25 Thread jasobrown
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7852a3e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7852a3e Diff:

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

2015-06-23 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15b1f9bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15b1f9bc Diff:

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

2015-06-23 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1902653e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1902653e Diff:

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

2015-06-22 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55269db1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55269db1 Diff:

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

2015-06-22 Thread marcuse
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51a9285e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51a9285e Diff:

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

2015-06-18 Thread yukim
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e246ec25 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e246ec25 Diff:

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

2015-06-18 Thread yukim
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e14ce11c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e14ce11c Diff:

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

2015-06-17 Thread benedict
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/075ff500 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/075ff500 Diff:

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

2015-06-16 Thread tylerhobbs
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25dca466 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25dca466 Diff:

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

2015-06-16 Thread yukim
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a8be785 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a8be785 Diff:

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

2015-06-15 Thread samt
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/81858ebc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81858ebc Diff:

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

2015-06-12 Thread jmckenzie
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7476d83b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7476d83b Diff:

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

2015-06-11 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ae5e01c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ae5e01c Diff:

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

2015-06-11 Thread marcuse
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a91d1c96 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a91d1c96 Diff:

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

2015-06-11 Thread yukim
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2c360e60 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c360e60 Diff:

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

2015-06-11 Thread marcuse
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9307546b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9307546b Diff:

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

2015-06-11 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/713b7db2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/713b7db2 Diff:

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

2015-06-11 Thread samt
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/887bbc14 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/887bbc14 Diff:

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

2015-06-05 Thread samt
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0149e342 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0149e342 Diff:

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

2015-06-05 Thread jasobrown
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/255e5f14 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/255e5f14 Diff:

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

2015-06-05 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9d84f5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9d84f5c Diff:

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

2015-06-04 Thread aleksey
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0096182c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0096182c Diff:

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

2015-06-04 Thread tylerhobbs
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13ecf33d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13ecf33d Diff:

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

2015-06-04 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c4a5b3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c4a5b3b Diff:

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

2015-06-04 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94ff7a5e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94ff7a5e Diff:

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

2015-06-04 Thread tylerhobbs
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a14efdf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a14efdf Diff:

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

2015-06-04 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78c03052 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78c03052 Diff:

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

2015-06-04 Thread samt
Merge branch 'cassandra-2.2' into trunk Conflicts: src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2015-05-29 Thread marcuse
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60194456 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60194456 Diff:

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

2015-05-29 Thread jasobrown
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad58bf7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad58bf7c Diff:

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

2015-05-29 Thread tylerhobbs
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d0da2f5e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0da2f5e Diff:

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

2015-05-28 Thread tylerhobbs
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de0dcde6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de0dcde6 Diff:

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

2015-05-27 Thread jbellis
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03f556ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03f556ff Diff:

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

2015-05-26 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5f8806c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5f8806c Diff:

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

2015-05-26 Thread yukim
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13409fdf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13409fdf Diff:

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

2015-05-25 Thread dbrosius
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b23e91f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b23e91f8 Diff:

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

2015-05-22 Thread tylerhobbs
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e36ae521 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e36ae521 Diff:

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

2015-05-22 Thread tylerhobbs
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ed316ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ed316ec Diff:

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

2015-05-22 Thread samt
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d1a50e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d1a50e0 Diff:

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

2015-05-20 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eaf7d81e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eaf7d81e Diff:

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

2015-05-20 Thread samt
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16736314 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16736314 Diff:

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

2015-05-20 Thread samt
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3faa17be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3faa17be Diff:

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

2015-05-20 Thread aleksey
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/418aefdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/418aefdd Diff:

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

2015-05-19 Thread slebresne
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c844bfee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c844bfee Diff:

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

2015-05-19 Thread jake
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77f0d99f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77f0d99f Diff:

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

2015-05-19 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ed3c195 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ed3c195 Diff:

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

2015-05-18 Thread marcuse
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05e033d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05e033d9 Diff:

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

2015-05-17 Thread marcuse
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95469455 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95469455 Diff:

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

2015-05-16 Thread benedict
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1b1cf64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1b1cf64 Diff:

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

2015-05-15 Thread snazy
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce0a25fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce0a25fa Diff: