Updated Branches: refs/heads/cassandra-1.1 ca02176fc -> 3e27a320b refs/heads/cassandra-1.2 158376963 -> aa8828a27 refs/heads/cassandra-1.2.0 1bb78b0c4 -> 347461375 refs/heads/trunk d173ab51a -> 803bbeb0d
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/803bbeb0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/803bbeb0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/803bbeb0 Branch: refs/heads/trunk Commit: 803bbeb0d7ef26bd7d5013b8e4ec00bc4c85d185 Parents: d173ab5 aa8828a Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Dec 13 10:53:10 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Dec 13 10:53:10 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 4 +++- src/java/org/apache/cassandra/db/DefsTable.java | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/803bbeb0/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/803bbeb0/src/java/org/apache/cassandra/db/DefsTable.java ----------------------------------------------------------------------
