[7/7] git commit: Merge branch 'cassandra-1.2' into trunk

2013-05-02 Thread dbrosius
Merge branch 'cassandra-1.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/bcd80487 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcd80487 Diff:

[7/7] git commit: Merge branch 'cassandra-1.2' into trunk

2013-03-25 Thread slebresne
Merge branch 'cassandra-1.2' into trunk Conflicts: NEWS.txt src/java/org/apache/cassandra/db/CollationController.java src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java Project:

[7/7] git commit: Merge branch 'cassandra-1.2' into trunk

2013-03-14 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 3346771a0 - ffc9bece4 refs/heads/cassandra-1.2 f07804e0d - c67e501f1 refs/heads/trunk 585619443 - b06c45a96 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[7/7] git commit: Merge branch 'cassandra-1.2' into trunk

2013-02-27 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 05709f74e - aba9a1774 refs/heads/cassandra-1.2 db7759a2c - 7e1e07676 refs/heads/trunk c5f9ac87f - 327ae1247 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[7/7] git commit: Merge branch 'cassandra-1.2' into trunk

2013-02-27 Thread jbellis
Updated Branches: refs/heads/cassandra-1.2 7e1e07676 - 33ce1e35f refs/heads/trunk 327ae1247 - 73e8cb62f Merge branch 'cassandra-1.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/73e8cb62 Tree:

[7/7] git commit: Merge branch 'cassandra-1.2' into trunk

2013-02-05 Thread jbellis
Updated Branches: refs/heads/cassandra-1.2 75d0f7a3f - 295d6af46 refs/heads/trunk d216b0d28 - 7590b0267 Merge branch 'cassandra-1.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/7590b026 Tree:

[7/7] git commit: Merge branch 'cassandra-1.2' into trunk

2013-01-04 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.2 677e247bb - 9852a9360 refs/heads/trunk acf306227 - d495727d9 Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java Project: