You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/09/22 21:33:32 UTC
[1/2] git commit: Ninja fix debian rules to handle versions with -N
package convention
Repository: cassandra
Updated Branches:
refs/heads/trunk f1bd50ce5 -> 3f181f063
Ninja fix debian rules to handle versions with -N package convention
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/192468f7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/192468f7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/192468f7
Branch: refs/heads/trunk
Commit: 192468f7a28b312330be213e38a284bbb2bfa890
Parents: ce357d9
Author: Jake Luciani <ja...@apache.org>
Authored: Mon Sep 22 15:32:36 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Mon Sep 22 15:32:36 2014 -0400
----------------------------------------------------------------------
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/192468f7/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index ca303f1..31fd0c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
include /usr/share/dpatch/dpatch.make
ANT = /usr/bin/ant
-VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
+VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \([^-]*\).*/\1/p')
test:
dh_testdir
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ja...@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/3f181f06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f181f06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f181f06
Branch: refs/heads/trunk
Commit: 3f181f06385fa5ffa8219bae5380fc0767eac55d
Parents: f1bd50c 192468f
Author: Jake Luciani <ja...@apache.org>
Authored: Mon Sep 22 15:33:20 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Mon Sep 22 15:33:20 2014 -0400
----------------------------------------------------------------------
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------