summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoan Touzet <joant@atypical.net>2017-04-29 20:18:40 -0400
committerJoan Touzet <joant@atypical.net>2017-04-29 20:18:40 -0400
commitfa2bcb53c7225150612519f8d9816fe757aec2d4 (patch)
tree7c0c20e6c120b284000bf5d41b02ac9ca57d341f
parent8e83c42c1c438ca16e551077904624d027ca5760 (diff)
downloadcouchdb-fa2bcb53c7225150612519f8d9816fe757aec2d4.tar.gz
bump for next release
-rw-r--r--Makefile10
-rw-r--r--rel/reltool.config2
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 73376bb47..33c44157d 100644
--- a/Makefile
+++ b/Makefile
@@ -260,7 +260,7 @@ endif
# target: install- install CouchDB :)
install:
@echo
- @echo "Notice: There is no 'make install' command for CouchDB 2.0 yet."
+ @echo "Notice: There is no 'make install' command for CouchDB 2.x."
@echo
@echo " To install CouchDB into your system, copy the rel/couchdb"
@echo " to your desired installation location. For example:"
@@ -330,11 +330,11 @@ else
@rm -rf apache-couchdb-*
@$(MAKE) dist 2>&1 > /dev/null
@rm apache-couchdb-*.tar.gz
- @mv apache-couchdb-* apache-couchdb-2.0.0-RC$(COUCH_RC)
- @tar czf apache-couchdb-2.0.0-RC$(COUCH_RC).tar.gz apache-couchdb-2.0.0-RC$(COUCH_RC)
- @echo "Done apache-couchdb-2.0.0-RC$(COUCH_RC).tar.gz"
+ @mv apache-couchdb-* apache-couchdb-2.1.0-RC$(COUCH_RC)
+ @tar czf apache-couchdb-2.1.0-RC$(COUCH_RC).tar.gz apache-couchdb-2.1.0-RC$(COUCH_RC)
+ @echo "Done apache-couchdb-2.1.0-RC$(COUCH_RC).tar.gz"
@echo "Here is the list of commits since the last RC"
- @git log --left-right --graph --cherry-pick --oneline 2.0.0-RC$(shell echo $(COUCH_RC)-1 | bc)...master
+ @git log --left-right --graph --cherry-pick --oneline 2.1.0-RC$(shell echo $(COUCH_RC)-1 | bc)...master
@echo "Done!"
endif
diff --git a/rel/reltool.config b/rel/reltool.config
index 71ce069de..135d38676 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -12,7 +12,7 @@
{sys, [
{lib_dirs, ["../src"]},
- {rel, "couchdb", "2.0.0a", [
+ {rel, "couchdb", "2.1.0", [
%% stdlib
asn1,
compiler,