GitHub user jasonrutherglen opened a pull request: https://github.com/apache/cassandra/pull/24
3578 3 You can merge this pull request into a Git repository by running: $ git pull https://github.com/jbellis/cassandra 3578-3 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cassandra/pull/24.patch ---- commit 4d80fa508bd8b1eecd24f15018569ea12c264ffb Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-27T20:54:38Z bes commit 7e9bdbe5f2a55f72556ef0737f6012e1ddd460b9 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-27T20:56:47Z inline commit dbc3411211656cda4294c12d81edb12a5225d4d5 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-27T21:31:15Z replace flag w/ polymorphism commit ba4652bbd771178a108f6b2f3fe15c3c4a5d3096 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-27T21:52:18Z CLS no longer resembles an ExecutorService so rename + cleanup commit 7dfd91b8a201ddd0c77e47541a380caa1c7ce018 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-27T22:21:29Z simplify waitForSyncToCatchUp commit 8ecc8e0c5053b0cd4fa9c2bd9739996abd7c92ff Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-27T22:53:10Z use Guava's SameThreadES commit ffb02f29333b0fb8b47bf936de302f7414097570 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-27T23:17:14Z cleanup commit f0e59058665f39e74f3f018d4111a1a491c95cca Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-27T23:50:27Z imports commit 0522692a781eebe9a57c099cae6700c808699860 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-28T21:47:52Z rename CLA -> CLSegmentManager commit e8619bdcdcdd7c96c141ab32ac4675d6f248ea6a Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-29T04:26:52Z cleanup commit cdd982694c08bdb8f0565ce8f009f188dbade0f7 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-29T04:27:25Z fix have-we-flushed-enough check commit a8cd0081867ef819f74196252f2d537d4b953c2d Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-29T04:46:19Z move how-much-to-flush logic into caller instead of mutually exclusive flags commit 01dab930bf36a1cf3488b3e25ec6d0bc164f9a4a Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-29T05:00:06Z simplify flushDataFrom (acquiring switchlock on CLSM thread will no not risk deadlock) commit 11cc9827f834ae2b572180be64a03868f7a83366 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-29T16:26:17Z fix segmentsToRecycle -> activeSegments commit 349cc9ce0c4f511714c89cecaeb1f4e862aebf24 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-29T16:49:39Z cleanup / comment commit 8dc62cf25d0d5a5ead00598250fa832793e28efc Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-30T18:08:32Z fix switchlock deadlock commit 5401ede2190f5357f90d7bea74ccecdb834e7279 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-30T18:35:08Z fix RAF leak on recycle commit 338e1290d177a0ba3e193fea16fe84dbc091265e Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-30T18:44:14Z simplify away flag to discard/delete commit 510b1d3829ad3da9680eb1f314c822ec7a55c0d7 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-11-30T18:47:35Z whitespace/typo commit 45c6a4930afd9744a19bf1516499f77c8daa24e8 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-12-01T00:09:42Z we actually allow resizing old segments that don't match the current configured size commit c8a398c20f552a1aca86f691807635f0fdbb7f64 Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-12-01T02:13:26Z rename lastSyncMarkerPosition commit 67ad0c86f5b3d188cdd2c753b2abed120875612c Author: Jonathan Ellis <jbel...@apache.org> Date: 2013-12-01T02:17:42Z comment uses of isFullySynced ----