Merge branch 'cassandra-1.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/98effbf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98effbf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98effbf6 Branch: refs/heads/trunk Commit: 98effbf617bd1790e0ffbf7d4214ce018d7045d0 Parents: 565c576 e4fc1eb Author: Brandon Williams <[email protected]> Authored: Wed Oct 24 16:29:27 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Oct 24 16:29:27 2012 -0500 ---------------------------------------------------------------------- bin/cqlshrc.sample | 35 ----------------------------------- conf/cqlshrc.sample | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-) ----------------------------------------------------------------------
