Merge branch 'stable-2.7' * stable-2.7: Fix spelling errors in access-control.txt Access control documentation: Formatting Access control documentation: Clean up of categories Access Control Documentation: Explain special and magic refs Set core plugins to correct revisions for 2.6-rc2 Update developer instructions for cloning the Gerrit project Fix Windows build Conflicts: Documentation/access-control.txt Change-Id: I1ee212d357f0da6d006c5fef9427a4b7138c7536
diff --git a/Documentation/access-control.txt b/Documentation/access-control.txt index 4dc1acb6..ec64e0b 100644 --- a/Documentation/access-control.txt +++ b/Documentation/access-control.txt
@@ -374,7 +374,6 @@ These are references with added functionality to them compared to a regular git push operation. - refs/for/<branch ref> ^^^^^^^^^^^^^^^^^^^^^ @@ -411,6 +410,7 @@ within projects, enabling functionality for that group's members. + [[category_abandon]] Abandon ~~~~~~~ @@ -1113,7 +1113,6 @@ label-Release-Process = -1..+1 group Release Engineers ==== - [[global_capabilities]] Global Capabilities -------------------
diff --git a/plugins/commit-message-length-validator b/plugins/commit-message-length-validator index 97ecbc3..083dfb5 160000 --- a/plugins/commit-message-length-validator +++ b/plugins/commit-message-length-validator
@@ -1 +1 @@ -Subproject commit 97ecbc33ce246d04f850c2ca400cddb7a36883cc +Subproject commit 083dfb5cc7811f24e1acdda539e8518f073b1023
diff --git a/plugins/replication b/plugins/replication index 344e603..34f1404 160000 --- a/plugins/replication +++ b/plugins/replication
@@ -1 +1 @@ -Subproject commit 344e6034f516b08b1fb6e536f43c4cdd7cc6a7e7 +Subproject commit 34f1404ab978315868899423901bfa80f3613060
diff --git a/plugins/reviewnotes b/plugins/reviewnotes index bf86767..4f171eb 160000 --- a/plugins/reviewnotes +++ b/plugins/reviewnotes
@@ -1 +1 @@ -Subproject commit bf86767c3ab5a02a482816271f77a02e63044498 +Subproject commit 4f171ebe6b27f2e8a2fa218c2d19b32c59d92080
diff --git a/tools/version.sh b/tools/version.sh index cc8a1fa..def099d 100755 --- a/tools/version.sh +++ b/tools/version.sh
@@ -52,7 +52,7 @@ v*) V=$(echo "$V" | perl -pe s/^v//) ;; esac -perl -pi -e ' +perl -pi.bak -e ' if ($ARGV ne $old_argv) { $seen_version = 0; $old_argv = $ARGV; @@ -62,3 +62,8 @@ s{(<version>).*(</version>)}{${1}'"$V"'${2}}; } ' $POM_FILES + +for pom in $POM_FILES +do + rm -f ${pom}.bak +done