diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-01-06 12:39:16 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-01-06 12:39:16 +0200 |
| commit | e887c06e07aa3f3ec1765196af51bd82a5fb4f46 (patch) | |
| tree | 4f7b6f1f92cadb51cb7ff362b6162be2d3ebc0e8 /build | |
| parent | 496e358dc049cf7be818340332a53ff8758df939 (diff) | |
| parent | dd786ffd3554828e91d4398bc9a3ce6e498f74b2 (diff) | |
| download | vaadin-framework-e887c06e07aa3f3ec1765196af51bd82a5fb4f46.tar.gz vaadin-framework-e887c06e07aa3f3ec1765196af51bd82a5fb4f46.zip | |
Merge remote branch 'origin/6.8'
Conflicts:
src/com/vaadin/data/validator/AbstractValidator.java
tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
Diffstat (limited to 'build')
| -rw-r--r-- | build/bin/tagrelease.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/bin/tagrelease.py b/build/bin/tagrelease.py index 8745553596..0101ecdbd6 100644 --- a/build/bin/tagrelease.py +++ b/build/bin/tagrelease.py @@ -95,7 +95,7 @@ def tagCommand(version, changeset, bookRepo): tagUrl = repoRoot+"/releases/"+version # Book tag parameters - if not re.search(r'branches/[0-9\.]+$', bookRepo): + if (not re.search(r'branches/[0-9\.]+$', bookRepo)) and (not re.search(r'doc/trunk$', bookRepo)): print "Bad documentation branch '%s' for release." % (bookRepo) sys.exit(1) bookTagUrl = repoRoot+"/doc/tags/"+version |