Commits

Yuki Morishita  committed 34f0852 Merge with conflicts

Merge branch 'cassandra-1.2' into trunk

Conflicts:
CHANGES.txt

  • Participants
  • Parent commits b7ba0a9, 7752f01

Comments (0)

Files changed (2)

  * replace supercolumns internally by composites (CASSANDRA-3237, 5123)
  * upgrade thrift to 0.9.0 (CASSANDRA-3719)
 
+1.2.2
+ * fix symlinks under data dir not working (CASSANDRA-5185)
+
+
 1.2.1
  * stream undelivered hints on decommission (CASSANDRA-5128)
  * GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133)

File src/java/org/apache/cassandra/db/Directories.java

     {
         for (File dir : sstableDirectories)
         {
-            if (FileUtils.getCanonicalPath(dir).startsWith(FileUtils.getCanonicalPath(dataDirectory)))
+            if (dir.getAbsolutePath().startsWith(dataDirectory.getAbsolutePath()))
                 return dir;
         }
         return null;