cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Date Fri, 04 Jan 2013 16:26:32 GMT
Updated Branches:
  refs/heads/trunk 8832317ff -> b41fc772e


Merge branch 'cassandra-1.2' into trunk

Conflicts:
	pylib/cqlshlib/cql3handling.py


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

Branch: refs/heads/trunk
Commit: b41fc772e1852806ed1f660f00967d4bf0805c84
Parents: 8832317 3411adf
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Jan 4 19:26:06 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Jan 4 19:26:06 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                    |    1 +
 pylib/cqlshlib/cql3handling.py |   10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b41fc772/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------


Mime
View raw message