Michael Cahill 5fef282275 Merge branch 'develop' into fine-grained-durability ...

Conflicts:
	dist/api_data.py
	src/config/config_def.c
	src/include/flags.h
	src/include/wiredtiger.in

2013-11-11 17:40:21 +11:00

..

3rdparty

Added complete release directories for discover, testscenarios,

2012-02-01 22:48:15 -05:00

bloom

Fix compiler warnings with GCC 4.7.2 on Ubuntu.

2013-11-01 16:18:48 +11:00

fops

Rework WT_UNUSED/WT_UNUSED_RET slightly: move GNUC macros out of misc.h

2013-11-06 09:18:50 -05:00

format

Only pass "block_allocation=" if test/format is overriding the default.

2013-11-11 15:14:12 +11:00

java/com/wiredtiger/test

Add a test case for Java cursor issue refs #493

2013-03-26 12:54:39 +11:00

packing

Update copyright notice to 2013.

2013-01-01 09:45:50 +00:00

salvage

Go back to "allocation_size" to avoid breaking the world.

2013-11-11 12:01:27 +11:00

suite

Merge branch 'develop' into fine-grained-durability

2013-11-11 17:40:21 +11:00

thread

Merge branch 'develop' into fine-grained-durability

2013-11-08 10:20:16 +11:00