Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Revert "Gjoranv/java9 prep 05"" | gjoranv | 2018-05-02 | 54 | -173/+199 |
| | |||||
* | Merge pull request #5756 from vespa-engine/bjorncs/use-sia-with-node-admin | Bjørn Christian Seime | 2018-05-02 | 6 | -158/+103 |
|\ | | | | | Bjorncs/use sia with node admin | ||||
| * | Rewrite SslConnectionSocketFactoryUpdater to use credentials from SIA | Bjørn Christian Seime | 2018-04-30 | 5 | -158/+84 |
| | | |||||
| * | Expose sia config from config-server.def in ConfigServerInfo | Bjørn Christian Seime | 2018-04-30 | 1 | -0/+19 |
| | | |||||
* | | Merge pull request #5755 from vespa-engine/bjorncs/athenz-identity-provider | Morten Tokle | 2018-05-02 | 6 | -64/+135 |
|\ \ | | | | | | | Bjorncs/athenz identity provider | ||||
| * | | Use new identity document api path | Bjørn Christian Seime | 2018-04-30 | 1 | -2/+1 |
| | | | |||||
| * | | Add initial implementation for retrieving role token/cert | Bjørn Christian Seime | 2018-04-30 | 3 | -1/+101 |
| | | | |||||
| * | | Rename AthenzService -> ZtsClient | Bjørn Christian Seime | 2018-04-27 | 4 | -30/+31 |
| | | | |||||
| * | | Reuse SSLContext when communicating with ZTS | Bjørn Christian Seime | 2018-04-27 | 4 | -36/+7 |
| | | | |||||
* | | | Merge pull request #5762 from vespa-engine/revert-5758-gjoranv/java9-prep-05 | Arnstein Ressem | 2018-05-02 | 54 | -199/+173 |
|\ \ \ | | | | | | | | | Revert "Gjoranv/java9 prep 05" | ||||
| * | | | Revert "Gjoranv/java9 prep 05" | gjoranv | 2018-05-02 | 54 | -199/+173 |
|/ / / | |||||
* | | | Merge pull request #5761 from vespa-engine/hmusum/cleanup-3 | Valerij Fredriksen | 2018-05-02 | 7 | -67/+27 |
|\ \ \ | | | | | | | | | Simplify | ||||
| * | | | Simplify | Harald Musum | 2018-05-02 | 7 | -67/+27 |
| | | | | |||||
* | | | | Merge pull request #5758 from vespa-engine/gjoranv/java9-prep-05 | gjoranv | 2018-05-01 | 54 | -173/+199 |
|\ \ \ \ | | | | | | | | | | | Gjoranv/java9 prep 05 | ||||
| * | | | | Java 9: Replace 'new Double' with 'Double.valueOf' | gjoranv | 2018-05-01 | 13 | -17/+17 |
| | | | | | |||||
| * | | | | Java 9: Replace 'new Long' with 'Long.valueOf' | gjoranv | 2018-05-01 | 8 | -8/+8 |
| | | | | | |||||
| * | | | | Java 9: Replace 'new Integer' with 'Integer.valueOf' | gjoranv | 2018-04-30 | 32 | -105/+105 |
| | | | | | |||||
| * | | | | Replace usage of apis deprecated in Java 9. | gjoranv | 2018-04-30 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Allow building with Java 9. | gjoranv | 2018-04-30 | 3 | -8/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Must suppress deprecation warning for unit tests because LogRecord.setInstant() is new for Java 9. | ||||
| * | | | | Replace usage of apis deprecated in Java 9. | gjoranv | 2018-04-30 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | Fix usage of apis deprecated from Java 9. | gjoranv | 2018-04-30 | 2 | -16/+26 |
| | | | | | | | | | | | | | | | | | | | | + rewrite if to switch-case. | ||||
| * | | | | Declare methods private and remove redundant comment. | gjoranv | 2018-04-30 | 1 | -5/+2 |
| | | | | | |||||
| * | | | | Don't use wildcard imports. | gjoranv | 2018-04-30 | 1 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Leads to ambiguous class reference in Java 9: new class java.lang.Module vs. com.google.inject.Module. | ||||
| * | | | | Remove unnecessary boxing. | gjoranv | 2018-04-30 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | - Integer(int) ctor is depreated in Java 9. | ||||
* | | | | | Merge pull request #5759 from vespa-engine/freva/stable-acl-order | Valerij Fredriksen | 2018-05-01 | 6 | -31/+51 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Stable acl order | ||||
| * | | | | Run aclMaintainer once only when starting container | Valerij Fredriksen | 2018-05-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Trim lines from list table | Valerij Fredriksen | 2018-05-01 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fix NoSuchElementException | Valerij Fredriksen | 2018-05-01 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Sort ports and ipaddresses before applying | Valerij Fredriksen | 2018-04-30 | 3 | -4/+15 |
| | | | | | |||||
| * | | | | Use LinkedList to create rules | Valerij Fredriksen | 2018-04-30 | 3 | -26/+31 |
|/ / / / | |||||
* | | | | Merge pull request #5752 from vespa-engine/jvenstad/deplorch-cleanup | Jon Marius Venstad | 2018-04-30 | 2 | -130/+140 |
|\ \ \ \ | | | | | | | | | | | Jvenstad/deplorch cleanup | ||||
| * | | | | Purely nonfunctional (reordering and comments) | Jon Marius Venstad | 2018-04-30 | 1 | -129/+139 |
| | | | | | |||||
| * | | | | Shorter period for version status maintainer | Jon Marius Venstad | 2018-04-30 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #5757 from vespa-engine/hakonhall/randomize-configserver-uris | Håkon Hallingstad | 2018-04-30 | 1 | -4/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Randomize configserver URIs | ||||
| * | | | | Randomize configserver URIs | Håkon Hallingstad | 2018-04-30 | 1 | -4/+3 |
| | | | | | |||||
* | | | | | Merge pull request #5754 from vespa-engine/bratseth/remove-old-junit-usage | gjoranv | 2018-04-30 | 40 | -401/+660 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove usage of junit.framework | ||||
| * | | | | | Remove usage of junit.framework | Jon Bratseth | 2018-04-30 | 40 | -401/+660 |
| | | | | | | |||||
* | | | | | | Merge pull request #5700 from ↵ | gjoranv | 2018-04-30 | 5 | -45/+49 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | vespa-engine/hmusum/move-rpc-http-messagebus-enabled-flags-to-container-cluster Move flags for rpc, messagebus and http enabled to container cluster | ||||
| * | | | | | Remove duplicated method and move setting of enabled flags for rpc and http | Harald Musum | 2018-04-30 | 2 | -9/+5 |
| | | | | | | |||||
| * | | | | | Move flags for rpc, messagebus and http enabled to container cluster | Harald Musum | 2018-04-25 | 5 | -40/+48 |
| | | | | | | |||||
* | | | | | | Merge pull request #5753 from ↵ | Tor Brede Vekterli | 2018-04-30 | 6 | -43/+13 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | vespa-engine/toregge/remove-for-unknown-document-type-is-an-error Remove for an unknown document type is an error. | ||||
| * | | | | | Remove for an unknown document type is an error. | Tor Egge | 2018-04-30 | 6 | -43/+13 |
|/ / / / / | |||||
* | | | | | Merge pull request #5747 from ↵ | Jon Bratseth | 2018-04-30 | 8 | -7/+118 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-5744-revert-5715-bratseth/validate-type-removal Revert "Revert "Validate content type removal"" | ||||
| * | | | | | Revert "Revert "Validate content type removal"" | Jon Bratseth | 2018-04-30 | 8 | -7/+118 |
| | | | | | | |||||
* | | | | | | Merge pull request #5742 from vespa-engine/bratseth/hit-cleanup | Jon Bratseth | 2018-04-30 | 23 | -449/+107 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Bratseth/hit cleanup | ||||
| * | | | | | | Remove lazy decoding (not used) | Jon Bratseth | 2018-04-27 | 6 | -218/+62 |
| | | | | | | | |||||
| * | | | | | | Remove LazyField (not used) | Jon Bratseth | 2018-04-27 | 2 | -69/+7 |
| | | | | | | | |||||
| * | | | | | | Remove row+column support | Jon Bratseth | 2018-04-27 | 17 | -164/+40 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #5740 from vespa-engine/gjoranv/upgrade-felix-4.6 | gjoranv | 2018-04-30 | 3 | -1/+13 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Upgrade felix from 4.4 to 4.6 | ||||
| * | | | | | | | Upgrade felix from 4.4 to 4.6 | gjoranv | 2018-04-27 | 3 | -1/+13 |
| | | | | | | | |