You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by br...@apache.org on 2014/07/17 23:00:32 UTC

[6/7] git commit: Merge branch 'cassandra-2.1'

Merge branch '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/e5625fca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5625fca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5625fca

Branch: refs/heads/cassandra-2.1
Commit: e5625fcad96fa9decef927937e70c2ec39dc96d7
Parents: 7a1edab 5dfee58
Author: Brandon Williams <br...@datastax.com>
Authored: Thu Jul 17 15:59:49 2014 -0500
Committer: Brandon Williams <br...@datastax.com>
Committed: Thu Jul 17 15:59:49 2014 -0500

----------------------------------------------------------------------
 bin/cqlsh | 46 +++++++++++++++++++++++++++++++++-------------
 build.xml | 12 ++++++++----
 2 files changed, 41 insertions(+), 17 deletions(-)
----------------------------------------------------------------------