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/09 18:58:33 UTC
[1/6] git commit: fix missing test build dep for pig-test
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 898425783 -> 40fd7f012
refs/heads/cassandra-2.1.0 ce46d6619 -> 0b8fb5bb9
refs/heads/trunk 304ead14e -> 15ced9428
fix missing test build dep for pig-test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b8fb5bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b8fb5bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b8fb5bb
Branch: refs/heads/cassandra-2.1
Commit: 0b8fb5bb928bdbc59427a78ccbbceb190a101921
Parents: ce46d66
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jul 9 11:50:49 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jul 9 11:50:49 2014 -0500
----------------------------------------------------------------------
build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b8fb5bb/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d81c3d4..fd0c72b 100644
--- a/build.xml
+++ b/build.xml
@@ -448,6 +448,8 @@
<parent groupId="org.apache.cassandra"
artifactId="cassandra-parent"
version="${version}"/>
+ <!-- do NOT remove this, it breaks pig-test -->
+ <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" version="1.7.2"/>
<dependency groupId="joda-time" artifactId="joda-time" version="2.3" />
</artifact:pom>
[4/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into 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/40fd7f01
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40fd7f01
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40fd7f01
Branch: refs/heads/trunk
Commit: 40fd7f0120481100c638957d0a794f582c8ab8dc
Parents: 8984257 0b8fb5b
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jul 9 11:58:15 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jul 9 11:58:15 2014 -0500
----------------------------------------------------------------------
build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40fd7f01/build.xml
----------------------------------------------------------------------
[5/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into 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/40fd7f01
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40fd7f01
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40fd7f01
Branch: refs/heads/cassandra-2.1
Commit: 40fd7f0120481100c638957d0a794f582c8ab8dc
Parents: 8984257 0b8fb5b
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jul 9 11:58:15 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jul 9 11:58:15 2014 -0500
----------------------------------------------------------------------
build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40fd7f01/build.xml
----------------------------------------------------------------------
[2/6] git commit: fix missing test build dep for pig-test
Posted by br...@apache.org.
fix missing test build dep for pig-test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b8fb5bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b8fb5bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b8fb5bb
Branch: refs/heads/cassandra-2.1.0
Commit: 0b8fb5bb928bdbc59427a78ccbbceb190a101921
Parents: ce46d66
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jul 9 11:50:49 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jul 9 11:50:49 2014 -0500
----------------------------------------------------------------------
build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b8fb5bb/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d81c3d4..fd0c72b 100644
--- a/build.xml
+++ b/build.xml
@@ -448,6 +448,8 @@
<parent groupId="org.apache.cassandra"
artifactId="cassandra-parent"
version="${version}"/>
+ <!-- do NOT remove this, it breaks pig-test -->
+ <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" version="1.7.2"/>
<dependency groupId="joda-time" artifactId="joda-time" version="2.3" />
</artifact:pom>
[3/6] git commit: fix missing test build dep for pig-test
Posted by br...@apache.org.
fix missing test build dep for pig-test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b8fb5bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b8fb5bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b8fb5bb
Branch: refs/heads/trunk
Commit: 0b8fb5bb928bdbc59427a78ccbbceb190a101921
Parents: ce46d66
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jul 9 11:50:49 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jul 9 11:50:49 2014 -0500
----------------------------------------------------------------------
build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b8fb5bb/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d81c3d4..fd0c72b 100644
--- a/build.xml
+++ b/build.xml
@@ -448,6 +448,8 @@
<parent groupId="org.apache.cassandra"
artifactId="cassandra-parent"
version="${version}"/>
+ <!-- do NOT remove this, it breaks pig-test -->
+ <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" version="1.7.2"/>
<dependency groupId="joda-time" artifactId="joda-time" version="2.3" />
</artifact:pom>
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15ced942
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15ced942
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15ced942
Branch: refs/heads/trunk
Commit: 15ced9428715f29c3d6fcef0bd405f2fbae9bd3c
Parents: 304ead1 40fd7f0
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jul 9 11:58:27 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jul 9 11:58:27 2014 -0500
----------------------------------------------------------------------
build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15ced942/build.xml
----------------------------------------------------------------------