You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/06 04:12:53 UTC
[1/3] git commit: cherry-pick CASSANDRA-5816
Updated Branches:
refs/heads/cassandra-2.0 85be04bb2 -> ad6f00afa
refs/heads/trunk a6f036178 -> cfe926ac6
cherry-pick CASSANDRA-5816
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad6f00af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad6f00af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad6f00af
Branch: refs/heads/cassandra-2.0
Commit: ad6f00afaa6a00f5fa1ce0bf832d18a623531969
Parents: 85be04b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 30 15:57:45 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 5 21:12:12 2013 -0500
----------------------------------------------------------------------
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad6f00af/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index bdee7df..631c60b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Standards-Version: 3.8.3
Package: cassandra
Architecture: all
Depends: openjdk-7-jre-headless | java7-runtime, adduser, libjna-java, python (>= 2.5), python-support (>= 0.90.0), ${misc:Depends}
-Recommends: ntp
+Recommends: ntp | time-daemon
Conflicts: apache-cassandra1
Replaces: apache-cassandra1
Description: distributed storage system for structured data
[2/3] git commit: cherry-pick CASSANDRA-5816
Posted by jb...@apache.org.
cherry-pick CASSANDRA-5816
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad6f00af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad6f00af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad6f00af
Branch: refs/heads/trunk
Commit: ad6f00afaa6a00f5fa1ce0bf832d18a623531969
Parents: 85be04b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 30 15:57:45 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 5 21:12:12 2013 -0500
----------------------------------------------------------------------
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad6f00af/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index bdee7df..631c60b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Standards-Version: 3.8.3
Package: cassandra
Architecture: all
Depends: openjdk-7-jre-headless | java7-runtime, adduser, libjna-java, python (>= 2.5), python-support (>= 0.90.0), ${misc:Depends}
-Recommends: ntp
+Recommends: ntp | time-daemon
Conflicts: apache-cassandra1
Replaces: apache-cassandra1
Description: distributed storage system for structured data
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfe926ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfe926ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfe926ac
Branch: refs/heads/trunk
Commit: cfe926ac6a3c230c1670ee32bc4e9a99978f532c
Parents: a6f0361 ad6f00a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 5 21:12:47 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 5 21:12:47 2013 -0500
----------------------------------------------------------------------
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------