diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2018-12-25 00:49:46 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-12-25 00:54:15 +0100 |
commit | affbb99271b7307c2e30795b561fb08a850f56c1 (patch) | |
tree | b783bf599ab13ae62a1a9d09268a1b9bb0c6a141 /org.eclipse.jgit/.settings | |
parent | df6263644bb3387239cd77aa57074380610a0ec4 (diff) | |
parent | 60a606a2615ac4340c3eb4d288bcd8d887cd1f0c (diff) | |
download | jgit-affbb99271b7307c2e30795b561fb08a850f56c1.tar.gz jgit-affbb99271b7307c2e30795b561fb08a850f56c1.zip |
Merge branch 'stable-4.10' into stable-4.11
* stable-4.10:
Prepare 4.9.9-SNAPSHOT builds
JGit v4.9.8.201812241815-r
UploadPack: Test filtering by AdvertiseRefsHook in stateless transports
Prepare 4.7.8-SNAPSHOT builds
JGit v4.7.7.201812240805-r
Fix feature versions imported by feature org.eclipse.jgit.pgm
Prepare 4.5.6-SNAPSHOT builds
JGit v4.5.5.201812240535-r
Call AdvertiseRefsHook before validating wants
Change-Id: I937e9a4547fc10e4de7c887163022d1ab0322d64
Signed-off-by: Jonathan Nieder <jrn@google.com>
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index eb2ed7dabb..117e1f9e6f 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -7,6 +7,12 @@ <message_argument value="4.11.0"/> </message_arguments> </filter> + <filter id="924844039"> + <message_arguments> + <message_argument value="4.11.6"/> + <message_argument value="4.11.0"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants"> <filter id="1141899266"> |