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/20 05:05:00 UTC

[01/10] git commit: Use 'text' formatter for 'ascii' values

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 b25ddd8a7 -> ba103ebb3
  refs/heads/cassandra-2.0 f0ebdeb29 -> 37736ab1b
  refs/heads/cassandra-2.1 6858dd3e3 -> 0cdf2b3fc
  refs/heads/trunk 23c2fa8c8 -> 6f3f5fbdf


Use 'text' formatter for 'ascii' values

patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7407


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba103ebb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba103ebb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba103ebb

Branch: refs/heads/cassandra-1.2
Commit: ba103ebb3f01078c6b620eea2a196d58524752a6
Parents: b25ddd8
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Jun 19 16:44:53 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Jun 20 14:01:00 2014 +1100

----------------------------------------------------------------------
 CHANGES.txt                  | 1 +
 pylib/cqlshlib/formatting.py | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba103ebb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8da8258..49afb06 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.2.17
+ * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)
  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba103ebb/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index 44392ce..122db15 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -191,6 +191,7 @@ def format_value_text(val, encoding, colormap, quote=False, **_):
 
 # name alias
 formatter_for('varchar')(format_value_text)
+formatter_for('ascii')(format_value_text)
 
 def format_simple_collection(subtype, val, lbracket, rbracket, encoding,
                              colormap, time_format, float_precision, nullval):


[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/37736ab1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37736ab1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37736ab1

Branch: refs/heads/trunk
Commit: 37736ab1b11daf191c74889287c1776598e3cea3
Parents: f0ebdeb ba103eb
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri Jun 20 14:03:56 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Jun 20 14:03:56 2014 +1100

----------------------------------------------------------------------
 CHANGES.txt                  | 1 +
 pylib/cqlshlib/formatting.py | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/37736ab1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f4f5d83,49afb06..9bc051f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -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)
 + * Account for range tombstones in min/max column names (CASSANDRA-7235)
 + * Improve sub range repair validation (CASSANDRA-7317)
 +Merged from 1.2:
+  * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37736ab1/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------


[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

Conflicts:
	pylib/cqlshlib/formatting.py


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cdf2b3f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cdf2b3f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cdf2b3f

Branch: refs/heads/cassandra-2.1
Commit: 0cdf2b3fc5bc9a07699e99d21f73f911343ede8e
Parents: 6858dd3 37736ab
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri Jun 20 14:04:29 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Jun 20 14:04:29 2014 +1100

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cdf2b3f/CHANGES.txt
----------------------------------------------------------------------


[03/10] git commit: Use 'text' formatter for 'ascii' values

Posted by mi...@apache.org.
Use 'text' formatter for 'ascii' values

patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7407


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba103ebb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba103ebb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba103ebb

Branch: refs/heads/cassandra-2.1
Commit: ba103ebb3f01078c6b620eea2a196d58524752a6
Parents: b25ddd8
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Jun 19 16:44:53 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Jun 20 14:01:00 2014 +1100

----------------------------------------------------------------------
 CHANGES.txt                  | 1 +
 pylib/cqlshlib/formatting.py | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba103ebb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8da8258..49afb06 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.2.17
+ * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)
  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba103ebb/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index 44392ce..122db15 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -191,6 +191,7 @@ def format_value_text(val, encoding, colormap, quote=False, **_):
 
 # name alias
 formatter_for('varchar')(format_value_text)
+formatter_for('ascii')(format_value_text)
 
 def format_simple_collection(subtype, val, lbracket, rbracket, encoding,
                              colormap, time_format, float_precision, nullval):


[02/10] git commit: Use 'text' formatter for 'ascii' values

Posted by mi...@apache.org.
Use 'text' formatter for 'ascii' values

patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7407


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba103ebb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba103ebb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba103ebb

Branch: refs/heads/cassandra-2.0
Commit: ba103ebb3f01078c6b620eea2a196d58524752a6
Parents: b25ddd8
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Jun 19 16:44:53 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Jun 20 14:01:00 2014 +1100

