summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Various minor fixes to bootstrap scripts"Arnstein Ressem2017-11-033-24/+7
* Merge pull request #3996 from vespa-engine/hmusum/return-correct-response-codeMartin Polden2017-11-035-1/+36
|\
| * Return correct response code when there is a ConfigServerExceptionHarald Musum2017-11-035-1/+36
* | Merge pull request #3987 from palloberg/pallo/boostrap-script-fixesArnstein Ressem2017-11-033-7/+24
|\ \
| * | Enable the installed Maven 3.3 before Java build.Paul Loberg2017-11-022-0/+3
| * | Handle missing source and build directories, as well as paths with whitespace.Paul Loberg2017-11-021-5/+19
| * | Explicitly use "bash" instead of "sh" as the two may not be equivalent in all...Paul Loberg2017-11-021-2/+2
* | | Merge pull request #3997 from vespa-engine/revert-3994-jvenstad/expose-more-d...Jon Marius Venstad2017-11-0314-274/+152
|\ \ \
| * | | Revert "Jvenstad/expose more deployment info in v1"Jon Marius Venstad2017-11-0314-274/+152
|/ / /
* | | Merge pull request #3994 from vespa-engine/jvenstad/expose-more-deployment-in...Jon Bratseth2017-11-0314-152/+274
|\ \ \ | |_|/ |/| |
| * | Started JobListJon Marius Venstad2017-11-031-0/+57
| * | Add upgrade condition to running jobs, tooJon Marius Venstad2017-11-021-0/+1
| * | Fixed test and resolved conflictJon Marius Venstad2017-11-02156-1961/+1712
| |\ \
| * | | API cleanupJon Marius Venstad2017-11-021-23/+7
| * | | Add relevant job info to application blobsJon Marius Venstad2017-11-022-25/+88
| * | | Updated testsJon Marius Venstad2017-11-023-24/+22
| * | | Expose deploying applications, and some cleanupJon Marius Venstad2017-11-0212-78/+87
| * | | Getting ApplicationList changesJon Marius Venstad2017-11-0273-735/+1234
| |\ \ \
| * | | | UnfinishedJon Marius Venstad2017-11-023-9/+37
* | | | | Merge pull request #3985 from vespa-engine/hmusum/add-filedistribution-skeletonHarald Musum2017-11-037-75/+336
|\ \ \ \ \
| * | | | | Add file distribution skeleton to config proxyHarald Musum2017-11-027-75/+336
* | | | | | Merge pull request #3925 from vespa-engine/balder/enable-metrics-reporting-ea...Henning Baldersheim2017-11-0218-179/+112
|\ \ \ \ \ \
| * | | | | | Do not follow the nullptr.Henning Baldersheim2017-11-026-40/+28
| * | | | | | Clean up some unused code.Henning Baldersheim2017-10-302-68/+27
| * | | | | | Open state API befor replaying TLS and setting up stuff to allow insight duri...Henning Baldersheim2017-10-271-4/+3
| * | | | | | Minor code maintenance while waiting for build to complete.Henning Baldersheim2017-10-2711-67/+54
* | | | | | | Merge pull request #3993 from vespa-engine/toregge/fix-distributor-bucket-spa...Henning Baldersheim2017-11-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Adjust class comment for DistributorBucketSpace.Tor Egge2017-11-021-1/+1
* | | | | | | | Merge pull request #3991 from vespa-engine/geirst/reduce-use-of-place-holder-...Henning Baldersheim2017-11-027-11/+49
|\ \ \ \ \ \ \ \
| * | | | | | | | Iterate all bucket spaces in DeadLockDetector when getting bucket lock info.Geir Storli2017-11-022-3/+11
| * | | | | | | | Iterate all bucket spaces in BucketManager when calculating metrics and repor...Geir Storli2017-11-025-6/+35
| * | | | | | | | Use bucket from command when getting bucket database.Geir Storli2017-11-021-2/+3
* | | | | | | | | Merge pull request #3983 from vespa-engine/balder/remove-fastos-runtime-depen...Henning Baldersheim2017-11-025-8/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Remove fastos as runtime dependencyHenning Baldersheim2017-11-025-8/+8
* | | | | | | | | Merge pull request #3986 from vespa-engine/hmusum/move-list-tenants-handler-i...Harald Musum2017-11-027-145/+59
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into hmusum/move-list-tenants-handler-into-tenant-handlerHarald Musum2017-11-027-73/+105
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove ListTenantsHandler (move functionality to TenantsHandler)Harald Musum2017-11-027-145/+59
* | | | | | | | | | Merge pull request #3992 from vespa-engine/bjorncs/travisBjørn Christian Seime2017-11-021-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Set heap size for JVMBjørn Christian Seime2017-11-021-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3990 from vespa-engine/bjorncs/fixBjørn Christian Seime2017-11-022-7/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Work around akward semantics with TemporalAmount/DurationBjørn Christian Seime2017-11-022-7/+5
|/ / / / / / / /
* | | | | | | | Merge pull request #3919 from vespa-engine/bratseth/OWNERS-cleanupKim Omar Johansen2017-11-025-5/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove tmartins and empty linesJon Bratseth2017-10-275-5/+0
* | | | | | | | | Merge pull request #3978 from vespa-engine/bjorncs/reduce-log-spamgjoranv2017-11-022-68/+105
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Cleanup MetricUpdaterBjørn Christian Seime2017-11-022-70/+105
| * | | | | | | | Don't log exception if Linux specific file does not existBjørn Christian Seime2017-11-021-0/+2
* | | | | | | | | Merge pull request #3984 from vespa-engine/vekterli/add-reserved-document-typ...Jon Bratseth2017-11-024-0/+123
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Add reserved name validation for document type namesTor Brede Vekterli2017-11-024-0/+123
* | | | | | | | | Merge pull request #3977 from vespa-engine/mortent/identity-provider-read-secretBjørn Christian Seime2017-11-026-39/+126
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Read key from secretstore, refactor configMorten Tokle2017-11-026-39/+126