Merge branch 'master' of github.com:basho/hanoidb

This commit is contained in:
Gregory Burd 2012-06-11 23:41:49 +01:00
commit af4d2ba4d8

View file

@ -1,4 +1,3 @@
{cover_enabled, true}. {cover_enabled, true}.
%% define 'PROPER' in stead if you must... %% define 'PROPER' in stead if you must...
@ -17,7 +16,6 @@
{snappy, "1.0.*", {git, "git://github.com/fdmanana/snappy-erlang-nif.git", {branch, "master"}}}, {snappy, "1.0.*", {git, "git://github.com/fdmanana/snappy-erlang-nif.git", {branch, "master"}}},
{plain_fsm, "1.1.*", {git, "git://github.com/uwiger/plain_fsm", {branch, "master"}}}, {plain_fsm, "1.1.*", {git, "git://github.com/uwiger/plain_fsm", {branch, "master"}}},
{ebloom, "1.1.*", {git, "git://github.com/basho/ebloom.git", {branch, "master"}}}, {ebloom, "1.1.*", {git, "git://github.com/basho/ebloom.git", {branch, "master"}}},
{basho_bench, ".*", {git, "git://github.com/basho/basho_bench.git", {branch, "master"}}},
{triq, ".*", {git, "git://github.com/krestenkrab/triq.git", {branch, "master"}}}, {triq, ".*", {git, "git://github.com/krestenkrab/triq.git", {branch, "master"}}},
{proper, ".*", {git, "git://github.com/manopapad/proper.git", {proper, ".*", {git, "git://github.com/manopapad/proper.git",
{branch, "master"}}} {branch, "master"}}}