You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/11/06 21:32:38 UTC

[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

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

Branch: refs/heads/trunk
Commit: a67980e8ee8a6bc72bb78044ee2a1b20a3121a2a
Parents: b4cbb28 ffe69c3
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Nov 6 14:32:23 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Nov 6 14:32:23 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                              |  2 ++
 .../org/apache/cassandra/locator/PropertyFileSnitch.java | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


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