You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/10/14 23:38:50 UTC

[1/6] git commit: Allow log4j-server.properties to be a symlink. Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6170

Updated Branches:
  refs/heads/cassandra-1.2 bafb96639 -> d6d35ba31
  refs/heads/cassandra-2.0 b1c60a0c0 -> 4eaca3907
  refs/heads/trunk ccbf92198 -> 5c408af2e


Allow log4j-server.properties to be a symlink.
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6170


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

Branch: refs/heads/cassandra-1.2
Commit: d6d35ba31e193cfd6f73019c3dbe97670f782e61
Parents: bafb966
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 14 16:34:49 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 14 16:35:35 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6d35ba3/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 448bb0a..5169d00 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -108,7 +108,7 @@ public class CassandraDaemon
                 File configFile = new File(configFileName);
                 // then try alternative approach which works for all hierarchical URLs with or without spaces
                 if (!configFile.exists())
-                    configFileName = new File(configLocation.toURI()).getCanonicalPath();
+                    configFileName = new File(configLocation.toURI()).getPath();
             }
             catch (Exception e)
             {

[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/cassandra-2.0
Commit: 4eaca3907ff16d996762c696ab37f9519dce4e8f
Parents: b1c60a0 d6d35ba
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 14 16:36:13 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 14 16:36:13 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4eaca390/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/CassandraDaemon.java


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

Branch: refs/heads/trunk
Commit: 5c408af2e5075b8100eb67b7549bdb1cdb57412c
Parents: ccbf921 4eaca39
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 14 16:37:16 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 14 16:37:16 2013 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------

[3/6] git commit: Allow log4j-server.properties to be a symlink. Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6170

Posted by br...@apache.org.
Allow log4j-server.properties to be a symlink.
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6170


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

Branch: refs/heads/trunk
Commit: d6d35ba31e193cfd6f73019c3dbe97670f782e61
Parents: bafb966
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 14 16:34:49 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 14 16:35:35 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6d35ba3/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 448bb0a..5169d00 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -108,7 +108,7 @@ public class CassandraDaemon
                 File configFile = new File(configFileName);
                 // then try alternative approach which works for all hierarchical URLs with or without spaces
                 if (!configFile.exists())
-                    configFileName = new File(configLocation.toURI()).getCanonicalPath();
+                    configFileName = new File(configLocation.toURI()).getPath();
             }
             catch (Exception e)
             {

[2/6] git commit: Allow log4j-server.properties to be a symlink. Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6170

Posted by br...@apache.org.
Allow log4j-server.properties to be a symlink.
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6170


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

Branch: refs/heads/cassandra-2.0
Commit: d6d35ba31e193cfd6f73019c3dbe97670f782e61
Parents: bafb966
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 14 16:34:49 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 14 16:35:35 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6d35ba3/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 448bb0a..5169d00 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -108,7 +108,7 @@ public class CassandraDaemon
                 File configFile = new File(configFileName);
                 // then try alternative approach which works for all hierarchical URLs with or without spaces
                 if (!configFile.exists())
-                    configFileName = new File(configLocation.toURI()).getCanonicalPath();
+                    configFileName = new File(configLocation.toURI()).getPath();
             }
             catch (Exception e)
             {

[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: 4eaca3907ff16d996762c696ab37f9519dce4e8f
Parents: b1c60a0 d6d35ba
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 14 16:36:13 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 14 16:36:13 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4eaca390/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------