cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Tue, 10 Feb 2015 18:07:57 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	conf/cassandra.yaml


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

Branch: refs/heads/trunk
Commit: 69d07fb03f4357bcb0eb9d138af317c1172f28ca
Parents: 97da271 ce8501b
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Feb 10 12:07:38 2015 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Feb 10 12:07:38 2015 -0600

----------------------------------------------------------------------
 conf/cassandra-env.sh | 1 +
 conf/cassandra.yaml   | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69d07fb0/conf/cassandra-env.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69d07fb0/conf/cassandra.yaml
----------------------------------------------------------------------
diff --cc conf/cassandra.yaml
index 0b114aa,99f13a6..f337067
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -398,20 -333,18 +399,22 @@@ native_transport_port: 904
  # Whether to start the thrift rpc server.
  start_rpc: true
  
 -# The address to bind the Thrift RPC service and native transport
 -# server -- clients connect here.
 +# The address or interface to bind the Thrift RPC service and native transport
 +# server to.
 +#
 +# Set rpc_address OR rpc_interface, not both. Interfaces must correspond
 +# to a single address, IP aliasing is not supported.
  #
 -# Leaving this blank has the same effect it does for ListenAddress,
 +# Leaving rpc_address blank has the same effect as on listen_address
  # (i.e. it will be based on the configured hostname of the node).
  #
 -# Note that unlike ListenAddress above, it is allowed to specify 0.0.0.0
 -# here if you want to listen on all interfaces, but that will break clients 
 -# that rely on node auto-discovery.
 +# Note that unlike listen_address, you can specify 0.0.0.0, but you must also
 +# set broadcast_rpc_address to a value other than 0.0.0.0.
+ #
+ # For security reasons, you should not expose this port to the internet.  Firewall it if
needed.
  rpc_address: localhost
 +# rpc_interface: eth1
 +
  # port for Thrift to listen for clients on
  rpc_port: 9160
  


Mime
View raw message