[4/4] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfb06473 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfb06473 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfb06473 Branch: refs/heads/cassandra-2.0 Commit: bfb06473ec13914aca7360706bff8e90cfd2ae79 Parents: 857a7f5 c8b220b Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Aug 21 18:48:13 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Aug 21 18:48:13 2013 +0300 -- CHANGES.txt | 10 ++ src/java/org/apache/cassandra/cql3/Cql.g| 37 +--- .../apache/cassandra/cql3/QueryProcessor.java | 9 ++--- 3 files changed, 23 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfb06473/CHANGES.txt --
[4/4] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc2c0e78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc2c0e78 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc2c0e78 Branch: refs/heads/cassandra-2.0 Commit: dc2c0e786a6b72134b35c25173bd73b43bef65a1 Parents: c3993be 5bf1fc1 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Aug 19 17:21:31 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Aug 19 17:21:31 2013 +0200 -- build.xml | 2 +- conf/cassandra.yaml | 12 debian/changelog| 8 +++- 3 files changed, 16 insertions(+), 6 deletions(-) --
[4/4] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69397ef5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69397ef5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69397ef5 Branch: refs/heads/cassandra-2.0 Commit: 69397ef5f0a260d2b6c30e64da9441777639de6b Parents: bc12d73 7e02052 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Aug 16 05:05:44 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Aug 16 05:05:44 2013 +0300 -- src/java/org/apache/cassandra/auth/Auth.java | 3 +++ src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++ 2 files changed, 6 insertions(+) --
