Updated Branches: refs/heads/cassandra-1.1 36b183f80 -> ca02176fc refs/heads/cassandra-1.2 df580d426 -> 2d3ee8000 refs/heads/cassandra-1.2.0 d791e0b3f -> fc5a0cc29 refs/heads/trunk 647ef5aeb -> f7359466a
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/f7359466 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7359466 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7359466 Branch: refs/heads/trunk Commit: f7359466a10281fb193287601dc9fc48399c4e81 Parents: 647ef5a 2d3ee80 Author: Jonathan Ellis <[email protected]> Authored: Tue Dec 11 12:38:19 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Tue Dec 11 12:38:19 2012 -0600 ---------------------------------------------------------------------- build.xml | 2 +- conf/cassandra.yaml | 15 +++++++++------ debian/changelog | 6 ++++++ src/java/org/apache/cassandra/db/SystemTable.java | 1 - 4 files changed, 16 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7359466/conf/cassandra.yaml ----------------------------------------------------------------------
