Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into bratseth/job-run-reason-tweaks | Jon Bratseth | 2017-11-08 | 3 | -4/+5 |
|\ | |||||
| * | I said I didn't like this code duplication >_< | Jon Marius Venstad | 2017-11-08 | 1 | -2/+1 |
| * | Fix is-upgrading condition | Jon Marius Venstad | 2017-11-08 | 2 | -2/+4 |
* | | Tweak job run reasons | Jon Bratseth | 2017-11-08 | 5 | -33/+30 |
|/ | |||||
* | Merge with master | Jon Bratseth | 2017-11-08 | 18 | -193/+143 |
|\ | |||||
| * | Merge pull request #4026 from vespa-engine/jvenstad/deployment-stuff-cleanup | Jon Marius Venstad | 2017-11-08 | 17 | -193/+138 |
| |\ | |||||
| | * | Removed unused method | Jon Marius Venstad | 2017-11-07 | 1 | -10/+0 |
| | * | Reverted fix | Jon Marius Venstad | 2017-11-07 | 3 | -6/+11 |
| | * | Temporary fix for unstable unit test | Jon Marius Venstad | 2017-11-07 | 3 | -11/+6 |
| | * | Name changes, minor refactoring, should be non-functional only | Jon Marius Venstad | 2017-11-07 | 17 | -183/+138 |
| * | | Fixed conflict | Jon Marius Venstad | 2017-11-07 | 2 | -1/+6 |
| |/ | |||||
* / | Complete upgrades which already started | Jon Bratseth | 2017-11-08 | 4 | -58/+70 |
|/ | |||||
* | Merge pull request #4017 from vespa-engine/jvenstad/deployment-api-expansion-... | Jon Marius Venstad | 2017-11-06 | 14 | -205/+444 |
|\ | |||||
| * | Updated response to show failing, running and # of # production jobs | Jon Marius Venstad | 2017-11-06 | 5 | -50/+61 |
| * | Fixed stray ! | Jon Marius Venstad | 2017-11-03 | 5 | -37/+43 |
| * | Finished JobList, need to fix a test | Jon Marius Venstad | 2017-11-03 | 16 | -190/+412 |
| * | Revert "Jvenstad/expose more deployment info in v1" | Jon Marius Venstad | 2017-11-03 | 14 | -274/+152 |
| * | Started JobList | Jon Marius Venstad | 2017-11-03 | 1 | -0/+57 |
| * | Add upgrade condition to running jobs, too | Jon Marius Venstad | 2017-11-02 | 1 | -0/+1 |
| * | Fixed test and resolved conflict | Jon Marius Venstad | 2017-11-02 | 14 | -104/+231 |
| |\ | |||||
| * | | API cleanup | Jon Marius Venstad | 2017-11-02 | 1 | -23/+7 |
| * | | Add relevant job info to application blobs | Jon Marius Venstad | 2017-11-02 | 2 | -25/+88 |
| * | | Updated tests | Jon Marius Venstad | 2017-11-02 | 3 | -24/+22 |
| * | | Expose deploying applications, and some cleanup | Jon Marius Venstad | 2017-11-02 | 12 | -78/+87 |
| * | | Getting ApplicationList changes | Jon Marius Venstad | 2017-11-02 | 20 | -366/+426 |
| |\ \ | |||||
| * | | | Unfinished | Jon Marius Venstad | 2017-11-02 | 3 | -9/+37 |
* | | | | Inject and use existing ZooKeeper | Martin Polden | 2017-11-06 | 2 | -55/+70 |
* | | | | Merge pull request #4006 from vespa-engine/mpolden/add-key-service-mock | Bjørn Christian Seime | 2017-11-03 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | Add key service mock | Martin Polden | 2017-11-03 | 1 | -0/+2 |
* | | | | | Start the first job in triggerReady | Jon Bratseth | 2017-11-03 | 2 | -4/+39 |
* | | | | | Return correct response code when there is a ConfigServerException | Harald Musum | 2017-11-03 | 4 | -1/+35 |
| |_|_|/ |/| | | | |||||
* | | | | Add import | Jon Bratseth | 2017-11-02 | 1 | -0/+1 |
* | | | | Merge pull request #3968 from vespa-engine/bratseth/upgrade-to-latest-good | Jon Bratseth | 2017-11-02 | 10 | -115/+258 |
|\ \ \ \ | |||||
| * | | | | Rename method | Jon Bratseth | 2017-11-02 | 1 | -3/+3 |
| * | | | | Newer downgrade a production deployment | Jon Bratseth | 2017-11-02 | 4 | -19/+72 |
| * | | | | Always try to upgrade to the latest good version | Jon Bratseth | 2017-11-01 | 7 | -98/+188 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3964 from vespa-engine/bjorncs/athenz-user-domain | gjoranv | 2017-11-02 | 3 | -6/+7 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Athenz now uses "user" as principal domain and "home" as personal domain | Bjørn Christian Seime | 2017-11-01 | 3 | -6/+7 |
| | |/ | |/| | |||||
* | | | Changes as per coments | Jon Marius Venstad | 2017-11-01 | 2 | -40/+37 |
* | | | Grace period of four hours | Jon Marius Venstad | 2017-11-01 | 1 | -1/+1 |
* | | | Moved subset selection code to ApplicationList | Jon Marius Venstad | 2017-11-01 | 2 | -41/+62 |
* | | | List only failing applicatoin, with failures older than two hours | Jon Marius Venstad | 2017-11-01 | 2 | -14/+34 |
|/ / | |||||
* | | Merge pull request #3953 from vespa-engine/bjorncs/cleanup | Martin Polden | 2017-11-01 | 2 | -67/+0 |
|\ \ | |||||
| * | | Remove unused files | Bjørn Christian Seime | 2017-10-31 | 2 | -67/+0 |
| |/ | |||||
* | | Merge pull request #3947 from vespa-engine/mpolden/locked-application | Martin Polden | 2017-11-01 | 16 | -261/+350 |
|\ \ | |/ |/| | |||||
| * | Wrap lock and application and use it when persisting data | Martin Polden | 2017-10-31 | 16 | -261/+350 |
* | | Merge pull request #3933 from vespa-engine/bjorncs/remove-deprecated-authoriz... | Bjørn Christian Seime | 2017-10-31 | 5 | -88/+51 |
|\ \ | |||||
| * | | Be consistent on curly braces. Remove NPE when not authenticated | Bjørn Christian Seime | 2017-10-31 | 1 | -4/+8 |
| * | | Handle NotAuthorizedException in ApplicationApiHandler | Bjørn Christian Seime | 2017-10-27 | 2 | -1/+11 |
| * | | Cleanup deployment authorization | Bjørn Christian Seime | 2017-10-27 | 4 | -87/+36 |