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/02/25 22:22:56 UTC

[1/6] git commit: fix build-dep to not require ojdk

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 d21c0c932 -> 157cbdfad
  refs/heads/cassandra-2.1 d4d4334ad -> 3f614ff4b
  refs/heads/trunk 1d598726f -> 97f31303b


fix build-dep to not require ojdk


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

Branch: refs/heads/cassandra-2.0
Commit: 157cbdfad99c678333c60af0037818eb71eea502
Parents: d21c0c9
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 25 15:19:47 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 25 15:19:47 2014 -0600

----------------------------------------------------------------------
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/157cbdfa/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 631c60b..2695e8d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans <ee...@apache.org>
 Uploaders: Sylvain Lebresne <sl...@apache.org>
-Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-sdk, ant (>= 1.7), ant-optional (>= 1.7), python-support
+Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), ant-optional (>= 1.7), python-support
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git

[2/6] git commit: fix build-dep to not require ojdk

Posted by br...@apache.org.
fix build-dep to not require ojdk


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

Branch: refs/heads/cassandra-2.1
Commit: 157cbdfad99c678333c60af0037818eb71eea502
Parents: d21c0c9
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 25 15:19:47 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 25 15:19:47 2014 -0600

----------------------------------------------------------------------
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/157cbdfa/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 631c60b..2695e8d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans <ee...@apache.org>
 Uploaders: Sylvain Lebresne <sl...@apache.org>
-Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-sdk, ant (>= 1.7), ant-optional (>= 1.7), python-support
+Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), ant-optional (>= 1.7), python-support
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git

[3/6] git commit: fix build-dep to not require ojdk

Posted by br...@apache.org.
fix build-dep to not require ojdk


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

Branch: refs/heads/trunk
Commit: 157cbdfad99c678333c60af0037818eb71eea502
Parents: d21c0c9
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 25 15:19:47 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 25 15:19:47 2014 -0600

----------------------------------------------------------------------
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/157cbdfa/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 631c60b..2695e8d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans <ee...@apache.org>
 Uploaders: Sylvain Lebresne <sl...@apache.org>
-Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-sdk, ant (>= 1.7), ant-optional (>= 1.7), python-support
+Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), ant-optional (>= 1.7), python-support
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git

[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.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/3f614ff4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f614ff4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f614ff4

Branch: refs/heads/trunk
Commit: 3f614ff4b9bcab2b7d97aae4cc816e46c86f666d
Parents: d4d4334 157cbdf
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 25 15:19:55 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 25 15:19:55 2014 -0600

----------------------------------------------------------------------
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f614ff4/debian/control
----------------------------------------------------------------------

[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/97f31303
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97f31303
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97f31303

Branch: refs/heads/trunk
Commit: 97f31303bb5aaf92588a414290dd5dbb3e46c73d
Parents: 1d59872 3f614ff
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 25 15:20:04 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 25 15:20:04 2014 -0600

----------------------------------------------------------------------
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------

[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.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/3f614ff4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f614ff4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f614ff4

Branch: refs/heads/cassandra-2.1
Commit: 3f614ff4b9bcab2b7d97aae4cc816e46c86f666d
Parents: d4d4334 157cbdf
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 25 15:19:55 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 25 15:19:55 2014 -0600

----------------------------------------------------------------------
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f614ff4/debian/control
----------------------------------------------------------------------