diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-05-10 12:51:57 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-05-10 12:51:57 +0200 |
| commit | 9fdc595cdddac5913a2f3d512cc7787bebc3b687 (patch) | |
| tree | 16ddb311ee1a330b17d8eefec21aceb0763961b8 /org.eclipse.jgit/resources | |
| parent | 95fc2b210f3df3a1ff5c729dbc0624e3d25d34bd (diff) | |
| parent | dd9a14a762c796080f95f638c5c77b26c3e5fe11 (diff) | |
| download | jgit-9fdc595cdddac5913a2f3d512cc7787bebc3b687.tar.gz jgit-9fdc595cdddac5913a2f3d512cc7787bebc3b687.zip | |
Merge branch 'stable-4.9' into stable-4.10
* stable-4.9:
Retry stale file handles on .git/config file
Change-Id: I6db7256dbd1c71b23e1231809642ca21e996e066
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 45a6af3755..b29383e481 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -133,6 +133,7 @@ compressingObjects=Compressing objects configSubsectionContainsNewline=config subsection name contains newline configSubsectionContainsNullByte=config subsection name contains byte 0x00 configValueContainsNullByte=config value contains byte 0x00 +configHandleIsStale=config file handle is stale, {0}. retry connectionFailed=connection failed connectionTimeOut=Connection time out: {0} contextMustBeNonNegative=context must be >= 0 |