Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'maint'

  • Loading branch information...
commit caf9352241204def222641a2730d5471ef6dce0f 2 parents 3b1f738 + a8fde31
@jlouis authored
View
2  apps/etorrent/include/etorrent_version.hrl
@@ -2,4 +2,4 @@
%% Rather the idea is that it is bumped whenever we fix something really grave that
%% might get the client banned from communicating with other clients.
-define(VERSION, "d011").
--define(AGENT_TRACKER_STRING, "etorrent/1.2.0").
+-define(AGENT_TRACKER_STRING, "etorrent/1.2.1").
View
10 apps/etorrent/priv/webui/htdocs/index.html
@@ -15,7 +15,7 @@
<body>
<div id="doc3" class="yui-t1">
<div id="hd">
- <h1>Etorrent v1.2.0</h1>
+ <h1>Etorrent v1.2.1</h1>
</div>
<div id="bd">
<div id="yui-main">
@@ -74,3 +74,11 @@
</script>
</body>
</html>
+
+
+
+
+
+
+
+
View
10 apps/etorrent/src/etorrent.app.src
@@ -1,7 +1,7 @@
{application, etorrent,
[
{description, "BitTorrent client in Erlang"},
- {vsn, "1.2.0"},
+ {vsn, "1.2.1"},
{registered,
[
etorrent_acceptor_sup,
@@ -28,3 +28,11 @@
]
}.
+
+
+
+
+
+
+
+
View
2  documentation/new_version.txt
@@ -2,7 +2,7 @@ How to get a new version of etorrent out:
- Make sure the master branch has everything you want it to have
-- Edit version.hrl
+- Edit etorrent_version.hrl
- Edit webui version tag.
- Edit apps/etorrent/src/etorrent.app.src version
- Edit rel/reltool.config version
View
17 project.desc
@@ -1,17 +0,0 @@
-[{name, "Etorrent"},
- {version, "v1.2.0"},
- {maintainer, "Jesper Louis Andersen <jesper.louis.andersen@gmail.com>"},
- {synopsis,
- "Etorrent is a bittorrent client implementation in Erlang"
- "focusing on fault-tolerance"},
- {homepage, "http://github.com/jlouis/etorrent"},
- {build_system, rebar},
- {license, bsd2, "COPYING"},
- {stability, stable},
- {tested, [otp_r14b, otp_r14b01, otp_r13b04]},
- {repository,
- [{release,
- {etorrent, ".*", {git, "git://github.com/jlouis/etorrent.git", {tag, "v1.2.0"}}}},
- {development,
- {etorrent, ".*", {git, "git://github.com/jlouis/etorrent.git", "master"}}}]}
-].
View
4 rel/reltool.config
@@ -1,6 +1,6 @@
{sys, [
{lib_dirs, ["../deps", "../apps"]},
- {rel, "etorrent", "1.2.0",
+ {rel, "etorrent", "1.2.1",
[
kernel,
stdlib,
@@ -11,7 +11,7 @@
etorrent,
riak_err
]},
- {rel, "etorrent_dev", "1.2.0",
+ {rel, "etorrent_dev", "1.2.1",
[
kernel,
stdlib,
Please sign in to comment.
Something went wrong with that request. Please try again.