cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mshu...@apache.org
Subject [05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 03 Mar 2017 18:44:03 GMT
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/244f887f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/244f887f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/244f887f

Branch: refs/heads/cassandra-3.11
Commit: 244f887f4c61ed75cc7250386b4ae5371e79f48f
Parents: e11f750 288d243
Author: Michael Shuler <michael@pbandjelly.org>
Authored: Fri Mar 3 12:42:00 2017 -0600
Committer: Michael Shuler <michael@pbandjelly.org>
Committed: Fri Mar 3 12:42:00 2017 -0600

----------------------------------------------------------------------
 debian/control        | 2 +-
 redhat/cassandra.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/244f887f/debian/control
----------------------------------------------------------------------
diff --cc debian/control
index 2d30077,d45a875..6a0128e
--- a/debian/control
+++ b/debian/control
@@@ -3,7 -3,7 +3,7 @@@ Section: mis
  Priority: extra
  Maintainer: Eric Evans <eevans@apache.org>
  Uploaders: Sylvain Lebresne <slebresne@apache.org>
- Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.7), ant-optional
(>= 1.7), dh-python, python-dev (>= 2.7), dpatch, bash-completion
 -Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.9), ant-optional
(>= 1.9), dh-python, python-dev (>= 2.7), dpatch, bash-completion
++Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.9), ant-optional
(>= 1.9), dh-python, python-dev (>= 2.7), dpatch, bash-completion
  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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/244f887f/redhat/cassandra.spec
----------------------------------------------------------------------
diff --cc redhat/cassandra.spec
index a1bfa5d,c3c22d0..d5e743d
--- a/redhat/cassandra.spec
+++ b/redhat/cassandra.spec
@@@ -18,9 -18,9 +18,9 @@@ URL:           http://cassandra.apache.
  Source0:       %{relname}-src.tar.gz
  BuildRoot:     %{_tmppath}/%{relname}root-%(%{__id_u} -n)
  
- BuildRequires: ant
+ BuildRequires: ant >= 1.9
  
 -Requires:      jre >= 1.7.0
 +Requires:      jre >= 1.8.0
  Requires:      python(abi) >= 2.7
  Requires(pre): user(cassandra)
  Requires(pre): group(cassandra)


Mime
View raw message