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/12/07 23:56:13 UTC

[1/16] git commit: Merge branch 'cassandra-1.2' into trunk

Updated Branches:
  refs/heads/cassandra-1.1 c9ce1f011 -> f618369f3
  refs/heads/cassandra-1.2 cf3cde3d9 -> bdf9c2a91
  refs/heads/cassandra-1.2.0 44545d380 -> d599b3fc8
  refs/heads/trunk 40dad0aea -> ff249316b


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/ff249316
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff249316
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff249316

Branch: refs/heads/trunk
Commit: ff249316b7b30c094791aa8cfdc3bdeaaa34371b
Parents: 40dad0a bdf9c2a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Dec 7 16:56:05 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Dec 7 16:56:05 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff249316/CHANGES.txt
----------------------------------------------------------------------