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/06/19 06:17:15 UTC
[01/10] git commit: cqlsh: ignore .cassandra permission errors
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 6131273ac -> b25ddd8a7
refs/heads/cassandra-2.0 87282f1ad -> dd8722807
refs/heads/cassandra-2.1 03f76a9cc -> c4e09469d
refs/heads/trunk ee749e253 -> 640c9d4a3
cqlsh: ignore .cassandra permission errors
patch by Mihai Suteu; reviewed by Mikhail Stepura for CASSANDRA-7266
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b25ddd8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b25ddd8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b25ddd8a
Branch: refs/heads/cassandra-1.2
Commit: b25ddd8a7f470fbe2e34f6a16549c03e093ea1f9
Parents: 6131273
Author: Mihai Suteu <mi...@intheforest.co.jp>
Authored: Thu Jun 19 15:14:54 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Jun 19 15:14:54 2014 +1100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25ddd8a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a645516..8da8258 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.17
+ * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
* Errors in FlushRunnable may leave threads hung (CASSANDRA-7275)
* reduce failure detector initial value to 2s (CASSANDRA-7307)
* Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25ddd8a/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 24cb3b8..cec9aac 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -122,7 +122,10 @@ HISTORY_DIR = os.path.expanduser(os.path.join('~', '.cassandra'))
CONFIG_FILE = os.path.join(HISTORY_DIR, 'cqlshrc')
HISTORY = os.path.join(HISTORY_DIR, 'cqlsh_history')
if not os.path.exists(HISTORY_DIR):
- os.mkdir(HISTORY_DIR)
+ try:
+ os.mkdir(HISTORY_DIR)
+ except OSError:
+ print '\nWarning: Cannot create directory at `%s`. Command history will not be saved.\n' % HISTORY_DIR
OLD_CONFIG_FILE = os.path.expanduser(os.path.join('~', '.cqlshrc'))
if os.path.exists(OLD_CONFIG_FILE):
[02/10] git commit: cqlsh: ignore .cassandra permission errors
Posted by mi...@apache.org.
cqlsh: ignore .cassandra permission errors
patch by Mihai Suteu; reviewed by Mikhail Stepura for CASSANDRA-7266
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b25ddd8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b25ddd8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b25ddd8a
Branch: refs/heads/cassandra-2.0
Commit: b25ddd8a7f470fbe2e34f6a16549c03e093ea1f9
Parents: 6131273
Author: Mihai Suteu <mi...@intheforest.co.jp>
Authored: Thu Jun 19 15:14:54 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Jun 19 15:14:54 2014 +1100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25ddd8a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a645516..8da8258 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.17
+ * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
* Errors in FlushRunnable may leave threads hung (CASSANDRA-7275)
* reduce failure detector initial value to 2s (CASSANDRA-7307)
* Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25ddd8a/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 24cb3b8..cec9aac 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -122,7 +122,10 @@ HISTORY_DIR = os.path.expanduser(os.path.join('~', '.cassandra'))
CONFIG_FILE = os.path.join(HISTORY_DIR, 'cqlshrc')
HISTORY = os.path.join(HISTORY_DIR, 'cqlsh_history')
if not os.path.exists(HISTORY_DIR):
- os.mkdir(HISTORY_DIR)
+ try:
+ os.mkdir(HISTORY_DIR)
+ except OSError:
+ print '\nWarning: Cannot create directory at `%s`. Command history will not be saved.\n' % HISTORY_DIR
OLD_CONFIG_FILE = os.path.expanduser(os.path.join('~', '.cqlshrc'))
if os.path.exists(OLD_CONFIG_FILE):
[07/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by mi...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
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/dd872280
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd872280
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd872280
Branch: refs/heads/trunk
Commit: dd87228072d00b9732878577f121f191aab65d71
Parents: 87282f1 b25ddd8
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Jun 19 15:16:28 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Jun 19 15:16:28 2014 +1100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd872280/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 28e831b,8da8258..16e0531
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
-1.2.17
+2.0.9
+ * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
+ * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
+ * Fix native protocol CAS batches (CASSANDRA-7337)
+ * Add per-CF range read request latency metrics (CASSANDRA-7338)
+ * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
+ * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
+ * Swap local and global default read repair chances (CASSANDRA-7320)
+ * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
+ * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
+ * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
+ * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
+ * 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)
+ * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
+ * Fix infinite loop on exception while streaming (CASSANDRA-7330)
+ * Reference sstables before populating key cache (CASSANDRA-7234)
+Merged from 1.2:
+ * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
* Errors in FlushRunnable may leave threads hung (CASSANDRA-7275)
* reduce failure detector initial value to 2s (CASSANDRA-7307)
* Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd872280/bin/cqlsh
----------------------------------------------------------------------
[08/10] 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
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c4e09469
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4e09469
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4e09469
Branch: refs/heads/cassandra-2.1
Commit: c4e09469dc149eb3216fc88291704978f16d85c2
Parents: 03f76a9 dd87228
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Jun 19 15:16:41 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Jun 19 15:16:41 2014 +1100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4e09469/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bd67438,16e0531..fb74327
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,24 +1,26 @@@
-2.0.9
- * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
- * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
+2.1.0
+ * Avoid incremental compaction on Windows (CASSANDRA-7365)
+ * Fix exception when querying a composite-keyed table with a collection index
+ (CASSANDRA-7372)
+ * Use node's host id in place of counter ids (CASSANDRA-7366)
* Fix native protocol CAS batches (CASSANDRA-7337)
+ * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
+ * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
+ * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
+ * Don't fail streams on failure detector downs (CASSANDRA-3569)
+ * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
+ * Reduce run time for CQL tests (CASSANDRA-7327)
+ * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
+ * RefCount native frames from netty (CASSANDRA-7245)
+ * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
+Merged from 2.0:
+ * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
* Add per-CF range read request latency metrics (CASSANDRA-7338)
* Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
- * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
- * Swap local and global default read repair chances (CASSANDRA-7320)
- * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
- * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
- * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
- * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
- * 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)
* Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
* Fix infinite loop on exception while streaming (CASSANDRA-7330)
- * Reference sstables before populating key cache (CASSANDRA-7234)
Merged from 1.2:
+ * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
* Errors in FlushRunnable may leave threads hung (CASSANDRA-7275)
* reduce failure detector initial value to 2s (CASSANDRA-7307)
* Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4e09469/bin/cqlsh
----------------------------------------------------------------------
[09/10] 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
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c4e09469
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4e09469
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4e09469
Branch: refs/heads/trunk
Commit: c4e09469dc149eb3216fc88291704978f16d85c2
Parents: 03f76a9 dd87228
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Jun 19 15:16:41 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Jun 19 15:16:41 2014 +1100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4e09469/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bd67438,16e0531..fb74327
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,24 +1,26 @@@
-2.0.9
- * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
- * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
+2.1.0
+ * Avoid incremental compaction on Windows (CASSANDRA-7365)
+ * Fix exception when querying a composite-keyed table with a collection index
+ (CASSANDRA-7372)
+ * Use node's host id in place of counter ids (CASSANDRA-7366)
* Fix native protocol CAS batches (CASSANDRA-7337)
+ * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
+ * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
+ * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
+ * Don't fail streams on failure detector downs (CASSANDRA-3569)
+ * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
+ * Reduce run time for CQL tests (CASSANDRA-7327)
+ * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
+ * RefCount native frames from netty (CASSANDRA-7245)
+ * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
+Merged from 2.0:
+ * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
* Add per-CF range read request latency metrics (CASSANDRA-7338)
* Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
- * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
- * Swap local and global default read repair chances (CASSANDRA-7320)
- * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
- * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
- * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
- * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
- * 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)
* Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
* Fix infinite loop on exception while streaming (CASSANDRA-7330)
- * Reference sstables before populating key cache (CASSANDRA-7234)
Merged from 1.2:
+ * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
* Errors in FlushRunnable may leave threads hung (CASSANDRA-7275)
* reduce failure detector initial value to 2s (CASSANDRA-7307)
* Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4e09469/bin/cqlsh
----------------------------------------------------------------------
[10/10] 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/640c9d4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/640c9d4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/640c9d4a
Branch: refs/heads/trunk
Commit: 640c9d4a3899edbd6486db6bfa4cff21b490755c
Parents: ee749e2 c4e0946
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Jun 19 15:16:52 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Jun 19 15:16:52 2014 +1100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/640c9d4a/CHANGES.txt
----------------------------------------------------------------------
[06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by mi...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
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/dd872280
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd872280
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd872280
Branch: refs/heads/cassandra-2.0
Commit: dd87228072d00b9732878577f121f191aab65d71
Parents: 87282f1 b25ddd8
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Jun 19 15:16:28 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Jun 19 15:16:28 2014 +1100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd872280/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 28e831b,8da8258..16e0531
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
-1.2.17
+2.0.9
+ * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
+ * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
+ * Fix native protocol CAS batches (CASSANDRA-7337)
+ * Add per-CF range read request latency metrics (CASSANDRA-7338)
+ * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
+ * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
+ * Swap local and global default read repair chances (CASSANDRA-7320)
+ * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
+ * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
+ * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
+ * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
+ * 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)
+ * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
+ * Fix infinite loop on exception while streaming (CASSANDRA-7330)
+ * Reference sstables before populating key cache (CASSANDRA-7234)
+Merged from 1.2:
+ * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
* Errors in FlushRunnable may leave threads hung (CASSANDRA-7275)
* reduce failure detector initial value to 2s (CASSANDRA-7307)
* Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd872280/bin/cqlsh
----------------------------------------------------------------------
[03/10] git commit: cqlsh: ignore .cassandra permission errors
Posted by mi...@apache.org.
cqlsh: ignore .cassandra permission errors
patch by Mihai Suteu; reviewed by Mikhail Stepura for CASSANDRA-7266
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b25ddd8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b25ddd8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b25ddd8a
Branch: refs/heads/cassandra-2.1
Commit: b25ddd8a7f470fbe2e34f6a16549c03e093ea1f9
Parents: 6131273
Author: Mihai Suteu <mi...@intheforest.co.jp>
Authored: Thu Jun 19 15:14:54 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Jun 19 15:14:54 2014 +1100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25ddd8a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a645516..8da8258 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.17
+ * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
* Errors in FlushRunnable may leave threads hung (CASSANDRA-7275)
* reduce failure detector initial value to 2s (CASSANDRA-7307)
* Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25ddd8a/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 24cb3b8..cec9aac 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -122,7 +122,10 @@ HISTORY_DIR = os.path.expanduser(os.path.join('~', '.cassandra'))
CONFIG_FILE = os.path.join(HISTORY_DIR, 'cqlshrc')
HISTORY = os.path.join(HISTORY_DIR, 'cqlsh_history')
if not os.path.exists(HISTORY_DIR):
- os.mkdir(HISTORY_DIR)
+ try:
+ os.mkdir(HISTORY_DIR)
+ except OSError:
+ print '\nWarning: Cannot create directory at `%s`. Command history will not be saved.\n' % HISTORY_DIR
OLD_CONFIG_FILE = os.path.expanduser(os.path.join('~', '.cqlshrc'))
if os.path.exists(OLD_CONFIG_FILE):
[04/10] git commit: cqlsh: ignore .cassandra permission errors
Posted by mi...@apache.org.
cqlsh: ignore .cassandra permission errors
patch by Mihai Suteu; reviewed by Mikhail Stepura for CASSANDRA-7266
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b25ddd8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b25ddd8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b25ddd8a
Branch: refs/heads/trunk
Commit: b25ddd8a7f470fbe2e34f6a16549c03e093ea1f9
Parents: 6131273
Author: Mihai Suteu <mi...@intheforest.co.jp>
Authored: Thu Jun 19 15:14:54 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Jun 19 15:14:54 2014 +1100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25ddd8a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a645516..8da8258 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.17
+ * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
* Errors in FlushRunnable may leave threads hung (CASSANDRA-7275)
* reduce failure detector initial value to 2s (CASSANDRA-7307)
* Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25ddd8a/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 24cb3b8..cec9aac 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -122,7 +122,10 @@ HISTORY_DIR = os.path.expanduser(os.path.join('~', '.cassandra'))
CONFIG_FILE = os.path.join(HISTORY_DIR, 'cqlshrc')
HISTORY = os.path.join(HISTORY_DIR, 'cqlsh_history')
if not os.path.exists(HISTORY_DIR):
- os.mkdir(HISTORY_DIR)
+ try:
+ os.mkdir(HISTORY_DIR)
+ except OSError:
+ print '\nWarning: Cannot create directory at `%s`. Command history will not be saved.\n' % HISTORY_DIR
OLD_CONFIG_FILE = os.path.expanduser(os.path.join('~', '.cqlshrc'))
if os.path.exists(OLD_CONFIG_FILE):
[05/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by mi...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
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/dd872280
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd872280
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd872280
Branch: refs/heads/cassandra-2.1
Commit: dd87228072d00b9732878577f121f191aab65d71
Parents: 87282f1 b25ddd8
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Jun 19 15:16:28 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Jun 19 15:16:28 2014 +1100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd872280/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 28e831b,8da8258..16e0531
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
-1.2.17
+2.0.9
+ * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
+ * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
+ * Fix native protocol CAS batches (CASSANDRA-7337)
+ * Add per-CF range read request latency metrics (CASSANDRA-7338)
+ * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
+ * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
+ * Swap local and global default read repair chances (CASSANDRA-7320)
+ * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
+ * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
+ * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
+ * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
+ * 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)
+ * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
+ * Fix infinite loop on exception while streaming (CASSANDRA-7330)
+ * Reference sstables before populating key cache (CASSANDRA-7234)
+Merged from 1.2:
+ * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
* Errors in FlushRunnable may leave threads hung (CASSANDRA-7275)
* reduce failure detector initial value to 2s (CASSANDRA-7307)
* Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd872280/bin/cqlsh
----------------------------------------------------------------------