Commits

Jon Meredith  committed c92264e Merge with conflicts

Merge commit 'luwak-1.0.0'

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.

  • Participants
  • Parent commits 35e481f, eb4d9cd

Comments (0)

Files changed (2)

File ebin/luwak.app

 {application, luwak,
  [
   {description, "luwak"},
-  {vsn, "1.0"},
+  {vsn, "1.0.0"},
   {modules, [
              luwak_app,
              luwak_io,

File rebar.config

 
 {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"}}}
         ]}.