Sandeep Tata all time


 4 Collaborator
Jonathan Ellis , Jun Rao , Michael Greene , Evan Weaver

 19 Patch  25 Review
3a35bc9113ceb408fc923ac8e212ab8724e77b47, 29515c11d799fa36706935a9352d293612a5d815, 847f3b029329729c72eb4a72f19d5efc1ca29585, 3917094f04a76878c56947e745154c708ff99632, 0c5cd149a38e927021f53ba0c109f1da15cb3546, 6c492310278bb83853542992ce9b7d523a180a9a, 6703ecffe1e9b107a946eef1bd6cb42ae82bffa4, b6858825356dab747ed44b3a59e8740213fa43cc, 3514c66221ebc4b743a3e127d507879a3503d8cb, 97c022f5ee5622420e03724efe7bdc312128bc8c, 0ae07f299eb94da8e01e9e4910eebbe00199e864, 20f7d032c7c31618ac46e5a8df8263012fbb4f58, 28e548a31c1c3941045650785bdf77239c1c09b4, 362f287c84f19ae5cdd774f2fc013db5339d49ec, 83d24602fd8718e8b6be27cb32c71fb2df0f3f36, ba7f6907f300b7ad74bd93b1ab1d61d425ab5841, 3c6fcf8d65edf361c72cf2606be2acca57a275b3, 20748a879befa65c766ec06996d80e2ac962fb21, a7d5c6506b0901716eacdf015083f171fa9851a3 d5eaa4e141ea830bbbacc7c249198e58169882e7, 7dbbca6698fdd14bae1de4a8a53a44ce21723434, 93b0b062c2e6eaa36dda8a99da196d64e5c13871, eb83251bda8caedd69d07f1f7aa8857a27f87fe9, a461792de9bf885b205686161161c2b62294be25, a0cf7036012028e18d608f8942d37fac382f8405, 986cee6806c5798c1c826d965ecadad0cfc70cc7, 8ff63a92ba833df149e323d8fee68f458a78979d, 7435fc82c05089741cd03df3679128c8fc073fe9, 0b1aeda97cf9810bef35a68e976bdff6794c44ca, 85ba194e7cfd24ba81baa68ab7d7ea901f17084a, f2da00fb0f2c92351b136ac13082b278c534c6ab, 963a1b3bfdeedeea8f93bc0ab682195119d08b72, 27d66d8269d5f52dd29b98cac0b41574291f16ad, 15955bf03e352e464b8d23c3bc763d2b93643335, 04dcee09bac42de8f85d28d513776518755e4834, d52a1109745a147c5d623f68bd2bcc9735cc286e, 5964cd4c0453866328208574213492fa87e738c9, 97fc5cb8ef412b6ba145165e45be3e3c64229685, 2b0b61a7b046af305e41fe109ded48bc4b4a0b26, 20dfd0682bcd163569e8bfa87ca0b1e21278ef65, 1e15ccf5c95e1b1690d7e0c1c595f6c9ccb29950, 1228ec0c67892b61d4fac02db59488d9a6580f44, cb7cacfea70bdba83c3ff8406054c826a47be832, 040bfd4c2903778c27093184a99fdd367810373a

d5eaa4e141ea830bbbacc7c249198e58169882e7 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-10-21 14:18:24+00:00

    Make EndPoint objects immmutable, so hashcode can't change (making the EndPoint potentially disappear from a map)
    patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-497
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828030 13f79535-47bb-0310-9956-ffa450edef68

7dbbca6698fdd14bae1de4a8a53a44ce21723434 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-10-21 14:18:18+00:00

    make write targets computable independent of replication strategy (i.e., make getReadStorageEndPoints the only method a Strategy needs to implement).  we do this by computing the token/endpoint -> Range[] map from the read endpoints, then using that to determine if a bootstrapping node needs to receive a write (if the token being written falls in any of its ranges).  Also, make the StorageProxy insert methods aware that bootstrap can entail having extra write targets temporarily, and include those in its consistencylevel calculations.
    patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-497
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828029 13f79535-47bb-0310-9956-ffa450edef68

93b0b062c2e6eaa36dda8a99da196d64e5c13871 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-10-21 14:18:09+00:00

    rename nodePicker -> replicationStrategy.
    patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-497
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828028 13f79535-47bb-0310-9956-ffa450edef68

