You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/05/30 20:00:56 UTC
[1/7] git commit: Licenses and versions in preparation of 2.1rc1
release
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 c2563dbc8 -> e2c74d565
refs/heads/cassandra-2.1 c108ce5bf -> 8436ee616
refs/heads/trunk d4f63aa57 -> e91bf8f3e
Licenses and versions in preparation of 2.1rc1 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c108ce5b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c108ce5b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c108ce5b
Branch: refs/heads/trunk
Commit: c108ce5bf2abc88077c97924def59fa1ea98a66e
Parents: a30dfbd
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri May 30 17:27:53 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri May 30 17:27:53 2014 +0200
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
.../apache/cassandra/concurrent/SEPExecutor.java | 17 +++++++++++++++++
.../org/apache/cassandra/concurrent/SEPWorker.java | 17 +++++++++++++++++
.../apache/cassandra/thrift/MultiSliceTest.java | 17 +++++++++++++++++
5 files changed, 58 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c108ce5b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 5740577..bda7492 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="2.1.0-beta2"/>
+ <property name="base.version" value="2.1.0-rc1"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c108ce5b/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 4f880a6..772c950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.0~rc1) unstable; urgency=medium
+
+ * New RC release
+
+ -- Sylvain Lebresne <sl...@apache.org> Fri, 30 May 2014 17:25:14 +0200
+
cassandra (2.1.0~beta2) unstable; urgency=medium
* New beta release
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c108ce5b/src/java/org/apache/cassandra/concurrent/SEPExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/SEPExecutor.java b/src/java/org/apache/cassandra/concurrent/SEPExecutor.java
index bdc0045..b6f5e97 100644
--- a/src/java/org/apache/cassandra/concurrent/SEPExecutor.java
+++ b/src/java/org/apache/cassandra/concurrent/SEPExecutor.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cassandra.concurrent;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c108ce5b/src/java/org/apache/cassandra/concurrent/SEPWorker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/SEPWorker.java b/src/java/org/apache/cassandra/concurrent/SEPWorker.java
index 084bba7..ef79c74 100644
--- a/src/java/org/apache/cassandra/concurrent/SEPWorker.java
+++ b/src/java/org/apache/cassandra/concurrent/SEPWorker.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cassandra.concurrent;
import java.util.concurrent.TimeUnit;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c108ce5b/test/unit/org/apache/cassandra/thrift/MultiSliceTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/thrift/MultiSliceTest.java b/test/unit/org/apache/cassandra/thrift/MultiSliceTest.java
index 9193258..50e409e 100644
--- a/test/unit/org/apache/cassandra/thrift/MultiSliceTest.java
+++ b/test/unit/org/apache/cassandra/thrift/MultiSliceTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cassandra.thrift;
import java.io.IOException;
[2/7] git commit: cqlsh: Count only empty lines for a "Blank lines"
warning.
Posted by mi...@apache.org.
cqlsh: Count only empty lines for a "Blank lines" warning.
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7325
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e2c74d56
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2c74d56
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e2c74d56
Branch: refs/heads/cassandra-2.0
Commit: e2c74d56551575c553927a9c0f31fe07f2614894
Parents: c2563db
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri May 23 00:15:30 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri May 30 10:52:20 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2c74d56/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 75e6759..c3145eb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
* Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
* Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
* Add authentication support to shuffle (CASSANDRA-6484)
+ * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
Merged from 1.2:
* Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2c74d56/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 75c4299..0b8327d 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -726,7 +726,7 @@ class Shell(cmd.Cmd):
else:
spaces = ' ' * len(str(self.current_keyspace))
self.set_prompt(self.keyspace_continue_prompt % spaces)
- self.empty_lines += 1
+ self.empty_lines = self.empty_lines + 1 if not self.lastcmd else 0
@contextmanager
def prepare_loop(self):
@@ -752,9 +752,11 @@ class Shell(cmd.Cmd):
def get_input_line(self, prompt=''):
if self.tty:
- line = raw_input(prompt) + '\n'
+ self.lastcmd = raw_input(prompt)
+ line = self.lastcmd + '\n'
else:
- line = self.stdin.readline()
+ self.lastcmd = self.stdin.readline()
+ line = self.lastcmd
if not len(line):
raise EOFError
self.lineno += 1
[6/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by mi...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8436ee61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8436ee61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8436ee61
Branch: refs/heads/cassandra-2.1
Commit: 8436ee6166d78b6bfd604d35e7cebc066aeaff24
Parents: c108ce5 e2c74d5
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri May 30 11:00:05 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri May 30 11:00:05 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8436ee61/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7603f88,c3145eb..139c41c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -80,11 -46,11 +80,12 @@@ Merged from 2.0
* Fix 2ndary index queries with DESC clustering order (CASSANDRA-6950)
* Invalid key cache entries on DROP (CASSANDRA-6525)
* Fix flapping RecoveryManagerTest (CASSANDRA-7084)
+ * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
+ * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
+ * Add authentication support to shuffle (CASSANDRA-6484)
+ * Swap local and global default read repair chances (CASSANDRA-7320)
+ * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
++ * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8436ee61/bin/cqlsh
----------------------------------------------------------------------
[5/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by mi...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8436ee61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8436ee61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8436ee61
Branch: refs/heads/trunk
Commit: 8436ee6166d78b6bfd604d35e7cebc066aeaff24
Parents: c108ce5 e2c74d5
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri May 30 11:00:05 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri May 30 11:00:05 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8436ee61/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7603f88,c3145eb..139c41c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -80,11 -46,11 +80,12 @@@ Merged from 2.0
* Fix 2ndary index queries with DESC clustering order (CASSANDRA-6950)
* Invalid key cache entries on DROP (CASSANDRA-6525)
* Fix flapping RecoveryManagerTest (CASSANDRA-7084)
+ * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
+ * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
+ * Add authentication support to shuffle (CASSANDRA-6484)
+ * Swap local and global default read repair chances (CASSANDRA-7320)
+ * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
++ * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8436ee61/bin/cqlsh
----------------------------------------------------------------------
[4/7] git commit: cqlsh: Count only empty lines for a "Blank lines"
warning.
Posted by mi...@apache.org.
cqlsh: Count only empty lines for a "Blank lines" warning.
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7325
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e2c74d56
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2c74d56
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e2c74d56
Branch: refs/heads/cassandra-2.1
Commit: e2c74d56551575c553927a9c0f31fe07f2614894
Parents: c2563db
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri May 23 00:15:30 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri May 30 10:52:20 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2c74d56/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 75e6759..c3145eb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
* Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
* Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
* Add authentication support to shuffle (CASSANDRA-6484)
+ * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
Merged from 1.2:
* Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2c74d56/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 75c4299..0b8327d 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -726,7 +726,7 @@ class Shell(cmd.Cmd):
else:
spaces = ' ' * len(str(self.current_keyspace))
self.set_prompt(self.keyspace_continue_prompt % spaces)
- self.empty_lines += 1
+ self.empty_lines = self.empty_lines + 1 if not self.lastcmd else 0
@contextmanager
def prepare_loop(self):
@@ -752,9 +752,11 @@ class Shell(cmd.Cmd):
def get_input_line(self, prompt=''):
if self.tty:
- line = raw_input(prompt) + '\n'
+ self.lastcmd = raw_input(prompt)
+ line = self.lastcmd + '\n'
else:
- line = self.stdin.readline()
+ self.lastcmd = self.stdin.readline()
+ line = self.lastcmd
if not len(line):
raise EOFError
self.lineno += 1
[7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by mi...@apache.org.
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/e91bf8f3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e91bf8f3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e91bf8f3
Branch: refs/heads/trunk
Commit: e91bf8f3ea89d44fdf377a6eff146c745be28f83
Parents: d4f63aa 8436ee6
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri May 30 11:00:14 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri May 30 11:00:14 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 8 +++++---
build.xml | 2 +-
debian/changelog | 6 ++++++
.../apache/cassandra/concurrent/SEPExecutor.java | 17 +++++++++++++++++
.../org/apache/cassandra/concurrent/SEPWorker.java | 17 +++++++++++++++++
.../apache/cassandra/thrift/MultiSliceTest.java | 17 +++++++++++++++++
7 files changed, 64 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e91bf8f3/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e91bf8f3/build.xml
----------------------------------------------------------------------
[3/7] git commit: cqlsh: Count only empty lines for a "Blank lines"
warning.
Posted by mi...@apache.org.
cqlsh: Count only empty lines for a "Blank lines" warning.
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7325
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e2c74d56
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2c74d56
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e2c74d56
Branch: refs/heads/trunk
Commit: e2c74d56551575c553927a9c0f31fe07f2614894
Parents: c2563db
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri May 23 00:15:30 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri May 30 10:52:20 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2c74d56/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 75e6759..c3145eb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
* Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
* Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
* Add authentication support to shuffle (CASSANDRA-6484)
+ * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
Merged from 1.2:
* Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2c74d56/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 75c4299..0b8327d 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -726,7 +726,7 @@ class Shell(cmd.Cmd):
else:
spaces = ' ' * len(str(self.current_keyspace))
self.set_prompt(self.keyspace_continue_prompt % spaces)
- self.empty_lines += 1
+ self.empty_lines = self.empty_lines + 1 if not self.lastcmd else 0
@contextmanager
def prepare_loop(self):
@@ -752,9 +752,11 @@ class Shell(cmd.Cmd):
def get_input_line(self, prompt=''):
if self.tty:
- line = raw_input(prompt) + '\n'
+ self.lastcmd = raw_input(prompt)
+ line = self.lastcmd + '\n'
else:
- line = self.stdin.readline()
+ self.lastcmd = self.stdin.readline()
+ line = self.lastcmd
if not len(line):
raise EOFError
self.lineno += 1