You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2017/07/06 22:35:45 UTC

[1/3] jiffy commit: updated refs/heads/master to 1acdd1a

Repository: couchdb-jiffy
Updated Branches:
  refs/heads/master 14f8ff26c -> 1acdd1ac3


Cleanup after new enc lands


Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/bce015ab
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/bce015ab
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/bce015ab

Branch: refs/heads/master
Commit: bce015ab1175155c0b65af398a9d85d9abc287f1
Parents: 4e0088f
Author: Joan Touzet <wo...@atypical.net>
Authored: Thu Jul 6 17:05:55 2017 -0400
Committer: Joan Touzet <wo...@atypical.net>
Committed: Thu Jul 6 17:05:55 2017 -0400

----------------------------------------------------------------------
 rebar.config | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/bce015ab/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index 09df419..c5e513d 100644
--- a/rebar.config
+++ b/rebar.config
@@ -23,9 +23,7 @@
     {"darwin10.*-32$", "CXXFLAGS", "-m32"},
     {"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", "CXXFLAGS", "$CXXFLAGS /O2 /DNDEBUG"}
 ]}.
 
 {erl_opts, [


[2/3] jiffy commit: updated refs/heads/master to 1acdd1a

Posted by da...@apache.org.
Merge pull request #151 from wohali/win32-cleanup

Cleanup after new enc lands

Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/8461d089
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/8461d089
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/8461d089

Branch: refs/heads/master
Commit: 8461d0897281b4527906703ffe87b30bb5c3a2fc
Parents: 414bf73 bce015a
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Jul 6 17:33:44 2017 -0500
Committer: GitHub <no...@github.com>
Committed: Thu Jul 6 17:33:44 2017 -0500

----------------------------------------------------------------------
 rebar.config | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------



[3/3] jiffy commit: updated refs/heads/master to 1acdd1a

Posted by da...@apache.org.
Merge remote-tracking branch 'davisp/master'


Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/1acdd1ac
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/1acdd1ac
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/1acdd1ac

Branch: refs/heads/master
Commit: 1acdd1ac389dff3d763589f64331227ae594f3b7
Parents: 14f8ff2 8461d08
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Jul 6 17:35:24 2017 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Jul 6 17:35:24 2017 -0500

----------------------------------------------------------------------
 rebar.config | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------