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/03/14 05:27:48 UTC

[1/9] git commit: merge from 1.1

Updated Branches:
  refs/heads/trunk d8742aa46 -> 845f40733


merge from 1.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/845f4073
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/845f4073
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/845f4073

Branch: refs/heads/trunk
Commit: 845f407332379e59d56b970f93db8aa17b8ca1d6
Parents: b2658fd d025bec
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Mar 13 23:27:25 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Mar 13 23:27:25 2012 -0500

----------------------------------------------------------------------
 NEWS.txt                                           |    4 ++++
 examples/simple_authentication/README.txt          |   11 +++++++++++
 .../org/apache/cassandra/locator/Ec2Snitch.java    |    2 +-
 3 files changed, 16 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/845f4073/src/java/org/apache/cassandra/locator/Ec2Snitch.java
----------------------------------------------------------------------