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/baa2b692 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/baa2b692 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/baa2b692 Branch: refs/heads/trunk Commit: baa2b692db781c46170b707cdc5cafd033ac42b0 Parents: 572d328 5310f26 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat Mar 8 22:23:41 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat Mar 8 22:23:41 2014 -0500 ---------------------------------------------------------------------- NEWS.txt | 19 +++++++++++++++++++ debian/changelog | 6 ++++++ .../org/apache/cassandra/tools/NodeProbe.java | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/baa2b692/NEWS.txt ----------------------------------------------------------------------
