cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 03 Oct 2014 17:37:53 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	debian/rules


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

Branch: refs/heads/trunk
Commit: 4539237ab65b54a32d0e8b8a5f3c5bce80d8f4ee
Parents: cb8dc4e 8952d6c
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Oct 3 12:37:28 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Oct 3 12:37:28 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4539237a/debian/rules
----------------------------------------------------------------------
diff --cc debian/rules
index 31fd0c0,de5583f..405175d
--- a/debian/rules
+++ b/debian/rules
@@@ -3,10 -3,8 +3,10 @@@
  # Uncomment to enable verbose mode.
  #export DH_VERBOSE=1
  
 +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


Mime
View raw message