Alex Gorrod 2bca93d54b Merge branch 'develop' into json-load ...

Conflicts:
	dist/s_string.ok
	src/include/extern.h
	src/utilities/util_load.c

2014-10-15 11:47:13 +11:00

..

wiredtiger

Update copyright notices for 2014.

2014-01-07 10:30:12 -05:00

Makefile.am

Rearrange the Python build so we generate object files under the build directory. Clean up manually: don't rely on setup.py.

2014-09-05 12:21:59 +10:00

run-ex_access

Fixes for automake 1.3.x: don't use $(srcdir) in TESTS and avoid the new parallel test harness (our tests all currently expect to have exclusive access to a WT_TEST directory).

2013-01-07 17:43:44 +11:00

setup.py

Rename RELEASE to be RELEASE_INFO, avoid collision with MsBuild default

2014-10-01 20:53:59 -04:00

wiredtiger.i

Add JSON loading to cursors and wt load utility. refs #740.

2014-08-06 21:36:47 -04:00