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/a43e43f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a43e43f0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a43e43f0 Branch: refs/heads/trunk Commit: a43e43f0ee7817222f6e3726c404560cb7dd9e83 Parents: 5f663f5 5ed41ea Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Tue Apr 21 11:20:04 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Tue Apr 21 11:20:04 2015 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/AlterTypeStatement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------