Permalink
Browse files

Merge branch 'release/1.0' into develop

  • Loading branch information...
2 parents 6274d4e + 2994f6b commit 6430e56b42f00922e9ecb7859e12def075545b27 Jared Morrow committed Mar 19, 2013
Showing with 8 additions and 8 deletions.
  1. +7 −7 rebar.config
  2. +1 −1 src/riak_cs_control.app.src
View
@@ -16,16 +16,16 @@
{edoc_opts, [{preprocess, true}]}.
{deps, [
- {erlydtl, ".*",
- {git, "git://github.com/evanmiller/erlydtl.git", {branch, "master"}}},
- {node_package, ".*",
- {git, "git://github.com/basho/node_package", {branch, "master"}}},
+ {erlydtl, "0.7.0",
+ {git, "git://github.com/evanmiller/erlydtl.git", {tag, "c18f2a00"}}},
+ {node_package, "1.2.1",
+ {git, "git://github.com/basho/node_package", {tag, "1.2.1"}}},
{lager, ".*",
- {git, "git://github.com/basho/lager", {branch, "master"}}},
+ {git, "git://github.com/basho/lager", {tag, "1.2.2"}}},
{webmachine, ".*",
- {git, "git://github.com/basho/webmachine.git", {branch, "master"}}},
+ {git, "git://github.com/basho/webmachine.git", {tag, "1.10.0"}}},
{erlcloud, ".*",
- {git, "git://github.com/basho/erlcloud.git", {branch, "master"}}}
+ {git, "git://github.com/basho/erlcloud.git", {tag, "0.4.1p1"}}}
]}.
{plugin_dir, "src"}.
@@ -2,7 +2,7 @@
{application, riak_cs_control,
[
{description, "Webmachine-based administration interface for Riak CS."},
- {vsn, "1"},
+ {vsn, "1.0.0"},
{modules, []},
{registered, []},
{applications, [

0 comments on commit 6430e56

Please sign in to comment.