Avi Kivity 07d7f410f3 Merge branch 'memtable' into db ...

Conflicts:
	database.hh
	memtable changes moved to memtable.hh

2015-05-18 15:50:24 +03:00

..

commitlog

Merge branch 'master' of github.com:cloudius-systems/seastar into db

2015-05-12 14:47:07 +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: Add support for maps in command lines + fix seed_provider

2015-05-14 10:36:13 +03:00

config.hh

config: Add support for maps in command lines + fix seed_provider

2015-05-14 10:36:13 +03:00

consistency_level.hh

schema: Embed raw_schema inside schema

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

legacy_schema_tables.cc

Merge branch 'memtable' into db

2015-05-18 15:50:24 +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

db: make column_family and keyspace configurable

2015-05-18 15:00:31 +03:00

system_keyspace.hh

Relax header dependencies

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