summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #6385 from vespa-engine/revert-6366-henrhoi/adding-gui-han...Arnstein Ressem2018-07-1215-244/+80
|\ \ \ \
| * | | | Revert "Adding handler and binding when services.xml has <search>-field"Harald Musum2018-07-1215-244/+80
|/ / / /
* | | | Merge pull request #6384 from vespa-engine/revert-6382-gjoranv/READMEArnstein Ressem2018-07-121-6/+1
|\ \ \ \
| * | | | Revert "Update README for container-integration-test"Harald Musum2018-07-121-6/+1
|/ / / /
* | | | Merge pull request #6382 from vespa-engine/gjoranv/READMEgjoranv2018-07-111-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Update README for container-integration-testgjoranv2018-07-111-1/+6
|/ / /
* | | Merge pull request #6366 from vespa-engine/henrhoi/adding-gui-handler-when-bu...Henrik Høiness2018-07-1115-80/+244
|\ \ \ | |/ / |/| |
| * | Removed empty lines to run travis ci againHenrik2018-07-111-2/+1
| * | Changed typoHenrik2018-07-111-1/+1
| * | Added module to parents CMakeLists.txt and created CMakeLists for moduleHenrik2018-07-112-0/+3
| * | Changed import to staticHenrik2018-07-112-19/+19
| * | Moved GUIHandlerTest to own module that can use JDisc-components. GUIHandler ...Henrik2018-07-1010-48/+130
| * | Add GUIHandler to Configmodel and add bundle runtimeHenrik2018-07-104-3/+52
| * | Changed pom.xml and adding of handler in ContainerModelBuilderHenrik2018-07-102-49/+68
| * | Adding handler and binding when services.xml has <search>-fieldHenrik2018-07-091-0/+12
* | | Merge pull request #6379 from vespa-engine/gjoranv/manage-enforcer-plugingjoranv2018-07-112-1/+5
|\ \ \
| * | | Add version management for enforcer-plugin.gjoranv2018-07-112-1/+5
* | | | Merge pull request #6378 from vespa-engine/hmusum/use-new-delete-application-...gjoranv2018-07-111-3/+11
|\ \ \ \
| * | | | Use new delete application code in more zonesHarald Musum2018-07-111-3/+11
* | | | | Merge pull request #6377 from vespa-engine/aressem/compile-application-deploy...Bjørn Christian Seime2018-07-112-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move two Manven plugins to the maven-plugins module so they are compiled in b...Arnstein Ressem2018-07-112-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #6373 from vespa-engine/gjoranv/jaxb-depsgjoranv2018-07-114-3/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | Add jaxb-core and jaxb-impl dependencies and export their packages.gjoranv2018-07-103-2/+14
| * | | Update TODO after creating issue to the Felix team.gjoranv2018-07-101-1/+1
| |/ /
* | | Merge pull request #6375 from vespa-engine/hmusum/build-minimal-set-of-models...gjoranv2018-07-115-11/+19
|\ \ \
| * | | Build minimal set of config modelsHarald Musum2018-07-115-11/+19
* | | | Merge pull request #6372 from vespa-engine/henrhoi/configuration-file-for-guiHenrik Høiness2018-07-112-29/+68
|\ \ \ \ | |/ / / |/| | |
| * | | Added configuration-file on JSON-format. Should later contain predetermined v...Henrik2018-07-102-29/+68
* | | | Merge pull request #6371 from vespa-engine/hmusum/only-create-wanted-vespa-ve...Harald Musum2018-07-104-6/+78
|\ \ \ \
| * | | | Only create model for wanted vespa version on hosted vespaHarald Musum2018-07-104-6/+78
| | |/ / | |/| |
* | | | Merge pull request #6374 from vespa-engine/bjorncs/handle-certificate-revokeBjørn Christian Seime2018-07-104-11/+54
|\ \ \ \ | |_|/ / |/| | |
| * | | Delete identity document when clearing credentialsBjørn Christian Seime2018-07-101-0/+2
| * | | Re-register instance when certificate is revokedBjørn Christian Seime2018-07-101-0/+7
| * | | Parse errors from ZTSBjørn Christian Seime2018-07-103-11/+45
|/ / /
* | | Merge pull request #6370 from vespa-engine/bjorncs/hotfixBjørn Christian Seime2018-07-103-1/+57
|\ \ \ | |/ / |/| |
| * | Add debug logging of the instance confirmation objectBjørn Christian Seime2018-07-102-0/+2
| * | Split registration and refreshBjørn Christian Seime2018-07-103-1/+55
|/ /
* | Merge pull request #6369 from vespa-engine/revert-6367-bjorncs/improve-contro...Arnstein Ressem2018-07-0918-180/+408
|\ \
| * | Revert "Move NTokenValidator to vespa-athenz + load pub keys from file"Harald Musum2018-07-0918-180/+408
|/ /
* | Merge pull request #6358 from vespa-engine/arnej/allocate-vector-before-useGeir Storli2018-07-093-15/+77
|\ \
| * | add unit test for appendPosition()Arne Juul2018-07-091-0/+44
| * | refactor to avoid code duplicationArne Juul2018-07-062-25/+19
| * | allocate vector explicitlyArne Juul2018-07-062-19/+43
* | | Merge pull request #6367 from vespa-engine/bjorncs/improve-controller-resilienceBjørn Christian Seime2018-07-0918-408/+180
|\ \ \
| * | | Add missing newline at end of fileBjørn Christian Seime2018-07-091-1/+1
| * | | Move NTokenValidator to vespa-athenz + load pub keys from fileBjørn Christian Seime2018-07-0918-408/+180
|/ / /
* | | Merge pull request #6364 from vespa-engine/hmusum/delete-inactive-sessions-in...Jon Bratseth2018-07-0910-59/+106
|\ \ \
| * | | Move deletion of inactive sessions to a maintainerHarald Musum2018-07-0910-59/+106
* | | | Merge pull request #6365 from vespa-engine/bjorncs/jdisc-content-size-metricBjørn Christian Seime2018-07-092-1/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use ServletRequestReader to determine bytes consumedBjørn Christian Seime2018-07-092-1/+7
|/ / /