summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2237 from yahoo/balder/acivate-enfoce-overrideHåvard Pettersen2017-04-241-1/+1
|\
| * Enable the override warning.Henning Baldersheim2017-04-231-1/+1
* | Merge pull request #2240 from yahoo/mpolden/allow-delete-for-provisioned-nodesJon Bratseth2017-04-243-6/+11
|\ \
| * | Allow nodes in state provisioned to be deletedMartin Polden2017-04-243-6/+11
|/ /
* | Merge pull request #2239 from yahoo/balder/ning-1.8.17Henning Baldersheim2017-04-232-2/+2
|\ \
| * | The cookie was moved between 1.7 and 1.8Henning Baldersheim2017-04-231-1/+1
| * | Stick to 1.8.17.Henning Baldersheim2017-04-231-1/+1
|/ /
* | Merge pull request #2238 from yahoo/revert-2234-balder/latest-ning-1.9Henning Baldersheim2017-04-237-31/+34
|\ \ | |/ |/|
| * Revert "ning 1.9.40"Henning Baldersheim2017-04-237-31/+34
|/
* Merge pull request #2236 from yahoo/balder/enforce-override-2Henning Baldersheim2017-04-23467-4205/+2085
|\
| * Do not pretend to be root.Henning Baldersheim2017-04-232-2/+2
| * Repair clion encoding mess.Henning Baldersheim2017-04-231-2/+2
| * Enable the warning in a separate step.Henning Baldersheim2017-04-231-1/+1
| * Follow api changeHenning Baldersheim2017-04-232-9/+4
| * Some cleanup after major rebase.Henning Baldersheim2017-04-236-38/+41
| * override and optimise includes.Henning Baldersheim2017-04-2331-165/+71
| * Add override to memfilepersistence.Henning Baldersheim2017-04-2316-215/+112
| * Including storage now builds fine with override enforcement.Henning Baldersheim2017-04-23192-1881/+940
| * Use overrideHenning Baldersheim2017-04-23230-1920/+940
| * Warn about missing overrideHenning Baldersheim2017-04-221-1/+1
* | Merge pull request #2235 from yahoo/arnej/init-before-thread-startHenning Baldersheim2017-04-232-3/+3
|\ \
| * | initialize variables before starting threadArne H Juul2017-04-232-3/+3
| |/
* | Merge pull request #2234 from yahoo/balder/latest-ning-1.9Bjørn Christian Seime2017-04-237-34/+31
|\ \ | |/ |/|
| * ning 1.9.40Henning Baldersheim2017-04-227-34/+31
|/
* Merge pull request #2230 from yahoo/havardpe/vespalib-socketsArne H Juul2017-04-2230-522/+289
|\
| * handle sig int in separate threadHaavard2017-04-211-1/+10
| * let socket handle handle more socket stuffHaavard2017-04-2130-521/+279
* | Merge pull request #2221 from yahoo/arnej/add-Werror-in-bundle-pluginArne H Juul2017-04-223-5/+30
|\ \
| * | enable more warningsArne H Juul2017-04-211-1/+14
| * | enable more warningsArne H Juul2017-04-211-1/+8
| * | enable more warningsArne H Juul2017-04-211-3/+8
| |/
* | Merge pull request #2233 from yahoo/balder/felix-5.6Henning Baldersheim2017-04-221-2/+2
|\ \
| * | Up felix to 5.6Henning Baldersheim2017-04-221-2/+2
* | | Merge pull request #2232 from yahoo/toregge/handle-missing-attribute-in-attri...Henning Baldersheim2017-04-222-5/+19
|\ \ \ | |/ / |/| |
| * | Handle missing attribute in attribute blueprint factory.Tor Egge2017-04-222-5/+19
* | | Merge pull request #2231 from yahoo/balder/latest-felix-4Henning Baldersheim2017-04-223-3/+21
|\ \ \ | |/ / |/| |
| * | Implement additional required proxy methods by felix 4.6.1 compared to 4.2.1.Henning Baldersheim2017-04-222-0/+18
| * | Use latest felix 4.Henning Baldersheim2017-04-221-3/+3
|/ /
* | Merge pull request #2229 from yahoo/balder/breakfix-maintenancecontroller-testHenning Baldersheim2017-04-211-2/+4
|\ \
| * | Must use a separate executor. Can not run the config change in the generic ex...Henning Baldersheim2017-04-211-2/+4
|/ /
* | Merge pull request #2225 from yahoo/balder/also-sync-generic-executor-in-mast...Henning Baldersheim2017-04-211-2/+2
|\ \
| * | generic executor must be synced independed of being invoked by master thread ...Henning Baldersheim2017-04-211-2/+2
* | | Merge pull request #2227 from yahoo/geirst/only-update-maintenance-controller...Tor Egge2017-04-217-54/+123
|\ \ \
| * | | Simplify use of ComparisonResult.Geir Storli2017-04-211-38/+25
| * | | Only change MaintenanceController if config has changed during re-config.Geir Storli2017-04-215-1/+78
| * | | Consolidate naming of variables in struct DocumentDBConfig::ComparisonResult.Geir Storli2017-04-216-34/+39
* | | | Merge pull request #2215 from yahoo/revert-2213-revert-2202-balder/fast-acces...Henning Baldersheim2017-04-216-95/+195
|\ \ \ \
| * | | | Update expected answer in test too.Henning Baldersheim2017-04-201-1/+1
| * | | | AttributesConfigProducer must not inherit config from StreamingSearchCluster.Henning Baldersheim2017-04-201-1/+1
| * | | | Revert "Revert "Balder/fast access fields are also in memory for streaming se...Henning Baldersheim2017-04-206-95/+195
| |/ / /