----------------------------------------------------------------------
 CHANGES.txt                  | 1 +
 pylib/cqlshlib/formatting.py | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba103ebb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8da8258..49afb06 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.2.17
+ * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)
  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba103ebb/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index 44392ce..122db15 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -191,6 +191,7 @@ def format_value_text(val, encoding, colormap, quote=False, **_):
 
 # name alias
 formatter_for('varchar')(format_value_text)
+formatter_for('ascii')(format_value_text)
 
 def format_simple_collection(subtype, val, lbracket, rbracket, encoding,
                              colormap, time_format, float_precision, nullval):


[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/37736ab1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37736ab1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37736ab1

Branch: refs/heads/cassandra-2.0
Commit: 37736ab1b11daf191c74889287c1776598e3cea3
Parents: f0ebdeb ba103eb
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri Jun 20 14:03:56 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Jun 20 14:03:56 2014 +1100

----------------------------------------------------------------------
 CHANGES.txt                  | 1 +
 pylib/cqlshlib/formatting.py | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/37736ab1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f4f5d83,49afb06..9bc051f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -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)
 + * Account for range tombstones in min/max column names (CASSANDRA-7235)
 + * Improve sub range repair validation (CASSANDRA-7317)
 +Merged from 1.2:
+  * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37736ab1/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------


[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

Conflicts:
	pylib/cqlshlib/formatting.py


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cdf2b3f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cdf2b3f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cdf2b3f

Branch: refs/heads/trunk
Commit: 0cdf2b3fc5bc9a07699e99d21f73f911343ede8e
Parents: 6858dd3 37736ab
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri Jun 20 14:04:29 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Jun 20 14:04:29 2014 +1100

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cdf2b3f/CHANGES.txt
----------------------------------------------------------------------


[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/37736ab1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37736ab1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37736ab1

Branch: refs/heads/cassandra-2.1
Commit: 37736ab1b11daf191c74889287c1776598e3cea3
Parents: f0ebdeb ba103eb
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri Jun 20 14:03:56 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Jun 20 14:03:56 2014 +1100

----------------------------------------------------------------------
 CHANGES.txt                  | 1 +
 pylib/cqlshlib/formatting.py | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/37736ab1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f4f5d83,49afb06..9bc051f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -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)
 + * Account for range tombstones in min/max column names (CASSANDRA-7235)
 + * Improve sub range repair validation (CASSANDRA-7317)
 +Merged from 1.2:
+  * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37736ab1/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------


[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/6f3f5fbd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f3f5fbd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f3f5fbd

Branch: refs/heads/trunk
Commit: 6f3f5fbdf3b04a647f0391e8dc724c1edbaf333d
Parents: 23c2fa8 0cdf2b3
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri Jun 20 14:04:39 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Jun 20 14:04:39 2014 +1100

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3f5fbd/CHANGES.txt
----------------------------------------------------------------------


[04/10] git commit: Use 'text' formatter for 'ascii' values

Posted by mi...@apache.org.
Use 'text' formatter for 'ascii' values

patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7407


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba103ebb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba103ebb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba103ebb

Branch: refs/heads/trunk
Commit: ba103ebb3f01078c6b620eea2a196d58524752a6
Parents: b25ddd8
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Jun 19 16:44:53 2014 +1100
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Jun 20 14:01:00 2014 +1100

----------------------------------------------------------------------
 CHANGES.txt                  | 1 +
 pylib/cqlshlib/formatting.py | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba103ebb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8da8258..49afb06 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.2.17
+ * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)
  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba103ebb/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index 44392ce..122db15 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -191,6 +191,7 @@ def format_value_text(val, encoding, colormap, quote=False, **_):
 
 # name alias
 formatter_for('varchar')(format_value_text)
+formatter_for('ascii')(format_value_text)
 
 def format_simple_collection(subtype, val, lbracket, rbracket, encoding,
                              colormap, time_format, float_precision, nullval):