Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 39B1E97D2 for ; Mon, 2 Apr 2012 21:40:06 +0000 (UTC) Received: (qmail 32957 invoked by uid 500); 2 Apr 2012 21:40:05 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 32909 invoked by uid 500); 2 Apr 2012 21:40:04 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 32718 invoked by uid 99); 2 Apr 2012 21:40:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2012 21:40:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 63072A900; Mon, 2 Apr 2012 21:40:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [6/12] git commit: merge from 1.0 Message-Id: <20120402214004.63072A900@tyr.zones.apache.org> Date: Mon, 2 Apr 2012 21:40:04 +0000 (UTC) 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 Commit: b3b6e4a45ebb80d629f7d722f6efd09a78197286 Parents: 2462c6a 67e88da Author: Jonathan Ellis Authored: Mon Apr 2 16:38:52 2012 -0500 Committer: Jonathan Ellis 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" #