Tomasz Grabiec c779fa880f Merge branch 'penberg/keyspace-merging-improvements/v2' from seastar-dev.git ...

From Pekka:

 "This series implements a Maps.difference() function in C++, changes
 storage_proxy::query_local() to not return foreign_ptr>, and finally
 changes the keyspace merging code to follow Origin."

2015-05-12 13:08:02 +02:00

..

commitlog

commitlog: Add collectd counters

2015-05-11 16:06:51 +03:00

composites

Remove obselete files

2015-04-17 15:08:06 +02:00

marshal

db: const correctness for abstract_type and friends

2015-04-29 15:40:38 +03:00

config.cc

config: make sure aliases actually work properly

2015-05-05 10:56:54 +03:00

config.hh

Cassandra compatible "config" object

2015-04-29 17:00:15 +02:00

consistency_level.hh

schema: Embed raw_schema inside schema

2015-04-24 18:01:01 +02:00

legacy_schema_tables.cc

db/legacy_schema_tables: Use map_difference() instead of open-coding it

2015-05-12 13:18:56 +03:00

legacy_schema_tables.hh

Make storage_proxy::query_local() return bare lw_shared_ptr<>

2015-05-12 13:18:56 +03:00

serializer.cc

db: Introduce frozen_mutation

2015-05-08 09:19:01 +02:00

serializer.hh

db: Introduce frozen_mutation

2015-05-08 09:19:01 +02:00

system_keyspace.cc

schema: Add id field

2015-04-15 20:33:48 +02:00

system_keyspace.hh

Relax header dependencies

2015-04-24 18:01:01 +02:00