merge from 1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3b6e4a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3b6e4a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3b6e4a4 Branch: refs/heads/cassandra-1.1.0 Commit: b3b6e4a45ebb80d629f7d722f6efd09a78197286 Parents: 2462c6a 67e88da Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Apr 2 16:38:52 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Apr 2 16:38:52 2012 -0500 ---------------------------------------------------------------------- interface/cassandra.thrift | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3b6e4a4/interface/cassandra.thrift ---------------------------------------------------------------------- diff --cc interface/cassandra.thrift index 17245c7,f0332f6..ecb04d6 --- a/interface/cassandra.thrift +++ b/interface/cassandra.thrift @@@ -46,7 -46,16 +46,16 @@@ namespace rb CassandraThrif # for every edit that doesn't result in a change to major/minor. # # See the Semantic Versioning Specification (SemVer) http://semver.org. + # + # Note that this backwards compatibility is from the perspective of the server, + # not the client. Cassandra should always be able to talk to older client + # software, but client software may not be able to talk to older Cassandra + # instances. + # + # An effort should be made not to break forward-client-compatibility either + # (e.g. one should avoid removing obsolete fields from the IDL), but no + # guarantees in this respect are made by the Cassandra project. -const string VERSION = "19.20.0" +const string VERSION = "19.29.0" #