• Home
  • History
  • Annotate
  • only in /external/chromium_org/net/disk_cache/
History log of /external/chromium_org/net/disk_cache/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
ackend_unittest.cc
lockfile/backend_impl.cc
lockfile/backend_impl.h
lockfile/backend_impl_v3.cc
lockfile/backend_impl_v3.h
lockfile/backend_worker_v3.cc
lockfile/block_bitmaps_v3.cc
lockfile/block_files.cc
lockfile/block_files_unittest.cc
lockfile/in_flight_backend_io.cc
lockfile/in_flight_backend_io.h
lockfile/index_table_v3.cc
lockfile/rankings.cc
lockfile/rankings.h
ache_creator.cc
ache_util.cc
ache_util_posix.cc
ache_util_unittest.cc
isk_cache.h
isk_cache_test_base.cc
isk_cache_test_base.h
ntry_unittest.cc
emory/mem_backend_impl.cc
emory/mem_backend_impl.h
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_index.cc
imple/simple_index.h
imple/simple_index_file.cc
imple/simple_index_file_unittest.cc
imple/simple_synchronous_entry.cc
imple/simple_util.cc
imple/simple_version_upgrade.cc
imple/simple_version_upgrade_unittest.cc
racing/tracing_cache_backend.cc
racing/tracing_cache_backend.h
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
ackend_unittest.cc
lockfile/backend_impl.cc
lockfile/backend_impl.h
lockfile/backend_impl_v3.cc
lockfile/backend_impl_v3.h
lockfile/backend_worker_v3.cc
lockfile/backend_worker_v3.h
lockfile/disk_cache_perftest.cc
lockfile/in_flight_backend_io.cc
lockfile/in_flight_backend_io.h
lockfile/in_flight_io.cc
lockfile/in_flight_io.h
ache_creator.cc
isk_cache.h
isk_cache_test_base.cc
isk_cache_test_util.cc
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_entry_impl.cc
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_file_unittest.cc
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
imple/simple_entry_impl.cc
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
ackend_unittest.cc
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
lockfile/entry_impl.cc
lockfile/mapped_file_posix.cc
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
lockfile/webfonts_histogram.cc
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
lockfile/backend_impl.cc
lockfile/eviction.cc
lockfile/stress_cache.cc
lockfile/webfonts_histogram.cc
lockfile/webfonts_histogram.h
imple/simple_index.cc
imple/simple_index.h
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
ackend_unittest.cc
lockfile/histogram_macros.h
lockfile/stats.cc
lockfile/stats.h
lockfile/stats_histogram.cc
lockfile/stats_histogram.h
isk_cache.h
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
lockfile/backend_impl.cc
lockfile/block_files.cc
lockfile/file.h
lockfile/file_ios.cc
lockfile/file_posix.cc
lockfile/file_win.cc
isk_cache_test_util.cc
ntry_unittest.cc
imple/simple_index_unittest.cc
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
lockfile/backend_impl.cc
lockfile/block_files.cc
lockfile/mapped_file.cc
lockfile/mapped_file.h
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
ackend_unittest.cc
lockfile/backend_impl_v3.h
lockfile/backend_worker_v3.cc
lockfile/backend_worker_v3.h
ache_creator.cc
imple/simple_histogram_macros.h
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
lockfile/histogram_macros.h
lockfile/histogram_macros_v3.h
imple/simple_util.cc
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
ddr.cc
ddr.h
ddr_unittest.cc
ackend_impl.cc
ackend_impl.h
ackend_unittest.cc
itmap.cc
itmap.h
itmap_unittest.cc
lock_files.cc
lock_files.h
lock_files_unittest.cc
lockfile/addr.cc
lockfile/addr.h
lockfile/addr_unittest.cc
lockfile/backend_impl.cc
lockfile/backend_impl.h
lockfile/backend_impl_v3.cc
lockfile/backend_impl_v3.h
lockfile/backend_worker_v3.cc
lockfile/backend_worker_v3.h
lockfile/bitmap.cc
lockfile/bitmap.h
lockfile/bitmap_unittest.cc
lockfile/block_bitmaps_v3.cc
lockfile/block_bitmaps_v3.h
lockfile/block_bitmaps_v3_unittest.cc
lockfile/block_files.cc
lockfile/block_files.h
lockfile/block_files_unittest.cc
lockfile/disk_cache_perftest.cc
lockfile/disk_format.cc
lockfile/disk_format.h
lockfile/disk_format_base.h
lockfile/disk_format_v3.h
lockfile/entry_impl.cc
lockfile/entry_impl.h
lockfile/entry_impl_v3.cc
lockfile/entry_impl_v3.h
lockfile/errors.h
lockfile/eviction.cc
lockfile/eviction.h
lockfile/eviction_v3.cc
lockfile/eviction_v3.h
lockfile/experiments.h
lockfile/file.cc
lockfile/file.h
lockfile/file_block.h
lockfile/file_ios.cc
lockfile/file_lock.cc
lockfile/file_lock.h
lockfile/file_posix.cc
lockfile/file_win.cc
lockfile/histogram_macros.h
lockfile/histogram_macros_v3.h
lockfile/in_flight_backend_io.cc
lockfile/in_flight_backend_io.h
lockfile/in_flight_io.cc
lockfile/in_flight_io.h
lockfile/index_table_v3.cc
lockfile/index_table_v3.h
lockfile/index_table_v3_unittest.cc
lockfile/mapped_file.cc
lockfile/mapped_file.h
lockfile/mapped_file_avoid_mmap_posix.cc
lockfile/mapped_file_posix.cc
lockfile/mapped_file_unittest.cc
lockfile/mapped_file_win.cc
lockfile/rankings.cc
lockfile/rankings.h
lockfile/sparse_control.cc
lockfile/sparse_control.h
lockfile/sparse_control_v3.cc
lockfile/sparse_control_v3.h
lockfile/stats.cc
lockfile/stats.h
lockfile/stats_histogram.cc
lockfile/stats_histogram.h
lockfile/storage_block-inl.h
lockfile/storage_block.h
lockfile/storage_block_unittest.cc
lockfile/stress_cache.cc
lockfile/stress_support.h
lockfile/trace.cc
lockfile/trace.h
ache_creator.cc
ache_util.cc
isk_cache_perftest.cc
isk_cache_test_base.cc
isk_cache_test_util.cc
isk_format.cc
isk_format.h
isk_format_base.h
ntry_impl.cc
ntry_impl.h
ntry_unittest.cc
rrors.h
viction.cc
viction.h
xperiments.h
ile.cc
ile.h
ile_block.h
ile_ios.cc
ile_lock.cc
ile_lock.h
ile_posix.cc
ile_win.cc
lash/flash_cache_test_base.cc
lash/flash_cache_test_base.h
lash/flash_entry_impl.cc
lash/flash_entry_impl.h
lash/format.h
lash/internal_entry.cc
lash/internal_entry.h
lash/log_store.cc
lash/log_store.h
lash/log_store_entry.cc
lash/log_store_entry.h
lash/log_store_entry_unittest.cc
lash/log_store_unittest.cc
lash/segment.cc
lash/segment.h
lash/segment_unittest.cc
lash/storage.cc
lash/storage.h
lash/storage_unittest.cc
istogram_macros.h
n_flight_backend_io.cc
n_flight_backend_io.h
n_flight_io.cc
n_flight_io.h
apped_file.cc
apped_file.h
apped_file_avoid_mmap_posix.cc
apped_file_posix.cc
apped_file_unittest.cc
apped_file_win.cc
em_backend_impl.cc
em_backend_impl.h
em_entry_impl.cc
em_entry_impl.h
em_rankings.cc
em_rankings.h
emory/mem_backend_impl.cc
emory/mem_backend_impl.h
emory/mem_entry_impl.cc
emory/mem_entry_impl.h
emory/mem_rankings.cc
emory/mem_rankings.h
ankings.cc
ankings.h
imple/simple_entry_impl.cc
imple/simple_index.cc
imple/simple_index.h
imple/simple_index_file.cc
imple/simple_index_file_unittest.cc
imple/simple_test_util.cc
imple/simple_version_upgrade_unittest.cc
parse_control.cc
parse_control.h
tats.cc
tats.h
tats_histogram.cc
tats_histogram.h
torage_block-inl.h
torage_block.h
torage_block_unittest.cc
tress_cache.cc
tress_support.h
race.cc
race.h
racing/tracing_cache_backend.cc
racing/tracing_cache_backend.h
racing_cache_backend.cc
racing_cache_backend.h
3/backend_impl_v3.cc
3/backend_impl_v3.h
3/backend_worker.cc
3/backend_worker.h
3/block_bitmaps.cc
3/block_bitmaps.h
3/block_bitmaps_unittest.cc
3/disk_format_v3.h
3/entry_impl_v3.cc
3/entry_impl_v3.h
3/eviction_v3.cc
3/eviction_v3.h
3/histogram_macros.h
3/index_table.cc
3/index_table.h
3/index_table_unittest.cc
3/sparse_control_v3.cc
3/sparse_control_v3.h
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
ddr.h
ackend_impl.cc
ackend_impl.h
ackend_unittest.cc
lock_files.cc
isk_format_base.h
ntry_impl.cc
ntry_unittest.cc
viction.cc
ile.h
ile_ios.cc
ile_posix.cc
ile_win.cc
lash/storage.cc
lash/storage.h
istogram_macros.h
n_flight_backend_io.cc
ankings.cc
imple/simple_backend_impl.cc
imple/simple_index_file.cc
imple/simple_index_file_unittest.cc
imple/simple_synchronous_entry.cc
imple/simple_synchronous_entry.h
imple/simple_test_util.cc
imple/simple_util.cc
imple/simple_util.h
imple/simple_version_upgrade.cc
parse_control.cc
tress_cache.cc
3/backend_impl_v3.cc
3/backend_impl_v3.h
3/backend_worker.cc
3/disk_format_v3.h
3/entry_impl_v3.cc
3/entry_impl_v3.h
3/eviction_v3.cc
3/eviction_v3.h
3/histogram_macros.h
3/index_table.cc
3/index_table.h
3/index_table_unittest.cc
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
ackend_impl.cc
ackend_unittest.cc
lock_files_unittest.cc
ache_util_posix.cc
ache_util_unittest.cc
ntry_unittest.cc
ile_posix.cc
imple/simple_backend_impl.cc
imple/simple_index_file.cc
imple/simple_index_file_unittest.cc
imple/simple_util.cc
3/backend_worker.cc
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
ackend_impl.cc
ackend_impl.h
ackend_unittest.cc
lock_files.cc
ache_util.cc
ache_util.h
em_backend_impl.cc
imple/simple_backend_impl.cc
imple/simple_histogram_macros.h
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
ackend_impl.cc
ache_creator.cc
ntry_unittest.cc
imple/simple_entry_format.cc
imple/simple_entry_format.h
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_entry_operation.cc
imple/simple_entry_operation.h
imple/simple_synchronous_entry.cc
imple/simple_synchronous_entry.h
imple/simple_util.cc
imple/simple_util.h
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
ackend_unittest.cc
ache_creator.cc
imple/simple_index_file_unittest.cc
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
ackend_impl.cc
ntry_unittest.cc
imple/simple_entry_impl.cc
imple/simple_index_file.h
imple/simple_index_unittest.cc
imple/simple_net_log_parameters.h
imple/simple_synchronous_entry.cc
imple/simple_synchronous_entry.h
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
ackend_unittest.cc
ache_creator.cc
ntry_unittest.cc
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_entry_impl.cc
imple/simple_index.cc
imple/simple_index.h
imple/simple_index_delegate.h
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_file_unittest.cc
imple/simple_index_unittest.cc
imple/simple_synchronous_entry.cc
imple/simple_synchronous_entry.h
imple/simple_version_upgrade_unittest.cc
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
ackend_impl.cc
ackend_unittest.cc
lock_files.cc
lock_files.h
isk_cache_perftest.cc
isk_cache_test_base.cc
isk_format_base.h
ntry_unittest.cc
istogram_macros.h
em_entry_impl.h
imple/simple_backend_impl.cc
imple/simple_backend_version.h
imple/simple_entry_format.h
imple/simple_entry_format_history.h
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_file_unittest.cc
imple/simple_synchronous_entry.cc
imple/simple_synchronous_entry.h
imple/simple_test_util.cc
imple/simple_util.cc
imple/simple_util.h
imple/simple_version_upgrade.cc
imple/simple_version_upgrade.h
imple/simple_version_upgrade_unittest.cc
3/block_bitmaps.cc
3/block_bitmaps.h
3/block_bitmaps_unittest.cc
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
ackend_impl.cc
ackend_unittest.cc
isk_cache_test_base.cc
ntry_unittest.cc
ile.h
ile_posix.cc
ile_win.cc
apped_file.cc
apped_file.h
apped_file_avoid_mmap_posix.cc
apped_file_posix.cc
apped_file_unittest.cc
apped_file_win.cc
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_entry_operation.cc
imple/simple_entry_operation.h
imple/simple_histogram_macros.h
imple/simple_index.cc
imple/simple_index.h
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_file_unittest.cc
imple/simple_index_unittest.cc
imple/simple_synchronous_entry.cc
imple/simple_synchronous_entry.h
imple/simple_util.cc
imple/simple_util.h
imple/simple_util_unittest.cc
tats.cc
tats_histogram.cc
tats_histogram.h
torage_block-inl.h
torage_block.h
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
ackend_unittest.cc
lock_files.cc
isk_cache_perftest.cc
isk_cache_test_base.cc
ntry_unittest.cc
imple/simple_backend_impl.cc
imple/simple_index.cc
imple/simple_index.h
imple/simple_index_file.cc
imple/simple_index_file_unittest.cc
imple/simple_index_unittest.cc
imple/simple_synchronous_entry.cc
imple/simple_util.cc
imple/simple_util.h
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
ackend_unittest.cc
ntry_unittest.cc
imple/simple_backend_impl.cc
imple/simple_entry_impl.cc
imple/simple_index.cc
imple/simple_index.h
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_file_posix.cc
imple/simple_index_file_win.cc
imple/simple_index_unittest.cc
imple/simple_synchronous_entry.cc
imple/simple_test_util.cc
imple/simple_test_util.h
imple/simple_util.cc
imple/simple_util.h
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
imple/simple_index.cc
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_unittest.cc
imple/simple_util.cc
imple/simple_util.h
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_entry_operation.cc
imple/simple_entry_operation.h
2385ea399aae016c0806a4f9ef3c9cfe3d2a39df 06-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r215849

