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/17af71ee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17af71ee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17af71ee Branch: refs/heads/trunk Commit: 17af71ee31c084a470dead4144a1cfc73dc3bd0a Parents: 67feb71 f49df8c Author: Mikhail Stepura <[email protected]> Authored: Thu Mar 13 14:33:46 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Thu Mar 13 14:33:46 2014 -0700 ---------------------------------------------------------------------- bin/cqlsh | 3 ++- pylib/cqlshlib/test/test_cqlsh_output.py | 3 +-- src/java/org/apache/cassandra/transport/Server.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
