[3/3] Unify migration code

2012-03-18 Thread slebresne
http://git-wip-us.apache.org/repos/asf/cassandra/blob/438acfc8/test/unit/org/apache/cassandra/db/ScrubTest.java -- diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java

[4/4] Unify migration code

2012-03-18 Thread slebresne
http://git-wip-us.apache.org/repos/asf/cassandra/blob/438acfc8/test/unit/org/apache/cassandra/db/ScrubTest.java -- diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java

[1/4] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-18 Thread slebresne
Updated Branches: refs/heads/cassandra-1.1 684919307 - fe980034e Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe980034 Tree:

[1/5] git commit: Merge branch 'cassandra-1.1' into trunk

2012-03-18 Thread slebresne
Updated Branches: refs/heads/trunk 51a658d22 - 15ae2f630 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/db/migration/AddColumnFamily.java src/java/org/apache/cassandra/db/migration/AddKeyspace.java

[2/5] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-18 Thread slebresne
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe980034 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe980034 Diff:

[5/5] Unify migration code

2012-03-18 Thread slebresne
http://git-wip-us.apache.org/repos/asf/cassandra/blob/438acfc8/test/unit/org/apache/cassandra/db/ScrubTest.java -- diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java

[jira] [Resolved] (CASSANDRA-4017) Unify migrations

2012-03-18 Thread Sylvain Lebresne (Resolved) (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-4017?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain Lebresne resolved CASSANDRA-4017. - Resolution: Fixed Committed, thanks Unify migrations

[jira] [Commented] (CASSANDRA-3647) Support arbitrarily nested documents in CQL

2012-03-18 Thread Jonathan Ellis (Commented) (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-3647?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13232351#comment-13232351 ] Jonathan Ellis commented on CASSANDRA-3647: --- Sylvain suggests we start with

[jira] [Updated] (CASSANDRA-3997) Make SerializingCache Memory Pluggable

2012-03-18 Thread Vijay (Updated) (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-3997?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Vijay updated CASSANDRA-3997: - Attachment: 0001-CASSANDRA-3997.patch Attached patch makes the Offheap allocation pluggable and has

[jira] [Updated] (CASSANDRA-3997) Make SerializingCache Memory Pluggable

2012-03-18 Thread Vijay (Updated) (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-3997?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Vijay updated CASSANDRA-3997: - Attachment: 0001-CASSANDRA-3997.patch Make SerializingCache Memory Pluggable

[jira] [Updated] (CASSANDRA-3997) Make SerializingCache Memory Pluggable

2012-03-18 Thread Vijay (Updated) (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-3997?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Vijay updated CASSANDRA-3997: - Attachment: (was: 0001-CASSANDRA-3997.patch) Make SerializingCache Memory Pluggable

[jira] [Updated] (CASSANDRA-3997) Make SerializingCache Memory Pluggable

2012-03-18 Thread Vijay (Updated) (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-3997?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Vijay updated CASSANDRA-3997: - Attachment: (was: 0001-CASSANDRA-3997.patch) Make SerializingCache Memory Pluggable

[jira] [Updated] (CASSANDRA-3997) Make SerializingCache Memory Pluggable

2012-03-18 Thread Vijay (Updated) (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-3997?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Vijay updated CASSANDRA-3997: - Attachment: 0001-CASSANDRA-3997.patch Make SerializingCache Memory Pluggable