summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Move jackson module scala to orchestrator restapi"Bjørn Christian Seime2016-11-143-24/+23
* Merge pull request #1081 from yahoo/balder/make-dirconfig-thread-and-process-...Henning Baldersheim2016-11-143-17/+43
|\
| * Make DirConfig thread and process safe.Henning Baldersheim2016-11-143-17/+43
* | Merge pull request #1083 from yahoo/vegard/make-cppunit-parallelize-work-with...Tor Brede Vekterli2016-11-141-27/+48
|\ \
| * | Copyright headerVegard Sjonfjell2016-11-141-0/+2
| * | RefactoringVegard Sjonfjell2016-11-141-27/+43
| * | Add valgrind supportVegard Sjonfjell2016-11-141-1/+3
| * | Add hashbangVegard Sjonfjell2016-11-141-0/+1
* | | Merge pull request #1084 from yahoo/hakon/move-jackson-module-scala-to-orches...Bjørn Christian Seime2016-11-143-23/+24
|\ \ \ | |/ / |/| |
| * | Move jackson module scala to orchestrator restapiHåkon Hallingstad2016-11-143-23/+24
|/ /
* | Merge pull request #1079 from yahoo/bratseth/test-robustnessgjoranv2016-11-142-6/+18
|\ \
| * | Protect against interference from ping threadsJon Bratseth2016-11-142-6/+18
| |/
* | Merge pull request #1078 from yahoo/musum/use-containernodespec-builder-in-testsHarald Musum2016-11-148-92/+66
|\ \ | |/ |/|
| * Use ContainerNodeSpec.Builder in testsHarald Musum2016-11-148-92/+66
* | Merge pull request #1076 from yahoo/dybdahl/fix-log-levelHarald Musum2016-11-142-9/+5
|\ \
| * | Move to correct log level.Haakon Dybdahl2016-11-142-9/+5
* | | Merge pull request #1066 from yahoo/arnej/fix-logctl-coredumpHåvard Pettersen2016-11-143-6/+33
|\ \ \ | |_|/ |/| |
| * | fix bug found in reviewArne H Juul2016-11-141-2/+3
| * | avoid possible memory overrun in strchr()Arne H Juul2016-11-112-4/+18
| * | ensure returned Component refers to valid memoryArne H Juul2016-11-113-6/+18
| * | avoid parallel-make problemArne H Juul2016-11-111-1/+1
* | | Merge pull request #1067 from yahoo/musum/add-containerspec-builderhakonhall2016-11-142-15/+109
|\ \ \
| * | | Initialize wantedDockerImage, require non-null values for required fieldsHarald Musum2016-11-111-5/+11
| * | | Add builder for ContainerNodeSpecHarald Musum2016-11-112-15/+103
* | | | Merge pull request #1075 from yahoo/hmusum/set-system-in-config-from-yinst-va...Martin Polden2016-11-144-2/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make sure that 'system' yinst setting is propagated to configserver configHarald Musum2016-11-144-2/+9
|/ / /
* | | Merge pull request #1074 from yahoo/balder/avoid-race-with-make-with-multiple...Henning Baldersheim2016-11-111-1/+1
|\ \ \
| * | | I assume the intention was to first run clean, then make all.Henning Baldersheim2016-11-111-1/+1
|/ / /
* | | Merge pull request #1073 from yahoo/bratseth/update-routing-config-on-app-deleteHarald Musum2016-11-114-10/+10
|\ \ \
| * | | Nonfunctional changes onlyJon Bratseth2016-11-114-10/+10
* | | | Merge pull request #1071 from yahoo/toregge/add-multi-value-mapping2Geir Storli2016-11-1110-0/+195
|\ \ \ \
| * | | | Add class comment.Tor Egge2016-11-112-3/+6
| * | | | Add skeleton for multivaluemapping 2, which will replace multivaluemappingTor Egge2016-11-1110-0/+192
* | | | | Merge pull request #1068 from yahoo/vegard/cppunit-parallel-testrunnerVegard Sjonfjell2016-11-113-1/+81
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Tool to parallelize of cppunit test runsVegard Sjonfjell2016-11-111-0/+69
| * | | | --list argument outputs names of all test suites to stdoutVegard Sjonfjell2016-11-112-1/+12
* | | | | Merge pull request #1070 from yahoo/bratseth/allow-local-hostnameHarald Musum2016-11-114-11/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Allow the name of localhostJon Bratseth2016-11-111-2/+2
| * | | | Whitespace changes onlyJon Bratseth2016-11-113-9/+10
| | |/ / | |/| |
* | | | Merge pull request #1069 from yahoo/geirst/add-remove-on-array-storeTor Egge2016-11-113-0/+53
|\ \ \ \ | |/ / / |/| | |
| * | | Add remove() function to array store.Geir Storli2016-11-113-0/+53
| | |/ | |/|
* | | Merge pull request #1065 from yahoo/bratseth/allow-access-from-localhost-loca...Harald Musum2016-11-112-14/+20
|\ \ \ | |/ / |/| |
| * | Allow localhost.localdomainJon Bratseth2016-11-112-14/+20
|/ /
* | Merge pull request #1063 from yahoo/balder/verify-regexp-pattern-before-it-ma...Jon Bratseth2016-11-112-1/+28
|\ \
| * | Verify the regex pattern upon construction, so the query will fail with messa...Henning Baldersheim2016-11-112-1/+28
* | | Merge pull request #1064 from yahoo/gjoranv/ignore-casegjoranv2016-11-113-4/+14
|\ \ \ | |/ / |/| |
| * | Ignore case for metric consumer ids.gjoranv2016-11-113-4/+14
|/ /
* | Merge pull request #1062 from yahoo/revert-1050-revert-1043-bratseth/enable-z...Jon Bratseth2016-11-104-31/+32
|\ \
| * | Revert "Revert "Enable ZK access control by default""Jon Bratseth2016-11-104-31/+32
|/ /
* | Merge pull request #1058 from yahoo/bratseth/field-operation-ordergjoranv2016-11-1018-69/+157
|\ \