3a35bc9113ceb408fc923ac8e212ab8724e77b47 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-09-24 19:55:10+00:00

    CommitLog and Table.apply/applyNow/load paths use RMs directly instead of converting to Rows first.  patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-456
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@818607 13f79535-47bb-0310-9956-ffa450edef68

eb83251bda8caedd69d07f1f7aa8857a27f87fe9 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-08-31 13:35:46+00:00

    r/m unnecessary IReplicationStrategy interface.  r/m LoadVerbHandler and unused endpoint-related code.  rename AbstractStrategy -> AbstractReplicationStrategy and getEndpoint methods.
    patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-393
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809586 13f79535-47bb-0310-9956-ffa450edef68

29515c11d799fa36706935a9352d293612a5d815 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-08-28 03:05:49+00:00

    call doAntiCompaction in the tests the same way we do in the actual code -- by submitting it to the MinorCompactionManager so it serializes with other compaction tasks.  patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-395
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808742 13f79535-47bb-0310-9956-ffa450edef68

847f3b029329729c72eb4a72f19d5efc1ca29585 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-08-26 19:04:07+00:00

    1. Switch bootstrapNodes in TokenMetadata to Map<Token,EndPoint> so RackUnawareStrategy can use it.
    2. Fix AbstractStrategy and RackUnawareStrategy to incorporate the bootstrapping nodes for
    getHintedStorageEndPoints through StorageService.getNStorageEndPointMap (now used by insert and
    insertBlocking after 383)
    3. Add unit test fot RackUnawareStrategy to test if bootstrapping nodes are being returned correctly.
    
    patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-375
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808161 13f79535-47bb-0310-9956-ffa450edef68

3917094f04a76878c56947e745154c708ff99632 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-08-24 16:49:21+00:00

    allow blocking write to create hints if not enough of the "correct" nodes are live, but enough are to fulfil the requested consistency level.  patch by Sandeep Tata; reviewed by jbellis and Michael Greene for CASSANDRA-383
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@807305 13f79535-47bb-0310-9956-ffa450edef68

0c5cd149a38e927021f53ba0c109f1da15cb3546 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-08-19 20:51:06+00:00

    Add "bootstrap mode" to node startup.  This causes the node to tell the
    nodes that have data it needs to send it the data, and not otherwise
    participate in reads or writes until the bootstrap is complete.
    patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-195
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@805968 13f79535-47bb-0310-9956-ffa450edef68

a461792de9bf885b205686161161c2b62294be25 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-08-11 20:34:21+00:00

    Move CFSerializer into its own file.  Rename deserializeEmpty to deserializeFromSSTableNoColumns; add serializeForSSTable and serializeWithIndexes to do the without-metadata serialization.  Add SSTableReader.makeColumnFamily to create the CF skeleton w/o reading any data.
    patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-233
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@803284 13f79535-47bb-0310-9956-ffa450edef68

6c492310278bb83853542992ce9b7d523a180a9a | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-08-03 20:59:32+00:00

    Bootstrap code + tests.  Patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-213
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@800561 13f79535-47bb-0310-9956-ffa450edef68

6703ecffe1e9b107a946eef1bd6cb42ae82bffa4 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-08-03 16:03:15+00:00

    forgot SSTable part of last.
    patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-213
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@800442 13f79535-47bb-0310-9956-ffa450edef68

b6858825356dab747ed44b3a59e8740213fa43cc | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-08-03 16:01:00+00:00

    renames and cleanup for bootstrap-related code.
    patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-213
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@800440 13f79535-47bb-0310-9956-ffa450edef68

a0cf7036012028e18d608f8942d37fac382f8405 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-07-21 01:37:00+00:00

    r/m tests that won't pass until we do #303.
    patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796109 13f79535-47bb-0310-9956-ffa450edef68

986cee6806c5798c1c826d965ecadad0cfc70cc7 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-07-21 01:36:52+00:00

    change String column names to byte[] to allow user-defined ordering.
    patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796108 13f79535-47bb-0310-9956-ffa450edef68

8ff63a92ba833df149e323d8fee68f458a78979d | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-07-21 01:36:10+00:00

    r/m time-sorted columns.
    patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796107 13f79535-47bb-0310-9956-ffa450edef68

