cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [10/10] git commit: Merge branch 'cassandra-2.1' into trunk
Date Mon, 17 Mar 2014 17:12:18 GMT
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 <brandonwilliams@apache.org>
Authored: Mon Mar 17 12:08:24 2014 -0500
Committer: Brandon Williams <brandonwilliams@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
----------------------------------------------------------------------


Mime
View raw message