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/69cadca3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69cadca3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69cadca3 Branch: refs/heads/trunk Commit: 69cadca33fa86fe9df5fe78c936ff34250d2054a Parents: c3d9280 ceddff5 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Mar 17 12:08:24 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Mar 17 12:08:24 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 7 +++++++ conf/cassandra.yaml | 5 +++-- src/java/org/apache/cassandra/config/EncryptionOptions.java | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/69cadca3/CHANGES.txt ----------------------------------------------------------------------
