natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-1.2' into cassandra-2.0.0 

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
This commit is contained in:
Brandon Williams 2013-08-08 13:01:40 -05:00
parent f30629b83f ccb32a8c8d
commit 8ee09f7ab3
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -1589,10 +1589,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
protected long extractExpireTime(String[] pieces)
{
if (VersionedValue.STATUS_LEFT.equals(pieces[0]))
return Long.parseLong(pieces[1]);
else
return Long.parseLong(pieces[2]);
return Long.parseLong(pieces[2]);
}
/**