Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-11-29 | 109 | -942/+1241 |
| | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. | ||||
* | Merge pull request #4290 from vespa-engine/freva/return-nan-first-time | Harald Musum | 2017-11-28 | 1 | -3/+3 |
|\ | | | | | Return NaN the first time CPU util is called | ||||
| * | Return NaN the first time CPU util is called | Valerij Fredriksen | 2017-11-28 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #4286 from ↵ | Henning Baldersheim | 2017-11-28 | 7 | -10/+39 |
|\ \ | | | | | | | | | | | | | vespa-engine/hmusum/more-wiring-for-disabling-filedistributor More wiring for making it possible to disable filedistributor | ||||
| * | | More wiring for making it possible to disable filedistributor | Harald Musum | 2017-11-27 | 7 | -10/+39 |
| | | | |||||
* | | | Merge pull request #4289 from vespa-engine/hmusum/write-to-temp-file-and-move | Henning Baldersheim | 2017-11-28 | 1 | -2/+5 |
|\ \ \ | | | | | | | | | Write to temp file and move it afterwards | ||||
| * | | | Write to temp file and move it afterwards | Harald Musum | 2017-11-28 | 1 | -2/+5 |
| | | | | |||||
* | | | | Merge pull request #4288 from ↵ | Henning Baldersheim | 2017-11-28 | 3 | -12/+14 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | vespa-engine/hmusum/make-tenants-handling-more-robust Do not create system tenants in constructor. Do not put into map of t… | ||||
| * | | | Do not create system tenants in constructor. Do not put into map of tenants ↵ | Harald Musum | 2017-11-27 | 3 | -12/+14 |
| |/ / | | | | | | | | | | unless absent | ||||
* | | | Merge pull request #4287 from vespa-engine/freva/add-https-bindings | Morten Tokle | 2017-11-28 | 2 | -1/+34 |
|\ \ \ | |/ / |/| | | Add HTTPS bindings in configserver-app services.xml | ||||
| * | | Add HTTPS bindings in configserver-app services.xml | Valerij Fredriksen | 2017-11-27 | 2 | -1/+34 |
| | | | |||||
* | | | Merge pull request #4272 from ↵ | Geir Storli | 2017-11-27 | 13 | -75/+94 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/toregge/use-standard-locking-in-storage-classes Use standard locking in storage classes | ||||
| * | | | Use standard locking in BucketOperationLogger. | Tor Egge | 2017-11-24 | 3 | -6/+7 |
| | | | | |||||
| * | | | Use standard locking in StorageLinkQueued. | Tor Egge | 2017-11-24 | 2 | -12/+20 |
| | | | | |||||
| * | | | Remove unused code from StorageLinkQueued. | Tor Egge | 2017-11-24 | 2 | -13/+0 |
| | | | | |||||
| * | | | Use standard locking in StorageComponent. | Tor Egge | 2017-11-24 | 2 | -10/+10 |
| | | | | |||||
| * | | | Use standard locking in BucketManager. | Tor Egge | 2017-11-24 | 2 | -21/+24 |
| | | | | |||||
| * | | | Use standard locking in StorageBucketDBInitializer. | Tor Egge | 2017-11-24 | 4 | -13/+33 |
| | | | | |||||
* | | | | Merge pull request #4285 from ↵ | Henning Baldersheim | 2017-11-27 | 2 | -20/+28 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/use-FileChannel-for-file-copying Copy files correctly | ||||
| * | | | | Copy files correctly | Harald Musum | 2017-11-27 | 2 | -20/+28 |
| | |_|/ | |/| | | | | | | | | | | | | | | Use FileChannel to copy files instead of using Readers and Writers (makes it work for binary files too) | ||||
* | | | | Merge pull request #4281 from vespa-engine/gjoranv/ban-compile-deps | gjoranv | 2017-11-27 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | Ban all compile scope deps. | ||||
| * | | | Ban all compile scope deps. | gjoranv | 2017-11-25 | 1 | -1/+2 |
| |/ / | |||||
* | | | Merge pull request #4282 from ↵ | Henning Baldersheim | 2017-11-27 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | vespa-engine/hmusum/fix-start-filedistribution-on-config-server Make sure file distributor is started when disable_filedistributor is… | ||||
| * | | Make sure file distributor is started when disable_filedistributor is unset | Harald Musum | 2017-11-27 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #4277 from vespa-engine/freva/docker-container-kernel-usage | Valerij Fredriksen | 2017-11-27 | 4 | -19/+43 |
|\ \ \ | |/ / |/| | | Freva/docker container kernel usage | ||||
| * | | Rearrange calculations, fix comments. No functional changes | Valerij Fredriksen | 2017-11-27 | 1 | -12/+13 |
| | | | |||||
| * | | Export cpu.sys.util metric | Valerij Fredriksen | 2017-11-24 | 1 | -0/+2 |
| | | | |||||
| * | | Add metric for kernel cpu usage in docker container | Valerij Fredriksen | 2017-11-24 | 3 | -16/+37 |
| | | | |||||
* | | | Merge pull request #4267 from vespa-engine/mortent/validate-identity | Bjørn Christian Seime | 2017-11-27 | 5 | -8/+101 |
|\ \ \ | | | | | | | | | Validate athenz-domain in deployment.xml equal to tenant domain | ||||
| * | | | Validate athenz-domain in deployment.xml equal to tenant domain | Morten Tokle | 2017-11-24 | 5 | -8/+101 |
| | | | | |||||
* | | | | Merge pull request #4280 from ↵ | Henning Baldersheim | 2017-11-27 | 17 | -33/+176 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/add-setting-for-disabling-filedsitributor Add setting for turning off file distributor | ||||
| * | | | | Add setting for turning off file distributor | Harald Musum | 2017-11-27 | 17 | -33/+176 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If set, will not start file distributor on config server host and on tenant nodes, will instead use config proxy and file distribution will be done with RPC calls between config proxy and config server | ||||
* | | | | | Merge pull request #4279 from vespa-engine/hmusum/copy-file-correctly | Henning Baldersheim | 2017-11-27 | 1 | -1/+21 |
|\ \ \ \ \ | |/ / / / |/| | | | | Copy file in a way that preserves the content | ||||
| * | | | | Copy file in a way that preserves the content | Harald Musum | 2017-11-25 | 1 | -1/+21 |
|/ / / / | | | | | | | | | | | | | | | | | IOUtils.copy(File, File) copies by using readers and default character set, does not work for binary files). | ||||
* | | | | Merge pull request #4276 from vespa-engine/hmusum/remove-duplicate-dependency | Bjørn Christian Seime | 2017-11-24 | 1 | -5/+0 |
|\ \ \ \ | | | | | | | | | | | Remove duplicate dependency | ||||
| * | | | | Remove duplicate dependency | Harald Musum | 2017-11-24 | 1 | -5/+0 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #4274 from vespa-engine/mpolden/fix-test | Martin Polden | 2017-11-24 | 18 | -84/+549 |
|\ \ \ \ | | | | | | | | | | | Fix and unignore test | ||||
| * | | | | Fix and unignore test | Martin Polden | 2017-11-24 | 18 | -84/+549 |
| | | | | | |||||
* | | | | | Merge pull request #4275 from ↵ | Harald Musum | 2017-11-24 | 18 | -73/+522 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | vespa-engine/revert-4257-balder/fix-logic-flaw-causing-missing-config-changes Revert "Balder/fix logic flaw causing missing config changes" | ||||
| * | | | | Revert "Balder/fix logic flaw causing missing config changes" | Harald Musum | 2017-11-24 | 18 | -73/+522 |
|/ / / / | |||||
* | | | | Merge pull request #4256 from ↵ | Henning Baldersheim | 2017-11-24 | 2 | -52/+55 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/use-standard-locking-in-lockable-map Use standard locking in LockableMap. | ||||
| * | | | | Use standard locking in LockableMap. | Tor Egge | 2017-11-23 | 2 | -52/+55 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #4257 from ↵ | Henning Baldersheim | 2017-11-24 | 18 | -522/+73 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/balder/fix-logic-flaw-causing-missing-config-changes Balder/fix logic flaw causing missing config changes | ||||
| * | | | | Add explicit unit test of verifyState method. | Henning Baldersheim | 2017-11-24 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Remove some code that was not used, nor correct. | Henning Baldersheim | 2017-11-24 | 3 | -13/+2 |
| | | | | | | | | | | | | | | | | | | | | Fix the code that was used, but was incorrect. | ||||
| * | | | | Always update if something has changed. | Henning Baldersheim | 2017-11-23 | 5 | -26/+18 |
| | | | | | |||||
| * | | | | remove V1 and V2 | Henning Baldersheim | 2017-11-23 | 12 | -470/+14 |
| | | | | | |||||
| * | | | | Add a test proving that we can loose a config change. | Henning Baldersheim | 2017-11-23 | 1 | -14/+35 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #4264 from ↵ | Henning Baldersheim | 2017-11-24 | 1 | -0/+28 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/test-two-config-updates-in-a-row Test that getting two updates before checking for new config uses the… | ||||
| * | | | | Test that getting two updates before checking for new config uses the last | Harald Musum | 2017-11-24 | 1 | -0/+28 |
| | | | | |