Merge branch 'cassandra-3.0' into trunk

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

Branch: refs/heads/trunk
Commit: 4bb5976a7bd3b68e9ea05610c4b4e174645ad07a
Parents: 92b8131 cffa93c
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Sat Sep 19 17:50:38 2015 +0100
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Sat Sep 19 17:50:38 2015 +0100

----------------------------------------------------------------------
 test/conf/cassandra_pig.yaml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


Reply via email to