merge attempt #1
authorJoe <joe@ubuntu.localdomain>
Mon, 22 Feb 2010 20:19:15 +0000 (12:19 -0800)
committerJoe <joe@ubuntu.localdomain>
Mon, 22 Feb 2010 20:19:15 +0000 (12:19 -0800)
commit6fce297e9ff9f495b10281f2c5c78e6e0c2d48ad
tree42f34b519a411ce8f594a375d5be5c885ee37ed6
merge attempt #1
39 files changed:
ebin/.gitignore [new file with mode: 0644]
ebin/dynomite.appup [new file with mode: 0644]
include/chunk_size.hrl [new file with mode: 0644]
include/common.hrl [new file with mode: 0644]
include/config.hrl [new file with mode: 0644]
include/dmerkle.hrl [new file with mode: 0644]
include/profile.hrl [new file with mode: 0644]
include/test.hrl [new file with mode: 0644]
src/Makefile [new file with mode: 0644]
src/bootstrap_manager.erl [new file with mode: 0644]
src/bootstrap_receiver.erl [new file with mode: 0644]
src/cluster_ops.erl [new file with mode: 0644]
src/configuration.erl [new file with mode: 0644]
src/dynomite.erl [new file with mode: 0644]
src/dynomite_app.erl [new file with mode: 0644]
src/dynomite_couch_api.erl [new file with mode: 0644]
src/dynomite_couch_storage.erl [new file with mode: 0644]
src/dynomite_http.erl [new file with mode: 0644]
src/dynomite_prof.erl [new file with mode: 0644]
src/dynomite_sup.erl [new file with mode: 0644]
src/lib_misc.erl [new file with mode: 0644]
src/mem_utils.erl [new file with mode: 0644]
src/membership2.erl [new file with mode: 0644]
src/node.erl [new file with mode: 0644]
src/partitions.erl [new file with mode: 0644]
src/replication.erl [new file with mode: 0644]
src/vector_clock.erl [new file with mode: 0644]
test/Emakefile [new file with mode: 0644]
test/Makefile [new file with mode: 0644]
test/cluster_ops_test.erl [new file with mode: 0644]
test/mem2_code_change.erl [new file with mode: 0644]
test/mem_utils_test.erl [new file with mode: 0644]
test/membership2_test.erl [new file with mode: 0644]
test/mock.erl [new file with mode: 0644]
test/mock_genserver.erl [new file with mode: 0644]
test/partitions_test.erl [new file with mode: 0644]
test/replication_test.erl [new file with mode: 0644]
test/stub.erl [new file with mode: 0644]
test/test_suite.erl [new file with mode: 0644]