aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Include Query model in listPropertiesJon Bratseth2018-04-2615-201/+214
* Merge pull request #5708 from vespa-engine/bratseth/select-2-hosts-by-indexJon Bratseth2018-04-262-28/+29
|\
| * Select 2 cluster controllers by indexJon Bratseth2018-04-252-28/+29
* | Merge pull request #5714 from vespa-engine/gjoranv/java9-prep-02Bjørn Christian Seime2018-04-261-6/+6
|\ \
| * | Upgrade asm.gjoranv2018-04-261-1/+1
| * | Upgrade maven plugins to facilitate Java 9.gjoranv2018-04-261-5/+5
|/ /
* | Merge pull request #5707 from vespa-engine/bratseth/remove-usage-of-junit-fra...gjoranv2018-04-2630-198/+407
|\ \
| * | Remove usage of junit.frameworkJon Bratseth2018-04-2530-198/+407
* | | Merge pull request #5713 from vespa-engine/bratseth/remove-test-raceHarald Musum2018-04-262-8/+10
|\ \ \
| * | | Expect (re)deployment raceJon Bratseth2018-04-262-8/+10
* | | | Merge pull request #5712 from vespa-engine/bjorncs/fix-infinite-recursionMorten Tokle2018-04-261-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Remove infinite loop on request in UserAuthWithAthenzPrincipalFilterBjørn Christian Seime2018-04-261-1/+1
|/ / /
* | | Merge pull request #5705 from vespa-engine/jvenstad/DO-unifiedJon Marius Venstad2018-04-2613-149/+152
|\ \ \
| * | | Allow random order of concurrently triggered jobs in testsJon Marius Venstad2018-04-251-7/+18
| * | | Test explicitly that production jobs wait until both tests are doneJon Marius Venstad2018-04-251-6/+13
| * | | Trigger system and staging tests in parallelJon Marius Venstad2018-04-2512-109/+99
| * | | Get rid of 1 millisecond delay, as it is no longer neededJon Marius Venstad2018-04-253-16/+10
| * | | Add missing condition on what version is upgraded toJon Marius Venstad2018-04-251-14/+15
| |/ /
* | | Merge pull request #5710 from vespa-engine/gjoranv/java9-prep-01Bjørn Christian Seime2018-04-2517-116/+17
|\ \ \
| * | | Use Constructor.newInstance instead of Class.newInstance.gjoranv2018-04-251-1/+5
| * | | Add extra downcast to avoid "redundant cast" warning on Java 9.gjoranv2018-04-251-3/+6
| * | | Upgrade surefire plugingjoranv2018-04-251-1/+1
| * | | Remove explicit maven-compiler-plugin config. Inherit from parent.gjoranv2018-04-2514-111/+5
* | | | Merge pull request #5680 from vespa-engine/geirst/enable-grand-parent-support...Geir Storli2018-04-2514-33/+83
|\ \ \ \
| * | | | Extend imported fields test case with field import from grand parent document...Geir Storli2018-04-239-2/+53
| * | | | Allow importing a field from a parent document type that also is imported.Geir Storli2018-04-235-31/+30
* | | | | Merge pull request #5709 from vespa-engine/hmusum/export-secret-storeBjørn Christian Seime2018-04-251-0/+10
|\ \ \ \ \
| * | | | | Export packageHarald Musum2018-04-251-0/+10
* | | | | | Merge pull request #5703 from vespa-engine/vekterli/avoid-spurious-default-sp...Tor Brede Vekterli2018-04-2523-125/+715
|\ \ \ \ \ \
| * | | | | | Remove redundant task processing stepTor Brede Vekterli2018-04-251-1/+0
| * | | | | | Update log messageTor Brede Vekterli2018-04-251-1/+1
| * | | | | | ZooKeeper-persist and load published cluster state bundlesTor Brede Vekterli2018-04-2423-125/+716
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #5706 from vespa-engine/bjorncs/aws-enabled-node-authn-filterBjørn Christian Seime2018-04-258-48/+131
|\ \ \ \ \ \
| * | | | | | Replace 'Authentication' with 'Identification' for AuthenticationFilter and f...Bjørn Christian Seime2018-04-255-42/+39
| * | | | | | Make dependency on AuthenticationFilter more explicitBjørn Christian Seime2018-04-252-1/+5
| * | | | | | Add unit test for AWS host certificatesBjørn Christian Seime2018-04-252-7/+34
| * | | | | | Modify AuthorizationFilter to assume AuthenticationFilter is part of filter c...Bjørn Christian Seime2018-04-253-14/+11
| * | | | | | Include both identity name and hostname in getName()Bjørn Christian Seime2018-04-251-1/+5
| * | | | | | Add separate node authentication filterBjørn Christian Seime2018-04-252-0/+54
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #5704 from vespa-engine/freva/extend-check-config-generatorValerij Fredriksen2018-04-254-17/+33
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add helper methodsValerij Fredriksen2018-04-251-0/+11
| * | | | | SecretAgentScheduleMaker -> SecretAgentCheckConfigValerij Fredriksen2018-04-253-17/+17
| * | | | | Export util packageValerij Fredriksen2018-04-251-0/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #5702 from vespa-engine/bratseth/nonfunctiona-changesgjoranv2018-04-255-10/+11
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Nonfunctional changes onlyJon Bratseth2018-04-255-10/+11
* | | | | Merge pull request #5694 from vespa-engine/bjorncs/json-security-filter-baseBjørn Christian Seime2018-04-2510-52/+192
|\ \ \ \ \
| * | | | | Make CorsRequestFilterBase extend JsonSecurityRequestFilterBaseBjørn Christian Seime2018-04-246-52/+17
| * | | | | Add base class for security filters rendering errors as jsonBjørn Christian Seime2018-04-243-0/+151
| * | | | | Implement toString, equals and hashCode for NodePrincipalBjørn Christian Seime2018-04-241-0/+24
| |/ / / /
* | | | | Merge pull request #5701 from vespa-engine/hmusum/use-configserver-vip-for-awsHarald Musum2018-04-251-0/+9
|\ \ \ \ \ | |_|/ / / |/| | | |