You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@couchdb.apache.org by dj...@apache.org on 2013/08/23 17:38:45 UTC
[1/3] git commit: Add some exceptions for tarball/branch matching.
Updated Branches:
refs/heads/master f2955c5c0 -> c4cda3e24
Add some exceptions for tarball/branch matching.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-admin/commit/9e08d8f7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-admin/tree/9e08d8f7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-admin/diff/9e08d8f7
Branch: refs/heads/master
Commit: 9e08d8f78337ae1f72b2b75599c7f1f09c9e29f8
Parents: 8b98688
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Fri Aug 23 17:37:02 2013 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Fri Aug 23 17:37:02 2013 +0200
----------------------------------------------------------------------
release/build_candidate.sh | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/9e08d8f7/release/build_candidate.sh
----------------------------------------------------------------------
diff --git a/release/build_candidate.sh b/release/build_candidate.sh
index 82b9205..be7d265 100755
--- a/release/build_candidate.sh
+++ b/release/build_candidate.sh
@@ -51,9 +51,11 @@ cat > $diff_file <<EOF
^Only in $tmp_dir/$branch: acinclude.m4.in\$
^Only in $tmp_dir/$branch: bootstrap\$
^Only in $tmp_dir/$branch: THANKS.in\$
+^Only in $tmp_dir/$branch: Vagrantfile\$
^Only in $tmp_dir/$branch/m4: ac_check_curl.m4.gz\$
^Only in $tmp_dir/$branch/m4: ac_check_icu.m4.gz\$
^Only in $tmp_dir/$branch/m4: pkg.m4.gz\$
+^Only in $tmp_dir/$branch/src: fauxton\$
^Only in $tmp_dir/apache-couchdb-$version: acinclude.m4\$
^Only in $tmp_dir/apache-couchdb-$version: aclocal.m4\$
^Only in $tmp_dir/apache-couchdb-$version: build-aux\$
[3/3] git commit: Merge branch 'master' of
http://git-wip-us.apache.org/repos/asf/couchdb-admin
Posted by dj...@apache.org.
Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/couchdb-admin
Project: http://git-wip-us.apache.org/repos/asf/couchdb-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-admin/commit/c4cda3e2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-admin/tree/c4cda3e2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-admin/diff/c4cda3e2
Branch: refs/heads/master
Commit: c4cda3e248c99de6d819d336e045c94226ed6280
Parents: 7f0157b f2955c5
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Fri Aug 23 17:38:27 2013 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Fri Aug 23 17:38:27 2013 +0200
----------------------------------------------------------------------
email/request_report.txt | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
[2/3] git commit: NEWS and CHANGES are gone, long live changelog.rst.
Posted by dj...@apache.org.
NEWS and CHANGES are gone, long live changelog.rst.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-admin/commit/7f0157b1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-admin/tree/7f0157b1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-admin/diff/7f0157b1
Branch: refs/heads/master
Commit: 7f0157b18b159a70626abb59dae5c239fb9a4cdb
Parents: 9e08d8f
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Fri Aug 23 17:38:11 2013 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Fri Aug 23 17:38:11 2013 +0200
----------------------------------------------------------------------
release/build_candidate.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/7f0157b1/release/build_candidate.sh
----------------------------------------------------------------------
diff --git a/release/build_candidate.sh b/release/build_candidate.sh
index be7d265..0e43b99 100755
--- a/release/build_candidate.sh
+++ b/release/build_candidate.sh
@@ -130,7 +130,7 @@ check: check-files
check-files: check-diff
cd \$(TMP_DIR)/\$(PACKAGE) && \
- grep "not released" NEWS CHANGES; test "\$\$?" -eq 1
+ grep "not released" share/doc/src/changelog.rst; test "\$\$?" -eq 1
cd \$(TMP_DIR)/\$(PACKAGE) && \
grep "build" acinclude.m4; test "\$\$?" -eq 1
cd \$(TMP_DIR)/\$(PACKAGE) && \