Merge branch cassandra-3.0 into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6688911f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6688911f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6688911f Branch: refs/heads/cassandra-3.1 Commit: 6688911f4a484ac2472fa3179f10358905cb9af8 Parents: e11bd0f 464f8f0 Author: blerer <benjamin.le...@datastax.com> Authored: Thu Nov 12 21:13:12 2015 +0100 Committer: blerer <benjamin.le...@datastax.com> Committed: Thu Nov 12 21:13:29 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/marshal/SimpleDateType.java | 2 +- .../cql3/validation/operations/AlterTest.java | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6688911f/CHANGES.txt ----------------------------------------------------------------------
