aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Clean up dependenciesJon Bratseth2019-03-221-16/+5
* Don't depend (transitively) on annotations moduleJon Bratseth2019-03-224-4167/+13
* Correct javadoc syntaxJon Bratseth2019-03-221-1/+1
* Correct commons lang dependency scope to testJon Bratseth2019-03-221-4/+0
* Correct commons lang dependency scope to testJon Bratseth2019-03-221-5/+6
* Correct hamcrest dependency scope to testJon Bratseth2019-03-221-5/+5
* Remove testutils dependencyJon Bratseth2019-03-2210-38/+95
* Remove vespajlib dependencyJon Bratseth2019-03-225-61/+78
* Remove component dependencyJon Bratseth2019-03-223-8/+9
* Remove dependency on Vespa annotationsJon Bratseth2019-03-225-499/+8
* Merge pull request #8866 from vespa-engine/gjoranv/remove-indexgjoranv2019-03-223-9/+4
|\
| * Use 'index' from super class.gjoranv2019-03-213-9/+4
* | Merge pull request #8862 from vespa-engine/gjoranv/null-checkgjoranv2019-03-221-1/+1
|\ \
| * | Check for null 'http'gjoranv2019-03-211-1/+1
* | | Merge pull request #8805 from vespa-engine/ollivir/java-dispatch-metricsOlli Virtanen2019-03-227-22/+70
|\ \ \
| * | | dispatch_internal and dispatch_fdispatch metricsOlli Virtanen2019-03-157-22/+70
* | | | Merge pull request #8849 from vespa-engine/ollivir/searchprotocol-protobufOlli Virtanen2019-03-2239-194/+1040
|\ \ \ \
| * | | | Remove highlight terms from search requestOlli Virtanen2019-03-192-13/+3
| * | | | Search over protobuf + jrtOlli Virtanen2019-03-1939-194/+1050
* | | | | Merge pull request #8868 from vespa-engine/freva/add-new-variablesValerij Fredriksen2019-03-223-7/+9
|\ \ \ \ \
| * | | | | Use the new variablesValerij Fredriksen2019-03-213-7/+9
| | |_|/ / | |/| | |
* | | | | Merge pull request #8870 from vespa-engine/revert-8859-revert-8848-mpolden/re...Jon Marius Venstad2019-03-2210-227/+1
|\ \ \ \ \
| * | | | | Revert "Revert "Remove /screwdriver/v1""Martin Polden2019-03-2210-227/+1
|/ / / / /
* | | | | Merge pull request #8837 from vespa-engine/jvenstad/rename-permit-thingsJon Marius Venstad2019-03-2231-569/+586
|\ \ \ \ \
| * | | | | Conflicts resolved and remove single-use methodJon Marius Venstad2019-03-213-16/+4
| * | | | | Rename Claim to Spec, and update some docJon Marius Venstad2019-03-2113-100/+88
| * | | | | Remove things that were moved to Credentials from TenantClaim and childrenJon Marius Venstad2019-03-218-34/+14
| * | | | | Remove unused ApplicationClaim and childrenJon Marius Venstad2019-03-218-86/+1
| * | | | | Rename Claims -> AccessControlRequestsJon Marius Venstad2019-03-214-24/+19
| * | | | | Update credential docsJon Marius Venstad2019-03-213-12/+13
| * | | | | Remove cumbersome genericsJon Marius Venstad2019-03-2112-38/+44
| * | | | | Change signatures to id + spec (for tenant creation) + credentialsJon Marius Venstad2019-03-2122-190/+300
| * | | | | Renamed permits package to securityJon Marius Venstad2019-03-2111-0/+0
| * | | | | permit -> claimJon Marius Venstad2019-03-2121-220/+209
| * | | | | Deal with review commentsJon Marius Venstad2019-03-212-8/+7
| * | | | | Really removed ManagerJon Marius Venstad2019-03-217-19/+19
| * | | | | Removed Manager part of AccessControlManager, and renamed fieldJon Marius Venstad2019-03-213-9/+7
| * | | | | Separate code path for conservative tenant access control updatesJon Marius Venstad2019-03-214-27/+77
| * | | | | Rename PermitStore --> AccessControlManagerJon Marius Venstad2019-03-217-22/+20
| |/ / / /
* | | | | Merge pull request #8854 from vespa-engine/mpolden/proxy-remove-443Martin Polden2019-03-221-2/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove proxy ACL for port 443Martin Polden2019-03-201-2/+1
* | | | | Merge pull request #8864 from vespa-engine/toregge/test-compact-lidspace-for-...Henning Baldersheim2019-03-212-0/+21
|\ \ \ \ \
| * | | | | Test compact lid space for predicate attribute.Tor Egge2019-03-212-0/+21
| | |/ / / | |/| | |
* | | | | Merge pull request #8863 from vespa-engine/havardpe/nonblocking-portal-socketsHenning Baldersheim2019-03-211-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | set incoming connections to non-blockingHåvard Pettersen2019-03-211-0/+1
|/ / / /
* | | | Merge pull request #8861 from vespa-engine/balder/softtimeout-is-now-default-...Henning Baldersheim2019-03-214-13/+18
|\ \ \ \
| * | | | Enusure that explicit overrides go throughHenning Baldersheim2019-03-213-7/+15
| * | | | Soft timeout is now default in backend. No need to send down properties anymore.Henning Baldersheim2019-03-204-9/+6
* | | | | Merge pull request #8860 from vespa-engine/toregge/use-utility-function-to-cr...Henning Baldersheim2019-03-203-3/+6
|\ \ \ \ \
| * | | | | Use utility function to create nonblocking socketpair.Tor Egge2019-03-203-3/+6
|/ / / / /