Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ee09f7a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ee09f7a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ee09f7a
Branch: refs/heads/trunk
Commit: 8ee09f7ab37bfd1cd8c3a09c8e0844d1fa6dfca2
Parents: f30629b ccb32a8
Author: Brandon Williams <[email protected]>
Authored: Thu Aug 8 13:01:40 2013 -0500
Committer: Brandon Williams <[email protected]>
Committed: Thu Aug 8 13:01:40 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ee09f7a/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 58a0634,588777b..a23db0c
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1587,12 -1646,19 +1587,9 @@@ public class StorageService extends Not
}
}
- protected long extractExpireTime(String[] pieces, int version)
+ protected long extractExpireTime(String[] pieces)
{
- if (VersionedValue.STATUS_LEFT.equals(pieces[0]))
- return Long.parseLong(pieces[1]);
- else
- return Long.parseLong(pieces[2]);
- if (version < MessagingService.VERSION_12)
- {
- if (pieces.length >= 3)
- return Long.parseLong(pieces[2]);
- else
- return 0L;
- }
- else
- {
- return Long.parseLong(pieces[2]);
- }
++ return Long.parseLong(pieces[2]);
}
/**
