Merge branch cassandra-3.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/0781bccc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0781bccc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0781bccc Branch: refs/heads/trunk Commit: 0781bccc92ad0204425c9515564bdacee0942439 Parents: 7fcf14f 6688911 Author: blerer <benjamin.le...@datastax.com> Authored: Thu Nov 12 21:14:45 2015 +0100 Committer: blerer <benjamin.le...@datastax.com> Committed: Thu Nov 12 21:14:59 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/0781bccc/CHANGES.txt ----------------------------------------------------------------------
