summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Wire in deployment so that we can copy the file in when the old way i...Henning Baldersheim2017-11-1016-270/+88
* Merge pull request #4082 from vespa-engine/revert-4081-hmusum/add-option-to-d...Henning Baldersheim2017-11-105-78/+37
|\
| * Revert "Add 'disabled' option for filedistribution"Henning Baldersheim2017-11-105-78/+37
|/
* Merge pull request #4081 from vespa-engine/hmusum/add-option-to-disable-filed...Henning Baldersheim2017-11-105-37/+78
|\
| * Add 'disabled' option for filedistributionHarald Musum2017-11-105-37/+78
* | Merge pull request #4067 from vespa-engine/balder/wire-in-filecopy-on-deploy-...Henning Baldersheim2017-11-1016-88/+270
|\ \ | |/ |/|
| * Disable double addFile as legacy code has not been verified yet.Henning Baldersheim2017-11-101-1/+2
| * Wire in deployment so that we can copy the file in when the old way is gone.Henning Baldersheim2017-11-0916-88/+269
* | Merge pull request #4077 from vespa-engine/hmusum/split-out-filedistribution-...Henning Baldersheim2017-11-106-121/+178
|\ \
| * | Split out file distribution RPC methods into its own classHarald Musum2017-11-106-121/+178
* | | Merge pull request #4068 from vespa-engine/geirst/add-replay-operation-cost-t...Henning Baldersheim2017-11-107-30/+72
|\ \ \
| * | | Incorporate replay cost of a single operation in prepare restart flush strategy.Geir Storli2017-11-097-30/+72
* | | | Merge pull request #4078 from vespa-engine/hmusum/cleanup-for-unused-dirsArnstein Ressem2017-11-102-12/+3
|\ \ \ \
| * | | | Remove handling of directories that are not in use anymoreHarald Musum2017-11-102-12/+3
* | | | | Merge pull request #4076 from vespa-engine/bratseth/allow-parallel-non-produc...Jon Marius Venstad2017-11-101-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Allow parallel triggering of non-prod jobsJon Bratseth2017-11-101-2/+2
|/ / / /
* | | | Merge pull request #4075 from mnagaya/use_https_urlArnstein Ressem2017-11-101-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Change repository url to HTTPSMasakazu Nagaya2017-11-101-1/+1
* | | | Merge pull request #4064 from vespa-engine/jvenstad/deployment-cleanup-3Martin Polden2017-11-1015-87/+55
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed some TODO's, most notably removing the always-1 id for triggeringJon Marius Venstad2017-11-0911-27/+21
| * | | Remove junkJon Marius Venstad2017-11-091-3/+0
| * | | Fix some conditions, remove unused codeJon Marius Venstad2017-11-099-53/+23
| * | | Be more precise about first failures.Jon Marius Venstad2017-11-093-10/+11
| * | | Merging to get changes from previous branchJon Marius Venstad2017-11-0941-428/+547
| |\ \ \
| * | | | Just comments and a name changeJon Marius Venstad2017-11-093-3/+9
* | | | | 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