aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4049 from vespa-engine/toregge/change-pending-cluster-sta...Tor Brede Vekterli2017-11-097-65/+111
|\
| * Improve method naming: constructorHelper -> initializeBucketSpaceTransitions.Tor Egge2017-11-082-7/+8
| * Change pending cluster state to handle more than one bucket space.Tor Egge2017-11-082-24/+43
| * Rename mergeInto() to MergeIntoBucketDatabases() and remove argument,Tor Egge2017-11-084-10/+8
| * Add test method to get a specific pending bucket space db transition from aTor Egge2017-11-083-17/+14
| * Pass distributor bucket space repo to pending cluster state.Tor Egge2017-11-087-14/+45
* | Merge pull request #4069 from vespa-engine/havardpe/tweak-tensor-irArne H Juul2017-11-0915-222/+201
|\ \
| * | use const references and stash instead of UPHåvard Pettersen2017-11-0915-222/+201
* | | Merge pull request #4061 from vespa-engine/hmusum/improve-create-and-delete-t...Henning Baldersheim2017-11-092-4/+15
|\ \ \
| * | | Improve creation and deletion of tenantsHarald Musum2017-11-092-4/+15
* | | | Merge pull request #4066 from vespa-engine/lesters/add-java-tensor-conformanc...Jon Bratseth2017-11-094-3/+177
|\ \ \ \
| * | | | Add error tolerance for tensor equalsLester Solbakken2017-11-091-1/+3
| * | | | Add bounds checking for indexed tensorLester Solbakken2017-11-091-2/+10
| * | | | Add tensor conformance test in JavaLester Solbakken2017-11-092-0/+164
| | |_|/ | |/| |
* | | | Merge pull request #4051 from vespa-engine/lesters/add-mixed-tensor-serializa...Jon Bratseth2017-11-097-3/+979
|\ \ \ \
| * | | | Correct use of asText instead of toString in JSONLester Solbakken2017-11-091-12/+4
| * | | | Add test for mixed tensor as scalarLester Solbakken2017-11-091-0/+7
| * | | | Add copyright headerLester Solbakken2017-11-081-0/+2
| * | | | Add mixed tensor serialization/deserializationLester Solbakken2017-11-087-3/+978
| |/ / /
* | | | Merge pull request #4063 from vespa-engine/revert-4059-hmusum/move-filedownlo...Henning Baldersheim2017-11-0914-252/+123
|\ \ \ \
| * | | | Revert "Move file distribution stuff to filedistribution module"Harald Musum2017-11-0914-252/+123
|/ / / /
* | | | Merge pull request #4052 from vespa-engine/bjorncs/jdisc-http-service-cleanupBjørn Christian Seime2017-11-0915-745/+23
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove 'test' suffix from package name. Remove more dead codeBjørn Christian Seime2017-11-096-289/+3
| * | | Remove dead codeBjørn Christian Seime2017-11-085-362/+0
| * | | Make PemKeyStoreProvider an static inner classBjørn Christian Seime2017-11-082-20/+13
| * | | Move JKSKeyStore to separate packageBjørn Christian Seime2017-11-082-2/+4
| * | | Fix author tag. Remove unused classBjørn Christian Seime2017-11-087-76/+6
| * | | Move SslContextFactory to test source directoryBjørn Christian Seime2017-11-084-4/+5
| * | | Move test utils to test source directoryBjørn Christian Seime2017-11-085-0/+0
| |/ /
* | | Merge pull request #4059 from vespa-engine/hmusum/move-filedownload-to-filedi...Henning Baldersheim2017-11-0914-123/+252
|\ \ \
| * | | Move file distribution stuff to filedistribution moduleHarald Musum2017-11-0914-123/+252
* | | | Merge pull request #4060 from vespa-engine/hmusum/remove-unnecessary-argumentValerij Fredriksen2017-11-097-22/+13
|\ \ \ \
| * | | | Metrics is available in component registry, remove from constructor argsHarald Musum2017-11-097-22/+13
* | | | | Merge pull request #4054 from vespa-engine/toregge/remove-dead-code-in-cluste...Geir Storli2017-11-092-17/+0
|\ \ \ \ \
| * | | | | Remove dead code in distributor cluster information.Tor Egge2017-11-082-17/+0
| | |_|/ / | |/| | |
* | | | | Merge pull request #4055 from vespa-engine/toregge/continue-checking-distribu...Geir Storli2017-11-091-2/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Check all distributor nodes that go down instead of only the first one.Tor Egge2017-11-081-2/+4
| |/ / /
* | | | Merge pull request #4047 from vespa-engine/jvenstad/more-deployment-cleanupJon Marius Venstad2017-11-0915-50/+119
|\ \ \ \
| * \ \ \ Resolved conflicts;Jon Marius Venstad2017-11-0938-424/+540
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Reinserted condition which should not have been removedJon Marius Venstad2017-11-093-4/+7
| * | | | Fixed conflictJon Marius Venstad2017-11-0838-112/+513
| |\ \ \ \
| * | | | | Check for ! lastTriggered.at.isBefore.lastCompeted.at, which is betterJon Marius Venstad2017-11-0812-31/+80
| * | | | | Merged masterJon Marius Venstad2017-11-084-2/+11
| * | | | | Merging masterJon Marius Venstad2017-11-085-61/+71
| |\ \ \ \ \
| * | | | | | Popped stashJon Marius Venstad2017-11-084-1/+4
| * | | | | | Some minors and commentsJon Marius Venstad2017-11-085-26/+32
* | | | | | | Merge pull request #4058 from vespa-engine/revert-4056-revert-4048-mpolden/re...Martin Polden2017-11-092-24/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Revert "Revert "Remove configserver-app magic include""Martin Polden2017-11-092-24/+3
* | | | | | | Merge pull request #4057 from vespa-engine/hmusum/use-already-created-instanceHarald Musum2017-11-091-6/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Use Tenants already created in @BeforeHarald Musum2017-11-091-6/+4