cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Wed, 16 Jul 2014 16:57:42 GMT
Merge branch 'cassandra-2.1.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/d2ae187c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2ae187c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2ae187c

Branch: refs/heads/cassandra-2.1
Commit: d2ae187c7da407020b2493b73f1f281fd996ca7e
Parents: c70216a 88e0571
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Wed Jul 16 11:57:23 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Wed Jul 16 11:57:23 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 bin/cqlsh                                       |  44 +++--
 lib/cassandra-driver-internal-only-1.1.2.zip    | Bin 105983 -> 0 bytes
 ...sandra-driver-internal-only-2.1.0b1.post.zip | Bin 0 -> 125786 bytes
 lib/licenses/cassandra-driver-1.0.2.txt         | 177 -------------------
 lib/licenses/cassandra-driver-2.1.0b1.post.txt  | 177 +++++++++++++++++++
 lib/licenses/six-1.7.3.txt                      |  18 ++
 lib/six-1.7.3-py2.py3-none-any.zip              | Bin 0 -> 9503 bytes
 pylib/cqlshlib/formatting.py                    |   8 +-
 pylib/cqlshlib/test/test_cqlsh_completion.py    |   2 +-
 pylib/cqlshlib/test/test_cqlsh_output.py        |   2 +-
 pylib/cqlshlib/usertypes.py                     | 117 ------------
 12 files changed, 236 insertions(+), 310 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2ae187c/bin/cqlsh
----------------------------------------------------------------------


Mime
View raw message