cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [01/18] cassandra git commit: deb package migration to dh_python2
Date Tue, 26 Apr 2016 16:30:12 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 cc75de691 -> ae03066f4
  refs/heads/cassandra-2.2 3128802a5 -> ec1772ad8
  refs/heads/cassandra-3.0 049d70c2e -> 8d69cabd5
  refs/heads/trunk 53b4ffac3 -> 75177696d


deb package migration to dh_python2

Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853


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

Branch: refs/heads/cassandra-2.2
Commit: 26e0a33fafd77c900abad1db4d43a29985d3341f
Parents: cc75de6
Author: T Jake Luciani <jake@apache.org>
Authored: Tue Apr 26 12:06:46 2016 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Tue Apr 26 12:06:46 2016 -0400

----------------------------------------------------------------------
 debian/control                                    | 4 ++--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26e0a33f/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 8a30de1..cc5928c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans <eevans@apache.org>
 Uploaders: Sylvain Lebresne <slebresne@apache.org>
-Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), ant-optional
(>= 1.7), python-support, dpatch, bash-completion
+Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), ant-optional
(>= 1.7), 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
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
 
 Package: cassandra
 Architecture: all
-Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), python-support
(>= 0.90.0), ${misc:Depends}
+Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), ${misc:Depends}
 Recommends: ntp | time-daemon
 Suggests: cassandra-tools
 Conflicts: apache-cassandra1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26e0a33f/src/java/org/apache/cassandra/utils/Interval.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/Interval.java b/src/java/org/apache/cassandra/utils/Interval.java
index c74f153..33b4188 100644
--- a/src/java/org/apache/cassandra/utils/Interval.java
+++ b/src/java/org/apache/cassandra/utils/Interval.java
@@ -37,7 +37,7 @@ public class Interval<C, D>
         return create(min, max, null);
     }
 
-    public static <C, D> Interval<C, D> create(C min, C max, D data)
+    public static <C, D> Interval<C, D> git gitcreate(C min, C max, D data)
     {
         return new Interval(min, max, data);
     }


Mime
View raw message