Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 13158112C0 for ; Mon, 5 May 2014 18:02:56 +0000 (UTC) Received: (qmail 99690 invoked by uid 500); 5 May 2014 18:02:55 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 99655 invoked by uid 500); 5 May 2014 18:02:54 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 99641 invoked by uid 99); 5 May 2014 18:02:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 May 2014 18:02:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3088E911794; Mon, 5 May 2014 18:02:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Message-Id: <97685ad965dd477f888c73efb436b9f9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: couchdb commit: updated refs/heads/master to f8342ca Date: Mon, 5 May 2014 18:02:53 +0000 (UTC) Repository: couchdb Updated Branches: refs/heads/master 8b33ff167 -> f8342ca6e Move Erlang 17 support to 1.6.0 release Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f8342ca6 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f8342ca6 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f8342ca6 Branch: refs/heads/master Commit: f8342ca6e5aae1bc7424091ea5ac16961b5dbb62 Parents: 8b33ff1 Author: Alexander Shorin Authored: Mon May 5 20:23:48 2014 +0400 Committer: Alexander Shorin Committed: Mon May 5 22:02:09 2014 +0400 ---------------------------------------------------------------------- share/doc/build/Makefile.am | 3 --- share/doc/src/whatsnew/1.6.rst | 5 +---- share/doc/src/whatsnew/1.7.rst | 42 ----------------------------------- share/doc/src/whatsnew/index.rst | 1 - 4 files changed, 1 insertion(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/f8342ca6/share/doc/build/Makefile.am ---------------------------------------------------------------------- diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am index 58efee1..b3fba13 100644 --- a/share/doc/build/Makefile.am +++ b/share/doc/build/Makefile.am @@ -162,7 +162,6 @@ html_files = \ html/_sources/whatsnew/1.4.txt \ html/_sources/whatsnew/1.5.txt \ html/_sources/whatsnew/1.6.txt \ - html/_sources/whatsnew/1.7.txt \ html/_sources/whatsnew/index.txt \ html/_sources/about.txt \ html/_sources/contents.txt \ @@ -286,7 +285,6 @@ html_files = \ html/whatsnew/1.4.html \ html/whatsnew/1.5.html \ html/whatsnew/1.6.html \ - html/whatsnew/1.7.html \ html/whatsnew/index.html \ html/about.html \ html/config-ref.html \ @@ -436,7 +434,6 @@ src_files = \ ../src/whatsnew/1.4.rst \ ../src/whatsnew/1.5.rst \ ../src/whatsnew/1.6.rst \ - ../src/whatsnew/1.7.rst \ ../src/whatsnew/index.rst \ ../src/about.rst \ ../src/contents.rst \ http://git-wip-us.apache.org/repos/asf/couchdb/blob/f8342ca6/share/doc/src/whatsnew/1.6.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/whatsnew/1.6.rst b/share/doc/src/whatsnew/1.6.rst index b1d9bc0..7c65af2 100644 --- a/share/doc/src/whatsnew/1.6.rst +++ b/share/doc/src/whatsnew/1.6.rst @@ -39,10 +39,7 @@ in case if you had used such handler. Version 1.6.0 ============= -.. warning:: - - This version is not released yet. - +* :issue:`2200`: support Erlang/OTP 17.0 :commit:`35e16032` * Fauxton: many improvements in our experimental new user interface, including switching the code editor from CodeMirror to Ace as well as better support for various browsers. http://git-wip-us.apache.org/repos/asf/couchdb/blob/f8342ca6/share/doc/src/whatsnew/1.7.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/whatsnew/1.7.rst b/share/doc/src/whatsnew/1.7.rst deleted file mode 100644 index 69be11b..0000000 --- a/share/doc/src/whatsnew/1.7.rst +++ /dev/null @@ -1,42 +0,0 @@ -.. Licensed under the Apache License, Version 2.0 (the "License"); you may not -.. use this file except in compliance with the License. You may obtain a copy of -.. the License at -.. -.. http://www.apache.org/licenses/LICENSE-2.0 -.. -.. Unless required by applicable law or agreed to in writing, software -.. distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -.. WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -.. License for the specific language governing permissions and limitations under -.. the License. - - -.. _release/1.7.x: - -============ -1.7.x Branch -============ - -.. contents:: - :depth: 1 - :local: - -.. _release/1.7.x/upgrade: - -Upgrade Notes -============= - -None. - -.. _release/1.7.0: - -Version 1.7.0 -============= - -.. warning:: - - This version is not released yet. - -* Build System: :issue:`2200`: support Erlang/OTP 17.0 - :commit:`78603ad` - http://git-wip-us.apache.org/repos/asf/couchdb/blob/f8342ca6/share/doc/src/whatsnew/index.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/whatsnew/index.rst b/share/doc/src/whatsnew/index.rst index 52c9317..800b9ee 100644 --- a/share/doc/src/whatsnew/index.rst +++ b/share/doc/src/whatsnew/index.rst @@ -19,7 +19,6 @@ Release History .. toctree:: :glob: - 1.7 1.6 1.5 1.4