[09/12] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/655d517b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/655d517b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/655d517b Branch: refs/heads/trunk Commit: 655d517b2532fb62bca647c047f44d65bab1eb86 Parents: cf76ba3 46ef962 Author: Yuki Morishita Authored: Fri Sep 5 10:28:33 2014 -0500 Committer: Yuki Morishita Committed: Fri Sep 5 10:28:33 2014 -0500 -- --
[09/12] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: debian/init Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4dc3a6e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dc3a6e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dc3a6e3 Branch: refs/heads/trunk Commit: 4dc3a6e38ca4a4bc726e1ff4edcdd8f41c2e3fdd Parents: 86e3012 6b76975 Author: Brandon Williams Authored: Tue Aug 26 10:39:59 2014 -0500 Committer: Brandon Williams Committed: Tue Aug 26 10:39:59 2014 -0500 -- debian/init | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dc3a6e3/debian/init -- diff --cc debian/init index 4b8c2f8,3658198..00304b6 --- a/debian/init +++ b/debian/init @@@ -38,6 -38,11 +38,8 @@@ if [ -z "$JVM_OPTS" ]; the exit 3 fi -# Add JNA to EXTRA_CLASSPATH -export EXTRA_CLASSPATH="/usr/share/java/jna.jar:$EXTRA_CLASSPATH" - + export JVM_OPTS + # Export JAVA_HOME, if set. [ -n "$JAVA_HOME" ] && export JAVA_HOME
[09/12] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90c81c78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90c81c78 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90c81c78 Branch: refs/heads/cassandra-2.1 Commit: 90c81c78f58bb281001267bc297f9f2dd10cadd9 Parents: 5544ecb b44bbb8 Author: Brandon Williams Authored: Tue Jul 29 13:58:37 2014 -0500 Committer: Brandon Williams Committed: Tue Jul 29 13:58:37 2014 -0500 -- --
[09/12] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df7bd7f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df7bd7f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df7bd7f7 Branch: refs/heads/trunk Commit: df7bd7f725f6df5102730de89647418dd9f9473d Parents: d872e2c 8754809 Author: Brandon Williams Authored: Mon Jul 21 07:50:18 2014 -0500 Committer: Brandon Williams Committed: Mon Jul 21 07:50:18 2014 -0500 -- conf/cassandra-env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df7bd7f7/conf/cassandra-env.sh --
[09/12] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/545e2e1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/545e2e1c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/545e2e1c Branch: refs/heads/cassandra-2.1 Commit: 545e2e1cba16b8a84a9dcd9c2f6325c272b0f3cb Parents: 6b988fd 93c2754 Author: Jonathan Ellis Authored: Wed Jul 16 16:17:44 2014 -0500 Committer: Jonathan Ellis Committed: Wed Jul 16 16:17:44 2014 -0500 -- conf/cassandra.yaml | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/545e2e1c/conf/cassandra.yaml --
