summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Merge with masterJon Bratseth2017-08-306-89/+55
|\
| * Revert "Fix serialization of legacy deploying value"Martin Polden2017-08-292-39/+1
| * Merge pull request #3252 from vespa-engine/mpolden/application-serialization-fixJon Marius Venstad2017-08-293-15/+14
| |\
| | * Fix serialization of legacy deploying valueMartin Polden2017-08-292-1/+39
| | * Make delayed deployer ignore applications with no delay stepsMartin Polden2017-08-291-1/+4
| | * Fix TODOMartin Polden2017-08-292-43/+1
| * | Merge pull request #3245 from vespa-engine/jvenstad/make-unexpected-deploymen...Martin Polden2017-08-292-26/+31
| |\ \ | | |/ | |/|
| | * Let unexpected deployment return a dummy ActivateResultJon Marius Venstad2017-08-292-26/+31
| * | Merge pull request #3242 from vespa-engine/mpolden/log-first-failing-timeJon Marius Venstad2017-08-291-16/+14
| |\ \ | | |/ | |/|
| | * Log the time when job started failingMartin Polden2017-08-291-16/+14
* | | Nonfunctional changesJon Bratseth2017-08-302-12/+12
|/ /
* | Better importsJon Marius Venstad2017-08-281-3/+5
* | Remove stale data on deployJon Marius Venstad2017-08-284-24/+83
|/
* Ignore stale job data in failure re-deployerMartin Polden2017-08-285-3/+374
* Include more details when retrying failed jobMartin Polden2017-08-285-55/+57
* Disable common assembly IDs for controller modulesMartin Polden2017-08-241-0/+1
* Add ownersMartin Polden2017-08-241-0/+2
* Import controllerMartin Polden2017-08-24178-0/+15361