cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [4/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Sun, 23 Mar 2014 02:27:32 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/tools/NodeCmd.java


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

Branch: refs/heads/cassandra-2.1
Commit: fbc112d4b59ed5ade94f5f13dc55448784e1c3ed
Parents: e955016 b7231ff
Author: Vijay <vijay2win@gmail.com>
Authored: Sat Mar 22 19:27:17 2014 -0700
Committer: Vijay <vijay2win@gmail.com>
Committed: Sat Mar 22 19:27:17 2014 -0700

----------------------------------------------------------------------
 bin/cassandra.in.sh                             |  2 +-
 conf/commitlog_archiving.properties             |  2 +-
 .../org/apache/cassandra/tools/NodeTool.java    | 43 +++++++++-----------
 3 files changed, 21 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbc112d4/bin/cassandra.in.sh
----------------------------------------------------------------------
diff --cc bin/cassandra.in.sh
index 26170ac,29e0d0e..1212418
--- a/bin/cassandra.in.sh
+++ b/bin/cassandra.in.sh
@@@ -44,5 -44,5 +44,5 @@@ don
  if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
        || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
  then
 -    JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
 -fi
 +    JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.6.jar"
- fi
++fi

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbc112d4/conf/commitlog_archiving.properties
----------------------------------------------------------------------
diff --cc conf/commitlog_archiving.properties
index 0687cd6,0687cd6..ad74a51
--- a/conf/commitlog_archiving.properties
+++ b/conf/commitlog_archiving.properties
@@@ -54,4 -54,4 +54,4 @@@ restore_directories
  restore_point_in_time=
  
  # precision of the timestamp used in the inserts (MILLISECONDS, MICROSECONDS, ...)
--precision=MICROSECONDS
++precision=MICROSECONDS


Mime
View raw message