diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2017-06-07 16:58:18 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-06-07 16:58:18 +0200 |
| commit | 94c06009aafc7a61ae8a55699851a3e3ed27c19c (patch) | |
| tree | 465491d0b9a7dcd468733d098dff2bfb86420dac /org.eclipse.jgit/.settings | |
| parent | 5bfeec4fdbe72ec7f4dac252b98c8bad05898ef1 (diff) | |
| parent | 6b1e3c58b16651dc72ec79a614d507e014d18393 (diff) | |
| download | jgit-94c06009aafc7a61ae8a55699851a3e3ed27c19c.tar.gz jgit-94c06009aafc7a61ae8a55699851a3e3ed27c19c.zip | |
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7:
Run auto GC in the background
Change-Id: I5e25765f65d833f13cbe99696ef33055d7f5c4cf
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index d359bffe1a..671988c457 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,5 +1,21 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jgit" version="2"> + <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants"> + <filter id="1141899266"> + <message_arguments> + <message_argument value="4.7"/> + <message_argument value="4.8"/> + <message_argument value="CONFIG_KEY_AUTODETACH"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="4.7"/> + <message_argument value="4.8"/> + <message_argument value="CONFIG_KEY_LOGEXPIRY"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/merge/MergeStrategy.java" type="org.eclipse.jgit.merge.MergeStrategy"> <filter comment="OSGi semantic versioning allows breaking implementors of an API in a minor version" id="336695337"> <message_arguments> |