You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/04/09 05:31:58 UTC
[1/4] git commit: Change version for 1.2.4 release
Updated Branches:
refs/heads/trunk 4902bdc7b -> 39cf55a54
Change version for 1.2.4 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e96d071
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e96d071
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e96d071
Branch: refs/heads/trunk
Commit: 2e96d07114dc88f85e56d88f7322a6b91da36c0d
Parents: 22d107f
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Apr 8 18:55:06 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Apr 8 18:55:06 2013 +0200
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e96d071/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index a57d669..3491431 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="1.2.3"/>
+ <property name="base.version" value="1.2.4"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e96d071/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index e0bc2a7..c8a62fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.4) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Mon, 08 Apr 2013 18:52:23 +0200
+
cassandra (1.2.3) unstable; urgency=low
* New release
[2/4] git commit: support username/password for for jmx in shuffle
tool patch by mmichalski reviewed by dbrosius for cassandra-5431
Posted by db...@apache.org.
support username/password for for jmx in shuffle tool
patch by mmichalski reviewed by dbrosius for cassandra-5431
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe893907
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe893907
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe893907
Branch: refs/heads/trunk
Commit: fe8939075999359b8a26a1a0dcf1a7c7bc4531bb
Parents: 2e96d07
Author: Dave Brosius <db...@apache.org>
Authored: Mon Apr 8 23:17:37 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Mon Apr 8 23:17:37 2013 -0400
----------------------------------------------------------------------
.../apache/cassandra/tools/AbstractJmxClient.java | 11 ++++++-----
src/java/org/apache/cassandra/tools/Shuffle.java | 11 +++++++----
2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe893907/src/java/org/apache/cassandra/tools/AbstractJmxClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/AbstractJmxClient.java b/src/java/org/apache/cassandra/tools/AbstractJmxClient.java
index 3d5cd3a..8241a5b 100644
--- a/src/java/org/apache/cassandra/tools/AbstractJmxClient.java
+++ b/src/java/org/apache/cassandra/tools/AbstractJmxClient.java
@@ -47,6 +47,8 @@ public abstract class AbstractJmxClient implements Closeable
protected final String host;
protected final int port;
+ protected final String username;
+ protected final String password;
protected JMXConnection jmxConn;
protected PrintStream out = System.out;
@@ -54,6 +56,8 @@ public abstract class AbstractJmxClient implements Closeable
{
options.addOption("h", "host", true, "JMX hostname or IP address (Default: localhost)");
options.addOption("p", "port", true, "JMX port number (Default: 7199)");
+ options.addOption("u", "username", true, "JMX username");
+ options.addOption("pw", "password", true, "JMX password");
options.addOption("H", "help", false, "Print help information");
}
@@ -61,6 +65,8 @@ public abstract class AbstractJmxClient implements Closeable
{
this.host = (host != null) ? host : DEFAULT_HOST;
this.port = (port != null) ? port : DEFAULT_JMX_PORT;
+ this.username = username;
+ this.password = password;
jmxConn = new JMXConnection(this.host, this.port, username, password);
}
@@ -133,11 +139,6 @@ class JMXConnection
private JMXConnector jmxc;
private MBeanServerConnection mbeanServerConn;
- JMXConnection(String host, int port) throws IOException
- {
- this(host, port, null, null);
- }
-
JMXConnection(String host, int port, String username, String password) throws IOException
{
this.host = host;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe893907/src/java/org/apache/cassandra/tools/Shuffle.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/Shuffle.java b/src/java/org/apache/cassandra/tools/Shuffle.java
index 8cf38b9..793d2ee 100644
--- a/src/java/org/apache/cassandra/tools/Shuffle.java
+++ b/src/java/org/apache/cassandra/tools/Shuffle.java
@@ -233,7 +233,7 @@ public class Shuffle extends AbstractJmxClient
{
try
{
- JMXConnection conn = new JMXConnection(endpoint, port);
+ JMXConnection conn = new JMXConnection(endpoint, port, username, password);
getSSProxy(conn.getMbeanServerConn()).enableScheduledRangeXfers();
conn.close();
}
@@ -265,7 +265,7 @@ public class Shuffle extends AbstractJmxClient
{
try
{
- JMXConnection conn = new JMXConnection(endpoint, port);
+ JMXConnection conn = new JMXConnection(endpoint, port, username, password);
getSSProxy(conn.getMbeanServerConn()).disableScheduledRangeXfers();
conn.close();
}
@@ -286,7 +286,7 @@ public class Shuffle extends AbstractJmxClient
{
try
{
- JMXConnection conn = new JMXConnection(host, port);
+ JMXConnection conn = new JMXConnection(host, port, username, password);
return getSSProxy(conn.getMbeanServerConn()).getLiveNodes();
}
catch (IOException e)
@@ -631,6 +631,8 @@ public class Shuffle extends AbstractJmxClient
String hostName = (cmd.getOptionValue("host") != null) ? cmd.getOptionValue("host") : DEFAULT_HOST;
String port = (cmd.getOptionValue("port") != null) ? cmd.getOptionValue("port") : Integer.toString(DEFAULT_JMX_PORT);
+ String username = cmd.getOptionValue("username");
+ String password = cmd.getOptionValue("password");
String thriftHost = (cmd.getOptionValue("thrift-host") != null) ? cmd.getOptionValue("thrift-host") : hostName;
String thriftPort = (cmd.getOptionValue("thrift-port") != null) ? cmd.getOptionValue("thrift-port") : "9160";
String onlyDc = cmd.getOptionValue("only-dc");
@@ -670,7 +672,8 @@ public class Shuffle extends AbstractJmxClient
else
thriftPortNum = 9160;
- Shuffle shuffler = new Shuffle(hostName, portNum, thriftHost, thriftPortNum, thriftFramed, null, null);
+ Shuffle shuffler = new Shuffle(hostName, portNum, thriftHost, thriftPortNum, thriftFramed,
+ username, password);
try
{
[3/4] git commit: add 5431 to CHANGES.txt
Posted by db...@apache.org.
add 5431 to CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5820eda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5820eda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5820eda
Branch: refs/heads/trunk
Commit: c5820eda4f74583f099eddcebdb5cc274122765b
Parents: fe89390
Author: Dave Brosius <db...@apache.org>
Authored: Mon Apr 8 23:22:04 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Mon Apr 8 23:22:04 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5820eda/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 81d57ef..76e5853 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -32,6 +32,7 @@
* Fix potential incremental backups race (CASSANDRA-5410)
* Fix prepared BATCH statements with batch-level timestamps (CASSANDRA-5415)
* Allow overriding superuser setup delay (CASSANDRA-5430)
+ * cassandra-shuffle with JMX usernames and passwords (CASSANDRA-5431)
Merged from 1.1:
* cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052)
* Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372)
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39cf55a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39cf55a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39cf55a5
Branch: refs/heads/trunk
Commit: 39cf55a543efc0ef9d3cc83ea225a8d068d3d537
Parents: 4902bdc c5820ed
Author: Dave Brosius <db...@apache.org>
Authored: Mon Apr 8 23:31:30 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Mon Apr 8 23:31:30 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
debian/changelog | 6 ++++++
.../apache/cassandra/tools/AbstractJmxClient.java | 11 ++++++-----
src/java/org/apache/cassandra/tools/Shuffle.java | 11 +++++++----
4 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39cf55a5/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39cf55a5/src/java/org/apache/cassandra/tools/Shuffle.java
----------------------------------------------------------------------