summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Actually delete the branch.Arnstein Ressem2017-09-111-1/+1
* Merge pull request #3367 from vespa-engine/hakon/move-slobrokmonitor-to-javaBjørn Christian Seime2017-09-085-163/+100
|\
| * Review round 1 fixesHåkon Hallingstad2017-09-081-8/+8
| * Move SlobrokMonitor to JavaHåkon Hallingstad2017-09-075-163/+100
* | Merge pull request #3344 from vespa-engine/toregge/remove-unneeded-boundary-c...Geir Storli2017-09-087-14/+13
|\ \
| * | Remove boundary check for mapping from lid to referenced lid sinceTor Egge2017-09-067-14/+13
* | | Merge pull request #3373 from vespa-engine/arnej/allow-env-overrideJon Bratseth2017-09-085-34/+13
|\ \ \
| * | | use HostName.getLocalhostArne Juul2017-09-081-8/+2
| * | | use HostName.getLocalhostArne Juul2017-09-081-11/+3
| * | | use HostName.getLocalhostArne Juul2017-09-081-7/+2
| * | | use HostName.getLocalhostArne Juul2017-09-081-7/+2
| * | | allow override from env.varArne Juul2017-09-081-1/+4
* | | | Merge pull request #3371 from vespa-engine/gjoranv/exclude-scala-xml3Bjørn Christian Seime2017-09-087-1/+35
|\ \ \ \ | |/ / / |/| | |
| * | | Exclude scala-xml from provided classpathgjoranv2017-09-087-1/+35
* | | | Merge pull request #3370 from vespa-engine/arnej/find-hostname-in-defaults-mo...Jon Bratseth2017-09-0819-83/+96
|\ \ \ \ | |/ / / |/| | |
| * | | rename source filesArne Juul2017-09-084-3/+3
| * | | rename variableArne Juul2017-09-083-4/+4
| * | | use vespa-print-default hostnameArne Juul2017-09-081-3/+1
| * | | use Defaults::vespaHostnameArne Juul2017-09-084-26/+8
| * | | use Defaults::vespaHostnameArne Juul2017-09-081-13/+6
| * | | use Defaults::vespaHostnameArne Juul2017-09-081-11/+2
| * | | use Defaults.vespaHostnameArne Juul2017-09-082-21/+7
| * | | add vespaHostname functionArne Juul2017-09-084-2/+65
* | | | Merge pull request #3368 from vespa-engine/mpolden/fix-deployment-spec-castMartin Polden2017-09-087-25/+73
|\ \ \ \
| * | | | Fix deployment spec cast in container cluster modelMartin Polden2017-09-087-25/+73
| |/ / /
* | | | Merge pull request #3369 from vespa-engine/gjoranv/lessons-learnedBjørn Christian Seime2017-09-083-8/+2
|\ \ \ \
| * | | | Add comment about xml-apis dependency.gjoranv2017-09-081-0/+1
| * | | | Improve comment about malicious Import-Package.gjoranv2017-09-081-1/+1
| * | | | Remove unused method leaking InnerCNode from config-bundle.gjoranv2017-09-081-7/+0
|/ / / /
* | | | Merge pull request #3303 from vespa-engine/smorgrav/fail_on_unresolved_hostnameJon Bratseth2017-09-089-67/+130
|\ \ \ \ | |/ / / |/| | |
| * | | Remove dead code and tune javadoctoby2017-09-072-6/+3
| * | | Also allow random hostnames in mock name resolvertoby2017-09-062-0/+6
| * | | Add back new NodePrioritizer parametertoby2017-09-061-1/+2
| * | | Revert some of the test thingtoby2017-09-063-18/+6
| * | | Add known records to the mocked name resolver from provision testertoby2017-09-064-60/+62
| * | | Update NodePrioritizer inittoby2017-09-061-5/+6
| * | | Use NameResolver from noderepo - which provides a mock instancetoby2017-09-066-30/+61
| * | | Different dns resolve behavior in prod and testingtoby2017-09-064-2/+16
| * | | Avoid using ip addresses that does not resolve to a hostnametoby2017-09-062-3/+26
* | | | Merge pull request #3363 from vespa-engine/bratseth/create-mock-issues-on-demandJon Marius Venstad2017-09-0730-176/+193
|\ \ \ \
| * | | | Fix Javadoc markupJon Bratseth2017-09-071-1/+1
| * | | | Don't fail to return an issueJon Bratseth2017-09-071-5/+12
| * | | | Nonfunctional changes onlyJon Bratseth2017-09-0730-171/+181
* | | | | Merge pull request #3366 from vespa-engine/revert-3358-origin/gjoranv/exclude...Bjørn Christian Seime2017-09-075-26/+0
|\ \ \ \ \
| * | | | | Revert "Exclude scala-xml from provided classpath"gjoranv2017-09-075-26/+0
|/ / / / /
* | | | | Merge pull request #3365 from vespa-engine/revert-3362-gjoranv/remove-fat-mod...Bjørn Christian Seime2017-09-072-1/+1
|\ \ \ \ \
| * | | | | Revert "Gjoranv/remove fat model import"gjoranv2017-09-072-1/+1
|/ / / / /
* | | | | Merge pull request #3364 from vespa-engine/mpolden/lock-in-async-redeployJon Bratseth2017-09-074-55/+34
|\ \ \ \ \
| * | | | | Ensure that async deployment locks applicationMartin Polden2017-09-074-55/+34
|/ / / / /
* | | | | Merge pull request #3362 from vespa-engine/gjoranv/remove-fat-model-importBjørn Christian Seime2017-09-072-1/+1
|\ \ \ \ \