Merge branch 'developer-preview-2.0'
Conflicts:
Makefile
dev/run
rebar.config.script
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6f41698e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6f41698e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6f41698e
Branch: refs/heads/developer-preview-2.0
Commit: 6f41698e733fea13aee406113978edde17436ebe
Parents: f29226a a0b287e
Author: Alexander Shorin <[email protected]>
Authored: Wed Jan 28 18:50:36 2015 +0300
Committer: Alexander Shorin <[email protected]>
Committed: Wed Jan 28 18:50:36 2015 +0300
----------------------------------------------------------------------
Makefile | 1 +
rebar.config.script | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6f41698e/Makefile
----------------------------------------------------------------------
diff --cc Makefile
index 1084d52,516e46d..01dbf53
--- a/Makefile
+++ b/Makefile
@@@ -28,9 -28,10 +28,10 @@@ clean
check: javascript eunit
-dist: compile
+dist: all
@rm -rf rel/couchdb
@rebar generate
+ @cp -r share/www rel/couchdb/share/www
distclean: clean
@rm -rf rel/couchdb
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6f41698e/rebar.config.script
----------------------------------------------------------------------
diff --cc rebar.config.script
index 4ea31b2,c4c8eaf..ef4b5b0
--- a/rebar.config.script
+++ b/rebar.config.script
@@@ -46,8 -46,8 +46,9 @@@ DepDescs =
{mochiweb, "mochiweb", {branch, "master"}},
{oauth, "oauth", {branch, "master"}},
{rexi, "rexi", {branch, "master"}},
+ {snappy, "snappy", {branch, "master"}},
+ {setup, "setup", {branch, "master"}},
- {snappy, "snappy", {branch, "1994-merge-rcouch"}}
+ {meck, "meck", {tag, "0.8.2"}}
],
BaseUrl = "https://git-wip-us.apache.org/repos/asf/";,
