Updated Branches: refs/heads/trunk aa187053b -> a9769371b
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/a9769371 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9769371 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9769371 Branch: refs/heads/trunk Commit: a9769371be6c2caed978f8a3ecffd1aec6ed1eac Parents: aa18705 87b786f Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Feb 22 11:40:28 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Feb 22 11:40:28 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 5 ++++- bin/cqlsh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9769371/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a04cbd6,0732d3e..086eb0b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -8,9 -8,10 +8,11 @@@ * Fix bug with counters in super columns (CASSANDRA-3821) Merged from 1.0: * remove the wait on hint future during write (CASSANDRA-3870) + * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933) + * (cqlsh) look for cqlshlib relative to realpath (CASSANDRA-3767) + 1.1-beta1 * add nodetool rebuild_index (CASSANDRA-3583) * add nodetool rangekeysample (CASSANDRA-2917)
