Merge branch 'upstream'
diff --git a/.travis.yml b/.travis.yml
index fa26d15..51614ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
language: erlang
-notifications:
- email: paul.joseph.davis@gmail.com
-script: make check
+
otp_release:
- 17.5
- 17.4
diff --git a/Makefile b/Makefile
index 025486e..1b9e6e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-REBAR?=./rebar
+REBAR?=rebar
all: build
diff --git a/rebar b/rebar
deleted file mode 100755
index 36ef011..0000000
--- a/rebar
+++ /dev/null
Binary files differ
diff --git a/rebar.config b/rebar.config
index 9d26448..a70a75d 100644
--- a/rebar.config
+++ b/rebar.config
@@ -24,8 +24,8 @@
{"darwin10.*-32$", "LDFLAGS", "-arch i386"},
%% This will merge into basho/rebar/rebar.config eventually
- {"win32", "CFLAGS", "/Wall /DWIN32 /D_WINDOWS /D_WIN32 /DWINDOWS"},
- {"win32", "CXXFLAGS", "-Ic_src/ -g -Wall -O3"}
+ {"win32", "CFLAGS", "/Wall /DWIN32 /D_WINDOWS /D_WIN32 /DWINDOWS /Ic_src"},
+ {"win32", "CXXFLAGS", "$CFLAGS /O2 /DNDEBUG /Wall /Ic_src"}
]}.
{erl_opts, [
