You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/05/01 21:06:12 UTC
[1/2] git commit: Ninja-fix test_cqlsh_output.py
Updated Branches:
refs/heads/trunk 591728100 -> 5db484f60
Ninja-fix test_cqlsh_output.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c86fa3c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c86fa3c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c86fa3c
Branch: refs/heads/trunk
Commit: 1c86fa3c1871c1315df67647cb1d46762e43c279
Parents: 24f6387
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed May 1 22:04:45 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed May 1 22:04:45 2013 +0300
----------------------------------------------------------------------
pylib/cqlshlib/test/test_cqlsh_output.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c86fa3c/pylib/cqlshlib/test/test_cqlsh_output.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/test/test_cqlsh_output.py b/pylib/cqlshlib/test/test_cqlsh_output.py
index 8127adf..e67cc9c 100644
--- a/pylib/cqlshlib/test/test_cqlsh_output.py
+++ b/pylib/cqlshlib/test/test_cqlsh_output.py
@@ -737,8 +737,8 @@ class TestCqlshOutput(BaseTestCase):
asciicol ascii,
blobcol blob,
varcharcol text,
- textcol text,
- varintcol varint
+ varintcol varint,
+ textcol text
) WITH
comment='' AND
comparator=text AND
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5db484f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5db484f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5db484f6
Branch: refs/heads/trunk
Commit: 5db484f60c731f3f2de394ff22b88008205f96c9
Parents: 5917281 1c86fa3
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed May 1 22:05:46 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed May 1 22:05:46 2013 +0300
----------------------------------------------------------------------
pylib/cqlshlib/test/test_cqlsh_output.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5db484f6/pylib/cqlshlib/test/test_cqlsh_output.py
----------------------------------------------------------------------