Merge branch 'feature/jasobrown/transparent-data-encryption' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9acf5880 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9acf5880 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9acf5880 Branch: refs/heads/trunk Commit: 9acf58801382cf1d3b4223c6191d729b58440564 Parents: a37f8be 47341eb Author: Jason Brown <[email protected]> Authored: Mon Aug 3 18:39:28 2015 -0700 Committer: Jason Brown <[email protected]> Committed: Mon Aug 3 18:39:28 2015 -0700 ---------------------------------------------------------------------- ----------------------------------------------------------------------
