summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.233.17-1].vespa-6.233.17-1by-screwdriver2018-04-194-1/+2
* Merge pull request #5623 from vespa-engine/geirst/use-more-generic-api-in-imp...Tor Egge2018-04-184-17/+22
|\
| * Use ISearchContext instead of AttributeVector::SearchContext in ImportedSearc...Geir Storli2018-04-184-17/+22
* | Merge pull request #5610 from vespa-engine/smorgrav/iptableseditorTorbjørn Smørgrav2018-04-187-104/+389
|\ \
| * | What happened to the Acl import statements?toby2018-04-183-7/+3
| * | Revert changes in log line - used in other unit teststoby2018-04-181-1/+1
| * | Test the restore content for the iptables editortoby2018-04-186-89/+270
| * | LineEdit type does not need to be publictoby2018-04-182-6/+2
| * | Keep editor javadoc for filestoby2018-04-181-5/+10
| * | Implement general iptables editor support to enable redirect to live side by ...toby2018-04-185-103/+210
|/ /
* | Merge pull request #5620 from vespa-engine/balder/extend-and-control-target-t...Henning Baldersheim2018-04-185-8/+10
|\ \
| * | No reason to fake history to simulate a faster moving clock.Henning Baldersheim2018-04-182-4/+2
| * | Default 10 minutes TTLHenning Baldersheim2018-04-181-2/+2
| * | Make rpc target cache ttl configurable with a deafult lifted from 30s to 10 m...Henning Baldersheim2018-04-182-2/+6
* | | Merge pull request #5616 from vespa-engine/freva/add-nodesValerij Fredriksen2018-04-1840-433/+416
|\ \ \
| * | | Fix hashCodeValerij Fredriksen2018-04-181-15/+8
| * | | Move NodeSpec to noderepositoryValerij Fredriksen2018-04-1827-27/+24
| * | | Move Acl to noderepositoryValerij Fredriksen2018-04-187-6/+5
| * | | Remove outdated commentValerij Fredriksen2018-04-181-4/+0
| * | | Simplify streamValerij Fredriksen2018-04-181-21/+18
| * | | Remove defaultFlavor from EnvironmentValerij Fredriksen2018-04-187-20/+0
| * | | Remove unused methodValerij Fredriksen2018-04-183-34/+1
| * | | Remove unneeded bindingsValerij Fredriksen2018-04-189-100/+27
| * | | Move NodeAttributes to noderepositoryValerij Fredriksen2018-04-189-7/+8
| * | | Method to add nodes to node-repositoryValerij Fredriksen2018-04-185-25/+151
| * | | Create NodeRepositoryNode bindingValerij Fredriksen2018-04-183-203/+203
| |/ /
* | | Merge pull request #5621 from vespa-engine/bjorncs/configserver-authz-filterBjørn Christian Seime2018-04-1810-33/+192
|\ \ \ | |/ / |/| |
| * | Change format of provider unique instance idBjørn Christian Seime2018-04-181-1/+1
| * | Add helper method for extracting issuer common nameBjørn Christian Seime2018-04-171-3/+4
| * | Rename getCommonNames -> getSubjectCommonNamesBjørn Christian Seime2018-04-174-4/+3
| * | Add helper for extracting SANs from certificateBjørn Christian Seime2018-04-177-29/+188
* | | Merge pull request #5618 from vespa-engine/revert-5615-revert-5603-bjorncs/jettyHenning Baldersheim2018-04-181-1/+1
|\ \ \
| * | | Revert "Revert "Use Jetty 9.4.9""Henning Baldersheim2018-04-181-1/+1
|/ / /
* | | Merge pull request #5615 from vespa-engine/revert-5603-bjorncs/jettyHarald Musum2018-04-171-1/+1
|\ \ \
| * | | Revert "Use Jetty 9.4.9"Arnstein Ressem2018-04-171-1/+1
|/ / /
* | | Merge pull request #5614 from vespa-engine/hmusum/set-supported-env-variable-...Harald Musum2018-04-171-1/+2
|\ \ \
| * | | Set VESPA_CONFIGSERVERSHarald Musum2018-04-171-1/+2
* | | | Merge pull request #5611 from vespa-engine/jvenstad/dep-orch-minorsMartin Polden2018-04-1717-83/+70
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes to earlier commentsJon Marius Venstad2018-04-1717-83/+70
* | | | Merge pull request #5609 from vespa-engine/hmusum/remove-logic-for-choosing-b...Harald Musum2018-04-174-54/+6
|\ \ \ \
| * | | | Remove logic for choosing between deploy and prepare-activateHarald Musum2018-04-174-54/+6
| | |/ / | |/| |
* | | | Merge pull request #5612 from vespa-engine/freva/write-container-data-in-hostedValerij Fredriksen2018-04-178-414/+2
|\ \ \ \
| * | | | Write container data in hostedValerij Fredriksen2018-04-178-414/+2
| |/ / /
* | | | Merge pull request #5613 from vespa-engine/revert-5594-bratseth/dispatch-summ...Jon Bratseth2018-04-1730-292/+201
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "Bratseth/dispatch summaries take 3"Jon Bratseth2018-04-1730-292/+201
|/ / /
* | | Merge pull request #5608 from vespa-engine/jvenstad/dep-orch-less-lockingJon Marius Venstad2018-04-171-3/+3
|\ \ \ | |_|/ |/| |
| * | Lock only if presentJon Marius Venstad2018-04-171-1/+1
| * | Lock only when writing in computation of job queueJon Marius Venstad2018-04-171-3/+3
| |/
* | Merge pull request #5607 from vespa-engine/bratseth/even-more-less-old-junitgjoranv2018-04-1758-296/+661
|\ \ | |/ |/|
| * Remove usage of junit.frameworkJon Bratseth2018-04-1758-296/+661