Merge branch 'dev' into release-0.1.11

hibari · Apr 4, 2015 · b5880ea · b5880ea
2 parents f8036ea + b94b7e0
commit b5880ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 
 REBAR?=./rebar
 
-XDIST?=release
+XDIST?=dev
 VSN?=$(shell grep '{rel, "hibari"' rel/reltool.config | sed 's/^.*rel, "hibari", "\(.*\)",/\1/')
 ARCH=$(shell erl -noshell -eval 'io:format(erlang:system_info(system_architecture)), halt().')
 WORDSIZE=$(shell erl -noshell -eval 'io:format(integer_to_list(try erlang:system_info({wordsize, external}) of Val -> 8*Val catch error:badarg -> 8*erlang:system_info(wordsize) end)), halt().')

diff --git a/rebar.config b/rebar.config
@@ -22,7 +22,7 @@
 
         %% External - UBF
         {pmod_transform,     ".*",     "lib/pmod_transform"},
-        {ubf,                "2.2.1",  "lib/ubf"},
+        {ubf,                "2.2.2",  "lib/ubf"},
         {ubf_thrift,         "1.1.1",  "lib/ubf_thrift"},
 
         %% Hibari