This commit was generated by merge_to_master.py.

Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4
imple/simple_backend_impl.cc
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_net_log_parameters.cc
imple/simple_net_log_parameters.h
imple/simple_synchronous_entry.cc
imple/simple_synchronous_entry.h
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
ackend_unittest.cc
ache_creator.cc
isk_cache.h
isk_cache_perftest.cc
isk_cache_test_base.cc
isk_cache_test_base.h
ntry_unittest.cc
em_backend_impl.cc
em_backend_impl.h
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_index.h
imple/simple_index_file.cc
imple/simple_synchronous_entry.cc
imple/simple_synchronous_entry.h
racing_cache_backend.cc
racing_cache_backend.h
558790d6acca3451cf3a6b497803a5f07d0bec58 30-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1
ackend_impl.cc
ackend_unittest.cc
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_index.cc
imple/simple_index.h
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_file_unittest.cc
imple/simple_index_unittest.cc
tats.cc
bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 25-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213605

This commit was generated by merge_to_master.py.

Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
ackend_unittest.cc
isk_cache.h
ntry_unittest.cc
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_index.cc
imple/simple_index.h
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_file_unittest.cc
imple/simple_index_unittest.cc
imple/simple_synchronous_entry.cc
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
tress_cache.cc
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
ackend_impl.cc
ackend_unittest.cc
imple/simple_entry_format.h
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 18-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
ackend_impl.cc
ache_util.cc
ache_util_posix.cc
ache_util_unittest.cc
ache_util_win.cc
isk_cache_test_util.h
ntry_impl.cc
viction.cc
ile_win.cc
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_index.cc
parse_control.cc
tress_cache.cc
3/backend_impl_v3.cc
3/backend_worker.cc
3/entry_impl_v3.cc
3/eviction_v3.cc
3/sparse_control_v3.cc
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
ackend_unittest.cc
ache_util.cc
ache_util_posix.cc
ache_util_unittest.cc
isk_cache_test_base.cc
isk_cache_test_base.h
isk_cache_test_util.cc
isk_cache_test_util.h
ntry_unittest.cc
apped_file.h
apped_file_avoid_mmap_posix.cc
apped_file_unittest.cc
imple/OWNERS
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_file_unittest.cc
imple/simple_net_log_parameters.cc
imple/simple_net_log_parameters.h
imple/simple_synchronous_entry.cc
imple/simple_test_util.cc
imple/simple_test_util.h
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
ddr.cc
ddr.h
ddr_unittest.cc
ackend_impl.cc
ackend_impl.h
ackend_unittest.cc
lock_files.cc
lock_files.h
ache_util_posix.cc
ache_util_unittest.cc
isk_cache.h
isk_cache_perftest.cc
isk_cache_test_util.h
ntry_impl.cc
ntry_unittest.cc
viction.cc
lash/flash_cache_test_base.cc
n_flight_backend_io.h
apped_file.cc
ankings.cc
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_index.cc
imple/simple_index.h
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_file_unittest.cc
imple/simple_index_unittest.cc
imple/simple_synchronous_entry.cc
imple/simple_synchronous_entry.h
imple/simple_util.cc
parse_control.cc
tats_histogram.cc
tats_histogram.h
tress_cache.cc
3/backend_impl_v3.cc
3/backend_impl_v3.h
3/backend_worker.cc
3/backend_worker.h
3/block_bitmaps.cc
3/block_bitmaps.h
3/block_bitmaps_unittest.cc
3/eviction_v3.cc
3/sparse_control_v3.cc
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
ackend_impl.h
ackend_unittest.cc
ache_creator.cc
isk_cache_perftest.cc
isk_cache_test_base.cc
isk_cache_test_util.cc
isk_cache_test_util.h
ntry_unittest.cc
n_flight_backend_io.cc
apped_file.h
apped_file_avoid_mmap_posix.cc
apped_file_unittest.cc
em_backend_impl.h
em_entry_impl.cc
em_entry_impl.h
et_log_parameters.cc
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_index.cc
imple/simple_index.h
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_unittest.cc
parse_control.cc
tress_cache.cc
3/backend_impl_v3.h
3/backend_worker.h
3/disk_format_v3.cc
3/disk_format_v3.h
5e3f23d412006dc4db4e659864679f29341e113f 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
ackend_impl.cc
ackend_unittest.cc
lock_files.cc
ache_creator.cc
ache_util.cc
ache_util_posix.cc
isk_cache_perftest.cc
ntry_impl.cc
ntry_unittest.cc
viction.cc
apped_file_unittest.cc
em_entry_impl.cc
et_log_parameters.cc
imple/simple_index_file_unittest.cc
imple/simple_index_unittest.cc
imple/simple_synchronous_entry.cc
imple/simple_util.cc
parse_control.cc
tats.cc
tress_cache.cc
3/backend_impl_v3.cc
3/backend_worker.cc
3/block_bitmaps.cc
3/entry_impl_v3.cc
3/eviction_v3.cc
3/sparse_control_v3.cc
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
ddr.cc
ddr.h
ackend_impl.cc
ackend_impl.h
ackend_unittest.cc
lock_files.cc
lock_files_unittest.cc
ache_creator.cc
ache_util_posix.cc
isk_cache_perftest.cc
isk_cache_test_util.cc
isk_format.cc
isk_format.h
isk_format_base.h
ntry_impl.cc
ntry_impl.h
ntry_unittest.cc
viction.cc
viction.h
ile_lock.h
ile_posix.cc
lash/flash_entry_impl.cc
lash/internal_entry.cc
lash/log_store_entry_unittest.cc
n_flight_backend_io.cc
n_flight_backend_io.h
n_flight_io.cc
n_flight_io.h
apped_file.h
apped_file_avoid_mmap_posix.cc
em_entry_impl.cc
ankings.cc
ankings.h
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_entry_format.h
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_index.cc
imple/simple_index.h
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_file_unittest.cc
imple/simple_index_unittest.cc
imple/simple_synchronous_entry.cc
imple/simple_util.cc
imple/simple_util.h
parse_control.cc
torage_block.h
torage_block_unittest.cc
tress_cache.cc
3/backend_impl_v3.cc
3/backend_impl_v3.h
3/backend_worker.cc
3/backend_worker.h
3/block_bitmaps.cc
3/block_bitmaps.h
3/disk_format_v3.cc
3/disk_format_v3.h
3/entry_impl_v3.cc
3/entry_impl_v3.h
3/eviction_v3.cc
3/eviction_v3.h
3/sparse_control_v3.cc
3/sparse_control_v3.h
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
ddr.h
ackend_impl.cc
ackend_impl.h
ackend_unittest.cc
lock_files.cc
ache_creator.cc
isk_cache_perftest.cc
isk_cache_test_base.cc
isk_cache_test_base.h
isk_cache_test_util.cc
ntry_impl.cc
ntry_unittest.cc
viction.cc
ile_win.cc
apped_file_unittest.cc
imple/simple_entry_impl.cc
imple/simple_synchronous_entry.cc
parse_control.cc
tats.cc
tats.h
torage_block_unittest.cc
tress_cache.cc
race.cc
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 15-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
ackend_unittest.cc
ache_creator.cc
isk_cache.h
isk_cache_perftest.cc
isk_cache_test_util.cc
isk_cache_test_util.h
ntry_unittest.cc
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_synchronous_entry.cc
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
ntry_unittest.cc
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_entry_impl.cc
imple/simple_index.cc
imple/simple_index.h
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
ackend_impl.cc
ackend_impl.h
ackend_unittest.cc
lock_files.cc
ache_creator.cc
ache_util.cc
ache_util.h
isk_cache_test_base.cc
isk_cache_test_base.h
ntry_impl.cc
ntry_unittest.cc
viction.cc
xperiments.h
lash/flash_cache_test_base.cc
lash/flash_cache_test_base.h
lash/flash_entry_impl.cc
lash/flash_entry_impl.h
lash/internal_entry.cc
lash/internal_entry.h
lash/log_store.cc
lash/log_store.h
lash/log_store_entry.cc
lash/log_store_entry.h
lash/log_store_entry_unittest.cc
lash/log_store_unittest.cc
lash/segment_unittest.cc
lash/storage_unittest.cc
n_flight_backend_io.cc
apped_file_posix.cc
apped_file_win.cc
em_backend_impl.cc
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_disk_format.h
imple/simple_entry_format.cc
imple/simple_entry_format.h
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_index.cc
imple/simple_index.h
imple/simple_index_file.cc
imple/simple_index_file.h
imple/simple_index_file_unittest.cc
imple/simple_index_unittest.cc
imple/simple_synchronous_entry.cc
imple/simple_synchronous_entry.h
imple/simple_util.cc
imple/simple_util.h
imple/simple_util_unittest.cc
parse_control.cc
racing_cache_backend.cc
racing_cache_backend.h
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
ackend_impl.cc
ackend_impl.h
ackend_unittest.cc
lock_files.cc
lock_files.h
lock_files_unittest.cc
ache_util.h
ache_util_posix.cc
ache_util_unittest.cc
ache_util_win.cc
isk_cache.h
isk_cache_perftest.cc
isk_cache_test_base.cc
isk_cache_test_base.h
isk_cache_test_util.cc
isk_cache_test_util.h
ntry_unittest.cc
viction.cc
ile.h
ile_posix.cc
ile_win.cc
lash/flash_cache_test_base.cc
lash/flash_cache_test_base.h
lash/format.h
lash/log_store.cc
lash/log_store.h
lash/log_store_entry.cc
lash/log_store_entry.h
lash/log_store_entry_unittest.cc
lash/log_store_unittest.cc
lash/segment.cc
lash/segment.h
lash/segment_unittest.cc
lash/storage.cc
lash/storage.h
lash/storage_unittest.cc
istogram_macros.h
apped_file.h
apped_file_avoid_mmap_posix.cc
apped_file_posix.cc
apped_file_unittest.cc
apped_file_win.cc
em_backend_impl.h
ankings.cc
ankings.h
imple/simple_backend_impl.cc
imple/simple_backend_impl.h
imple/simple_disk_format.h
imple/simple_entry_impl.cc
imple/simple_entry_impl.h
imple/simple_synchronous_entry.cc
imple/simple_synchronous_entry.h
tats_histogram.cc
tats_histogram.h
torage_block_unittest.cc
tress_cache.cc
race.cc
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
ddr.cc
ddr.h
ddr_unittest.cc
ackend_impl.cc
ackend_impl.h
ackend_unittest.cc
itmap.cc
itmap.h
itmap_unittest.cc
lock_files.cc
lock_files.h
lock_files_unittest.cc
ache_util.h
ache_util_posix.cc
ache_util_unittest.cc
ache_util_win.cc
isk_cache.h
isk_cache_perftest.cc
isk_cache_test_base.cc
isk_cache_test_base.h
isk_cache_test_util.cc
isk_cache_test_util.h
isk_format.cc
isk_format.h
ntry_impl.cc
ntry_impl.h
ntry_unittest.cc
rrors.h
viction.cc
viction.h
xperiments.h
ile.cc
ile.h
ile_block.h
ile_lock.cc
ile_lock.h
ile_posix.cc
ile_win.cc
lash/flash_cache_test_base.cc
lash/flash_cache_test_base.h
lash/format.h
lash/segment.cc
lash/segment.h
lash/segment_unittest.cc
lash/storage.cc
lash/storage.h
lash/storage_unittest.cc
istogram_macros.h
n_flight_backend_io.cc
n_flight_backend_io.h
n_flight_io.cc
n_flight_io.h
apped_file.h
apped_file_avoid_mmap_posix.cc
apped_file_posix.cc
apped_file_unittest.cc
apped_file_win.cc
em_backend_impl.cc
em_backend_impl.h
em_entry_impl.cc
em_entry_impl.h
em_rankings.cc
em_rankings.h
et_log_parameters.cc
et_log_parameters.h
ankings.cc
ankings.h
parse_control.cc
parse_control.h
tats.cc
tats.h
tats_histogram.cc
tats_histogram.h
torage_block-inl.h
torage_block.h
torage_block_unittest.cc
tress_cache.cc
tress_support.h
race.cc
race.h