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: http://git-wip-us.apache.org/repos/asf/cassandra/commit/327ae124 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/327ae124 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/327ae124 Branch: refs/heads/trunk Commit: 327ae1247ae395c977095a5ba54acf6ec9b92145 Parents: c5f9ac8 7e1e076 Author: Brandon Williams <bran...@datastax.com> Authored: Wed Feb 27 10:38:12 2013 -0600 Committer: Brandon Williams <bran...@datastax.com> Committed: Wed Feb 27 10:38:12 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 18 +++++++++++++++ .../apache/cassandra/cql3/PropertyDefinitions.java | 7 +----- .../apache/cassandra/service/MigrationManager.java | 1 - 4 files changed, 20 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/327ae124/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/327ae124/src/java/org/apache/cassandra/service/MigrationManager.java ----------------------------------------------------------------------
