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 <jbel...@apache.org> Authored: Tue Jul 30 15:57:45 2013 -0500 Committer: Jonathan Ellis <jbel...@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