cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mshu...@apache.org
Subject [11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Mon, 10 Apr 2017 14:12:57 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: f63ea2727654a048922f931915cb10b30e4cead2
Parents: 5e13020 590e151
Author: Michael Shuler <michael@pbandjelly.org>
Authored: Mon Apr 10 09:11:32 2017 -0500
Committer: Michael Shuler <michael@pbandjelly.org>
Committed: Mon Apr 10 09:11:32 2017 -0500

----------------------------------------------------------------------
 debian/cassandra.install | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f63ea272/debian/cassandra.install
----------------------------------------------------------------------
diff --cc debian/cassandra.install
index 706f316,e8da5e9..50db32d
--- a/debian/cassandra.install
+++ b/debian/cassandra.install
@@@ -5,7 -5,7 +5,8 @@@ conf/commitlog_archiving.properties etc
  conf/cassandra-topology.properties etc/cassandra
  conf/logback.xml etc/cassandra
  conf/logback-tools.xml etc/cassandra
 +conf/jvm.options etc/cassandra
+ conf/hotspot_compiler etc/cassandra
  conf/triggers/* etc/cassandra/triggers
  debian/cassandra.in.sh usr/share/cassandra
  debian/cassandra.conf etc/security/limits.d


Mime
View raw message