Permalink
Browse files

Merge remote-tracking branch 'origin/1.6'

The 1.6 branch has diverged from master ... merging in recent mods.
  • Loading branch information...
2 parents 66d5cae + 61f72bf commit f6736fe5d1ff96108f6148198180aaa41f235f7b Scott Lystig Fritchie committed Mar 12, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/bitcask_io.erl
View
@@ -71,5 +71,5 @@ determine_file_module() ->
{ok, nif} ->
bitcask_nifs;
_ ->
- bitcask_nifs
+ bitcask_file
end.

0 comments on commit f6736fe

Please sign in to comment.