You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/09/04 21:54:55 UTC
[1/6] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/cassandra-1.0 4764a379e -> 08c654601
refs/heads/cassandra-1.1 e1b10590e -> f94c839dc
refs/heads/trunk 6c8687237 -> b2899f088
Merge branch 'cassandra-1.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2899f08
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2899f08
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2899f08
Branch: refs/heads/trunk
Commit: b2899f08893d86af60ebcc2087b5d4edb641fb83
Parents: 6c86872 f94c839
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 4 14:54:40 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 4 14:54:40 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra-env.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2899f08/CHANGES.txt
----------------------------------------------------------------------