Skip to content

Commit

Permalink
Merge commit 'luwak-1.0.0'
Browse files Browse the repository at this point in the history
Conflicts:
	rebar.config

Dependencies had been set back to 0.13.0 while all the tagging was going
on.    Set back to 0.14.0 after merge.
  • Loading branch information
Jon Meredith committed Jan 11, 2011
2 parents 7ae8ffe + d099354 commit 89becfa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ebin/luwak.app
@@ -1,7 +1,7 @@
{application, luwak,
[
{description, "luwak"},
{vsn, "1.0"},
{vsn, "1.0.0"},
{modules, [
luwak_app,
luwak_io,
Expand Down
8 changes: 4 additions & 4 deletions rebar.config
Expand Up @@ -4,8 +4,8 @@

{lib_dirs, ["deps"]}.

{deps, [{skerl, "0.1",
{git, "git://github.com/basho/skerl", "HEAD"}},
{riak_kv, "0.13.*",
{git, "git://github.com/basho/riak_kv", "HEAD"}}
{deps, [{skerl, "1.0.*",
{git, "git://github.com/basho/skerl", {tag, "skerl-1.0.0"}}},
{riak_kv, "0.14.*",
{git, "git://github.com/basho/riak_kv", {branch, "riak_kv-0.14"}}}
]}.

0 comments on commit 89becfa

Please sign in to comment.