summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Use existing bucket space instead of placeholder value"Håkon Hallingstad2017-10-2331-129/+61
* Merge pull request #3852 from vespa-engine/hakonhall/make-slobrokmonitormanag...Bjørn Christian Seime2017-10-231-1/+3
|\
| * Annotate constructor with InjectHåkon Hallingstad2017-10-231-0/+2
| * Make SlobrokMonitorManagerImpl constructor publicHåkon Hallingstad2017-10-231-1/+1
|/
* Merge pull request #3850 from vespa-engine/balder/build-avx512-correctlyArnstein Ressem2017-10-232-10/+1
|\
| * We can now remove the workaround that was not working as we require gcc 6 and...Henning Baldersheim2017-10-232-10/+1
* | Merge pull request #3843 from vespa-engine/toregge/add-bucket-space-to-storag...Tor Brede Vekterli2017-10-2331-61/+129
|\ \ | |/ |/|
| * Pass on bucket space from create visitor command to visitor.Tor Egge2017-10-233-0/+3
| * Add bucket space to create visitor command.Tor Egge2017-10-2312-32/+52
| * Add bucket space to request bucket info command.Tor Egge2017-10-2311-16/+64
| * Use bucket space from existing put or multioperation command whenTor Egge2017-10-231-2/+2
| * Use bucket space from existing multi operation command when creatingTor Egge2017-10-231-1/+1
| * Use bucket space in existing get command when creating new get commands.Tor Egge2017-10-231-1/+1
| * Revert "Add bucket space to GetBucketListReply."Tor Egge2017-10-235-9/+6
* | Merge pull request #3847 from vespa-engine/hmusum/cleanup-local-session-repoJon Bratseth2017-10-2312-74/+63
|\ \
| * | Move tenant application repo out of local session repoHarald Musum2017-10-2312-74/+63
* | | Merge pull request #3846 from vespa-engine/hakonhall/correct-to-currentrestar...Leandro Alves2017-10-231-1/+1
|\ \ \
| * | | Merge branch 'master' of github.com:vespa-engine/vespa into hakonhall/correct...Håkon Hallingstad2017-10-231-2/+2
| |\| |
| * | | Correct to currentRestartGenerationHåkon Hallingstad2017-10-231-1/+1
* | | | Merge pull request #3848 from vespa-engine/bjorncs/athenzBjørn Christian Seime2017-10-239-22/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "Rename TenantType.Athens -> TenantType.Athenz"Bjørn Christian Seime2017-10-239-22/+22
* | | | Merge pull request #3845 from vespa-engine/mortent/rename-configBjørn Christian Seime2017-10-231-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Use correct configMorten Tokle2017-10-231-2/+2
* | | | Merge pull request #3844 from vespa-engine/mortent/rename-configBjørn Christian Seime2017-10-236-9/+10
|\| | |
| * | | serviceproviderendpoing -> load_balancer_addressMorten Tokle2017-10-236-9/+10
* | | | Merge pull request #3842 from vespa-engine/hakonhall/make-slobrokmonitormanag...Bjørn Christian Seime2017-10-2315-130/+174
|\ \ \ \ | |/ / / |/| | |
| * | | Make SlobrokMonitorManager a componentHåkon Hallingstad2017-10-2315-130/+174
* | | | Merge pull request #3830 from vespa-engine/bjorncs/athenz-identity-provider-s...Morten Tokle2017-10-2342-12/+1877
|\ \ \ \
| * | | | Exclude internal dependenciesMorten Tokle2017-10-231-0/+8
| * | | | Add todoMorten Tokle2017-10-231-1/+1
| * | | | Add athenzidentityprovider componentMorten Tokle2017-10-231-0/+1
| * | | | Add fields to signed identity documentMorten Tokle2017-10-2310-47/+221
| * | | | Add Athenz identity provider and configurationMorten Tokle2017-10-2028-58/+599
| * | | | Use placeholder for domain and service nameBjørn Christian Seime2017-10-181-2/+2
| * | | | Write InstanceConfirmation object back to responseBjørn Christian Seime2017-10-181-0/+2
| * | | | Add Athenz Identity Provider ServiceBjørn Christian Seime2017-10-1818-0/+1139
* | | | | Merge pull request #3841 from vespa-engine/bratseth/handle-missing-jobstatusMartin Polden2017-10-231-0/+1
|\ \ \ \ \
| * | | | | Handle missing job statusJon Bratseth2017-10-231-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3840 from vespa-engine/hmusum/do-not-print-stack-traceJon Marius Venstad2017-10-231-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Print message, avoid stack trace in logHarald Musum2017-10-231-1/+2
| |/ / /
* | | | Merge pull request #3838 from vespa-engine/hakonhall/remove-status-type-param...Håkon Hallingstad2017-10-2340-343/+334
|\ \ \ \ | |/ / / |/| | |
| * | | Remove status type parameter in application model classesHåkon Hallingstad2017-10-2240-343/+334
* | | | Merge pull request #3817 from vespa-engine/hakonhall/add-node-metrics-in-node...Håkon Hallingstad2017-10-233-27/+167
|\ \ \ \ | |/ / / |/| | |
| * | | Use VespaVersion instead of VersionHåkon Hallingstad2017-10-201-3/+3
| * | | Add node metrics in node repoHåkon Hallingstad2017-10-193-27/+167
* | | | Merge pull request #3836 from vespa-engine/havardpe/static-functions-for-oper...Arne H Juul2017-10-212-81/+134
|\ \ \ \
| * | | | use static functions for low-level operation evalHåvard Pettersen2017-10-202-81/+134
| | |_|/ | |/| |
* | | | Merge pull request #3835 from vespa-engine/toregge/rename-makebucket-test-met...Tor Brede Vekterli2017-10-2026-203/+203
|\ \ \ \
| * | | | Rename storage::spi::test::makeBucket to storage::spi::test::makeSpiBucket.Tor Egge2017-10-2026-203/+203
* | | | | Merge pull request #3833 from vespa-engine/hmusum/remove-applications-from-mo...Håkon Hallingstad2017-10-202-6/+5
|\ \ \ \ \ | |/ / / / |/| | | |