summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.212.47-1].vespa-6.212.47-1by-screwdriver2018-02-234-1/+2
* Merge pull request #5088 from vespa-engine/freva/reorder-acl-and-container-startHarald Musum2018-02-212-2/+2
|\
| * Start container before running ACL maintainerValerij Fredriksen2018-02-212-2/+2
|/
* Merge pull request #5090 from vespa-engine/hmusum/split-out-create-containerHarald Musum2018-02-217-9/+51
|\
| * Split out createContainer() into its own methodHarald Musum2018-02-207-9/+51
* | Merge pull request #5092 from vespa-engine/revert-5075-mortent/reapply-ckmsHarald Musum2018-02-2021-173/+294
|\ \
| * | Revert "Refactor identityprovider. Add SiaIdentityProvider"Morten Tokle2018-02-2021-173/+294
|/ /
* | Merge pull request #5091 from vespa-engine/revert-5065-bratseth/typecheck-all-2Jon Bratseth2018-02-2074-1191/+470
|\ \
| * | Revert "Bratseth/typecheck all 2"Jon Bratseth2018-02-2074-1191/+470
|/ /
* | Merge pull request #5089 from vespa-engine/bjorncs/user-principal-in-applicationBjørn Christian Seime2018-02-202-1/+23
|\ \
| * | Support user principal in incoming requestBjørn Christian Seime2018-02-202-1/+23
|/ /
* | Merge pull request #5065 from vespa-engine/bratseth/typecheck-all-2Jon Bratseth2018-02-2074-470/+1191
|\ \
| * | Correct yearJon Bratseth2018-02-201-1/+1
| * | SimplifyJon Bratseth2018-02-201-8/+4
| * | Add class javadocJon Bratseth2018-02-201-0/+8
| * | Propagate type informationJon Bratseth2018-02-1735-50/+95
| * | Static type check reference parametersJon Bratseth2018-02-1711-44/+31
| * | Only match given equal number of argumentsJon Bratseth2018-02-171-14/+4
| * | CleanupJon Bratseth2018-02-172-27/+31
| * | CleanupJon Bratseth2018-02-172-16/+14
| * | CleanupJon Bratseth2018-02-172-23/+17
| * | CleanupJon Bratseth2018-02-171-6/+1
| * | RefactorJon Bratseth2018-02-178-127/+145
| * | Remove dead codeJon Bratseth2018-02-172-89/+8
| * | CleanupJon Bratseth2018-02-176-77/+77
| * | Resolve macro argumentsJon Bratseth2018-02-172-35/+59
| * | Handle nested bindingsJon Bratseth2018-02-143-2/+43
| * | Handle argument bindingsJon Bratseth2018-02-1416-86/+277
| * | Typecheck all WIPJon Bratseth2018-02-1319-108/+356
| * | Re-apply typecheck ranking expressions in JavaJon Bratseth2018-02-0921-112/+375
* | | Merge pull request #5087 from vespa-engine/hmusum/require-vespa-node-maintainerHarald Musum2018-02-201-0/+1
|\ \ \ | |_|/ |/| |
| * | Require vespa-node-maintainerHarald Musum2018-02-201-0/+1
|/ /
* | Merge pull request #5083 from vespa-engine/hmusum/add-node-maintainer-rpmHarald Musum2018-02-201-0/+36
|\ \
| * | Create node maintainer RPMHarald Musum2018-02-201-0/+36
* | | Merge pull request #5085 from vespa-engine/toregge/avoid-uninitialized-variab...Arnstein Ressem2018-02-201-0/+2
|\ \ \
| * | | Avoid uninitialized variable warning.Tor Egge2018-02-201-0/+2
* | | | Merge pull request #5069 from vespa-engine/geirst/initial-handling-of-bucket-...Tor Brede Vekterli2018-02-2016-567/+424
|\ \ \ \ | |_|/ / |/| | |
| * | | Cleanup import statements.Geir Storli2018-02-201-1/+0
| * | | Add factory functions for BucketSpaceStats.Geir Storli2018-02-202-7/+14
| * | | License year bump.Geir Storli2018-02-202-2/+2
| * | | Add handling of bucket spaces stats to HostInfo and ClusterStatsAggregator.Geir Storli2018-02-1913-445/+300
| * | | Rename NodeMergeStats -> ContentNodeStats.Geir Storli2018-02-197-60/+60
| * | | Rename StorageMergeStats -> ContentClusterStats.Geir Storli2018-02-196-39/+35
* | | | Merge pull request #5081 from vespa-engine/hmusum/export-package-2Valerij Fredriksen2018-02-201-0/+5
|\ \ \ \
| * | | | Export packageHarald Musum2018-02-201-0/+5
* | | | | Merge pull request #5082 from vespa-engine/hmusum/make-script-executableValerij Fredriksen2018-02-201-0/+0
|\ \ \ \ \
| * | | | | Make script executableHarald Musum2018-02-201-0/+0
|/ / / / /
* | | | | Merge pull request #5076 from vespa-engine/geirst/align-host-info-bucket-spac...Tor Brede Vekterli2018-02-203-14/+18
|\ \ \ \ \
| * | | | | Align bucket spaces json format with what is expected by clustercontroller.Geir Storli2018-02-203-14/+18
| | |_|/ / | |/| | |
* | | | | Merge pull request #5075 from vespa-engine/mortent/reapply-ckmsMorten Tokle2018-02-2021-294/+173
|\ \ \ \ \