You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2017/02/14 23:27:30 UTC
[6/9] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76ad028f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76ad028f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76ad028f
Branch: refs/heads/trunk
Commit: 76ad028f67cbca59895cc489f24102f1f7f9d911
Parents: 82943d6 753d90c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Feb 14 23:26:19 2017 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Feb 14 23:26:19 2017 +0000
----------------------------------------------------------------------
build.xml | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76ad028f/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index a182f45,31c239b..4e3011f
--- a/build.xml
+++ b/build.xml
@@@ -411,8 -421,9 +411,9 @@@
<exclusion groupId="log4j" artifactId="log4j"/>
</dependency>
<dependency groupId="joda-time" artifactId="joda-time" version="2.4" />
-
+
</dependencyManagement>
+ <developer id="adelapena" name="Andres de la Pe�a"/>
<developer id="alakshman" name="Avinash Lakshman"/>
<developer id="aleksey" name="Aleksey Yeschenko"/>
<developer id="amorton" name="Aaron Morton"/>
@@@ -430,13 -450,17 +440,18 @@@
<developer id="jmckenzie" name="Josh McKenzie"/>
<developer id="johan" name="Johan Oskarsson"/>
<developer id="junrao" name="Jun Rao"/>
+ <developer id="kohlisankalp" name="Sankalp Kohli"/>
<developer id="marcuse" name="Marcus Eriksson"/>
+ <developer id="mck" name="Michael Semb Wever"/>
<developer id="mishail" name="Mikhail Stepura"/>
+ <developer id="mshuler" name="Michael Shuler"/>
+ <developer id="paulo" name="Paulo Motta"/>
<developer id="pmalik" name="Prashant Malik"/>
- <developer id="rstupp" name="Robert Stupp"/>
+ <developer id="rstupp" name="Robert Stupp"/>
<developer id="scode" name="Peter Schuller"/>
+ <developer id="beobal" name="Sam Tunnicliffe"/>
<developer id="slebresne" name="Sylvain Lebresne"/>
+ <developer id="stefania" name="Stefania Alborghetti"/>
<developer id="tylerhobbs" name="Tyler Hobbs"/>
<developer id="vijay" name="Vijay Parthasarathy"/>
<developer id="xedin" name="Pavel Yaskevich"/>