7435fc82c05089741cd03df3679128c8fc073fe9 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-07-21 01:35:47+00:00

    introduce column() compatibility layer to make writing tests a little less verbose.
    patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796106 13f79535-47bb-0310-9956-ffa450edef68

0b1aeda97cf9810bef35a68e976bdff6794c44ca | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-07-15 22:04:57+00:00

    missed one: rename column.column_name -> column.name
    patch by jbellis; reviewed by Evan Weaver and Sandeep Tata for CASSANDRA-139
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794431 13f79535-47bb-0310-9956-ffa450edef68

85ba194e7cfd24ba81baa68ab7d7ea901f17084a | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-07-15 22:04:51+00:00

    update system tests; fix get_column_count
    patch by jbellis; reviewed by Evan Weaver and Sandeep Tata for CASSANDRA-139
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794430 13f79535-47bb-0310-9956-ffa450edef68

f2da00fb0f2c92351b136ac13082b278c534c6ab | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-07-15 22:04:43+00:00

    thrift changes to remove : api.
    use ColumnPath, ColumnParent, etc. structs to encapsulate optional SuperColumns (and occasionally, optional Columns).
    patch by jbellis; reviewed by Evan Weaver and Sandeep Tata for CASSANDRA-139
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794429 13f79535-47bb-0310-9956-ffa450edef68

963a1b3bfdeedeea8f93bc0ab682195119d08b72 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-06-25 21:07:45+00:00

    add tests for supercolumnfamily removal; fix bugs.
    (both the assert removal and the "if" removal are bug fixes.)
    
    patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-255
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788511 13f79535-47bb-0310-9956-ffa450edef68

27d66d8269d5f52dd29b98cac0b41574291f16ad | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-06-25 21:07:35+00:00

    add asserts.  patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-255
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788510 13f79535-47bb-0310-9956-ffa450edef68

15955bf03e352e464b8d23c3bc763d2b93643335 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-06-18 20:17:29+00:00

    minor cleanup of Row code.  patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-199
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786242 13f79535-47bb-0310-9956-ffa450edef68

3514c66221ebc4b743a3e127d507879a3503d8cb | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-06-11 15:14:55+00:00

    add system test for slice_by_name_range.  patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-53
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@783812 13f79535-47bb-0310-9956-ffa450edef68

04dcee09bac42de8f85d28d513776518755e4834 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-05-28 21:15:24+00:00

    r/m Row.getColumnFamilyMap.  replaced with Row.getColumnFamily or .getColumnFamilies as appropriate.
    patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-198
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779773 13f79535-47bb-0310-9956-ffa450edef68

97c022f5ee5622420e03724efe7bdc312128bc8c | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-05-26 20:23:16+00:00

    short circuits sending a message if the mutation's destination is the local node.  does not implement hint handling; takes the full message route if hints are involved.  patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-132
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@778871 13f79535-47bb-0310-9956-ffa450edef68

0ae07f299eb94da8e01e9e4910eebbe00199e864 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-05-19 15:51:10+00:00

    add block_for parameter to insert calls.  patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-154
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@776365 13f79535-47bb-0310-9956-ffa450edef68

d52a1109745a147c5d623f68bd2bcc9735cc286e | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-05-15 21:37:45+00:00

    check for enough endpoints before starting a quorum wait.
    patch by jbellis; reviewed by Jun Rao and Sandeep Tata for CASSANDRA-180
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775361 13f79535-47bb-0310-9956-ffa450edef68

20f7d032c7c31618ac46e5a8df8263012fbb4f58 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-05-15 20:18:55+00:00

    add get_slice_by_name_range command.  patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-53
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775308 13f79535-47bb-0310-9956-ffa450edef68

5964cd4c0453866328208574213492fa87e738c9 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-05-12 15:26:52+00:00

    extract tests that could conflict with each other to a separate test class (= gets own jvm)
    patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-162
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773941 13f79535-47bb-0310-9956-ffa450edef68

97fc5cb8ef412b6ba145165e45be3e3c64229685 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-05-12 15:26:38+00:00

    migrate to JUnit 4.6.  patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-162
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773940 13f79535-47bb-0310-9956-ffa450edef68

