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/2093270c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2093270c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2093270c Branch: refs/heads/trunk Commit: 2093270c7c51700996577fd679f644bcfb17239e Parents: 8d8fed5 3b14f6a Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jul 21 07:51:21 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jul 21 07:51:21 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- build.xml | 2 +- conf/cassandra-env.sh | 4 ++-- debian/changelog | 6 ++++++ 4 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2093270c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2093270c/build.xml ----------------------------------------------------------------------
