Skip to content
Browse files

Merge remote-tracking branch 'upstream/master'

Simple conflict with upstream. Fix by enforcing version.

Conflicts:
	rebar.config
  • Loading branch information...
2 parents 33d6c9e + cd5f5d1 commit 8a61815a4ff8c5a506562997ec1155a10de0fd43 @jlouis jlouis committed Oct 22, 2012
Showing with 7 additions and 6 deletions.
  1. +6 −6 rebar.config
  2. +1 −0 src/cassanderl.app.src
View
12 rebar.config
@@ -1,9 +1,9 @@
{erl_opts, [debug_info]}.
{deps, [
- {cassandra_thrift, "19\.30\.0",
- {git, "https://github.com/lpgauth/cassandra-thrift-erlang.git", {tag, "19.30.0"}}},
- {dispcount, "0\.1\.[0-9]+",
- {git, "https://github.com/ferd/dispcount.git", "r14"}},
- {thrift, "0\.8\.0",
- {git, "https://github.com/lpgauth/thrift-erlang.git", {tag, "0.8.0"}}}
+ {cassandra_thrift, "19.30.0",
+ {git, "http://github.com/lpgauth/cassandra-thrift-erlang.git", {tag, "19.30.0"}}},
+ {dispcount, "0.1.1",
+ {git, "http://github.com/ferd/dispcount.git", {tag, "r14-0.1.1"}}},
+ {thrift, "0.8.0",
+ {git, "http://github.com/lpgauth/thrift-erlang.git", {tag, "0.8.0"}}}
]}.
View
1 src/cassanderl.app.src
@@ -6,6 +6,7 @@
kernel,
stdlib,
thrift,
+ dispcount,
cassandra_thrift
]},
{mod, { cassanderl_app, []}},

0 comments on commit 8a61815

Please sign in to comment.
Something went wrong with that request. Please try again.