diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-05-10 13:41:45 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-05-10 13:41:45 +0200 |
| commit | 81fa158e7c4b1946327fb270015cd1f60f508237 (patch) | |
| tree | 3e6567f1520bc5f1c255efa6e28270b79c1cca35 /org.eclipse.jgit/resources/org/eclipse | |
| parent | 6efedb41c6fe3fc6eb88f49afc3e7f481514e806 (diff) | |
| parent | 9bdbb06324e7a38bd52b36734e96191578a0cc0c (diff) | |
| download | jgit-81fa158e7c4b1946327fb270015cd1f60f508237.tar.gz jgit-81fa158e7c4b1946327fb270015cd1f60f508237.zip | |
Merge branch 'stable-4.11'
* stable-4.11:
Retry stale file handles on .git/config file
Change-Id: I4fe6152c3c40dde9cb88913cc9706852de0fd712
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse')
| -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 01946e064a..f17391cfd8 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -136,6 +136,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 |