Anonymous avatar Anonymous committed 13c9c96 Merge

Comments (0)

Files changed (4)

apps/wriaki/ebin/wriaki.app

                   stdlib,
                   webmachine,
                   erlydtl,
-                  wiki_creole
+                  wiki_creole,
+                  riakc,
+                  riakhttpc
                  ]},
   {mod, { wriaki_app, []}},
   {env, []}

Binary file modified.

 {sub_dirs, ["apps/wiki_creole", "apps/wriaki", "rel"]}.
 {deps,
- [{webmachine, "1.7.3",
-   {git, "git://github.com/basho/webmachine", "23d4b107000a83a365a3"}},
-  {mochiweb, "1.7.1",
-   {git, "git://github.com/basho/mochiweb", "5128cb3553724373d6a5"}},
+ [{webmachine, "1.9.0",
+   {git, "git://github.com/basho/webmachine", "7dbc8e42041938997a4a"}},
+  {mochiweb, "1.5.1",
+   {git, "git://github.com/mochi/mochiweb", "bed36252198ae7159e3d"}},
   {erlydtl, "0.6.1",
    {git, "git://github.com/evanmiller/erlydtl", "14872e22e62c82b71e41"}},
-  {riakc, "1.0.1",
-   {git, "git://github.com/basho/riak-erlang-client", "711f94349ef9899da8e6"}},
+  {riakc, "1.2.0",
+   {git, "git://github.com/basho/riak-erlang-client", "cc27dc2808527ccdd8fe"}},
   {riakhttpc, "0.9.2",
-   {git, "git://github.com/basho/riak-erlang-http-client", "9cf254d69cd123670996"}}]}.
+   {git, "git://github.com/basho/riak-erlang-http-client", "1167606bc1dc72dd88c6"}}]}.
 

rel/reltool.config

          erlydtl,
          wiki_creole,
          ibrowse,
+         riakc,
+         riakhttpc,
          wriaki
         ]},
        {rel, "start_clean", "",
        {app, sasl, [{incl_cond, include}]}
       ]}.
 
-{rebar, [
-         {empty_dirs, [
-                       "log/sasl"
-                      ]},
+{target_dir, "wriaki"}.
+{overlay, [
+           {mkdir, "log/sasl"},
 
-         {overlay, "overlay"}
-         ]}.
+           {template, "overlay/etc/app.config", "etc/app.config"},
+           {template, "overlay/etc/vm.args", "etc/vm.args"},
+
+           {template, "overlay/bin/wriaki", "bin/wriaki"},
+
+           {copy, "overlay/erts-vsn/bin/erl", "{{erts_vsn}}/bin/erl"},
+           {template, "overlay/erts-vsn/bin/nodetool",
+                      "{{erts_vsn}}/bin/nodetool"}
+          ]}.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.