28e548a31c1c3941045650785bdf77239c1c09b4 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-05-06 00:35:33+00:00

    initialize configFileName_.  patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-129
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772020 13f79535-47bb-0310-9956-ffa450edef68

362f287c84f19ae5cdd774f2fc013db5339d49ec | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-05-05 22:47:22+00:00

    refactor IColumn.addColumn to remove redundant name parameter.  patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-96
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772000 13f79535-47bb-0310-9956-ffa450edef68

83d24602fd8718e8b6be27cb32c71fb2df0f3f36 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-04-24 02:58:24+00:00

    Simplify default storage-conf.xml.  patch by Sandeep Tata; reviewed by jbellis for #99
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@768135 13f79535-47bb-0310-9956-ffa450edef68

ba7f6907f300b7ad74bd93b1ab1d61d425ab5841 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-04-24 00:52:09+00:00

    avoid clearing out memtable during flush since it can still be accessed as a
    'historial' MT.  clearing during flush can lead to client seeing old data, if the
    clear is done before the sstable is completely written (so the next thing to be
    checked will be an old sstable).
    patch by Sandeep Tata; reviewed by jbellis for #98.
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@768111 13f79535-47bb-0310-9956-ffa450edef68

3c6fcf8d65edf361c72cf2606be2acca57a275b3 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-04-22 22:54:14+00:00

    fix get_slice to not ignore the "start" parameter.  patch by Sandeep Tata; reviewed by jbellis for #81
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@767703 13f79535-47bb-0310-9956-ffa450edef68

20748a879befa65c766ec06996d80e2ac962fb21 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-04-21 03:06:01+00:00

    allow SuperColumn.getSubColumn to return null.  patch by Sandeep Tata; reviewed by jbellis for #91
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@766961 13f79535-47bb-0310-9956-ffa450edef68

2b0b61a7b046af305e41fe109ded48bc4b4a0b26 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-04-17 01:48:58+00:00

    waitForFlush -> forceBlockingFlush.  ServerTest.cleanup now flushes and cleans out
    all ColumnFamilyStores and commitlog, allowing remove tests to not step on each
    others' toes (all tests pass now).
    
    patch by jbellis; reviewed by Sandeep Tata for #85
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765831 13f79535-47bb-0310-9956-ffa450edef68

20dfd0682bcd163569e8bfa87ca0b1e21278ef65 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-04-17 01:48:50+00:00

    use isSuper instead of DatabaseDescriptor.getColumnType.
    patch by jbellis; reviewed by Sandeep Tata for #85
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765830 13f79535-47bb-0310-9956-ffa450edef68

1e15ccf5c95e1b1690d7e0c1c595f6c9ccb29950 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-04-17 01:48:39+00:00

    refactor CFS constructor to not depend on DatabaseDescriptor.
    patch by jbellis; reviewed by Sandeep Tata for #85
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765829 13f79535-47bb-0310-9956-ffa450edef68

1228ec0c67892b61d4fac02db59488d9a6580f44 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-04-17 01:48:31+00:00

    add testRemoveColumnFamily, testRemoveSubColumn.  (these do not pass yet b/c of
    cleanup problems.)  patch by jbellis; reviewed by Sandeep Tata for #85
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765828 13f79535-47bb-0310-9956-ffa450edef68

cb7cacfea70bdba83c3ff8406054c826a47be832 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-04-16 02:09:24+00:00

    generate supercolumn tombstone when a 2-tuple delete is passed to a super CF.
    patch by jbellis; reviewed by Sandeep Tata for #84
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765451 13f79535-47bb-0310-9956-ffa450edef68

040bfd4c2903778c27093184a99fdd367810373a | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-04-16 02:09:18+00:00

    make remove test code use the same api that the thrift interface does.  patch by
    jbellis; reviewed by Sandeep Tata for #84
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765450 13f79535-47bb-0310-9956-ffa450edef68

a7d5c6506b0901716eacdf015083f171fa9851a3 | Author: Jonathan Ellis <jbellis@apache.org>
 | 2009-04-10 02:34:17+00:00

    Remove unused method CF.merge and add more tests to ColumnFamilyTest.  patch by Sandeep Tata; review by jbellis for #69
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@763859 13f79535-47bb-0310-9956-ffa450edef68