summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* TypoVegard Sjonfjell2016-11-1710-10/+10
* Merge pull request #1125 from yahoo/loffevoffeloff/add-cppunit-test-runner-de...Vegard Sjonfjell2016-11-1710-0/+10
|\
| * Add testrunner dependencies to parallelized testsVegard Sjonfjell2016-11-1710-0/+10
|/
* Merge pull request #1122 from yahoo/mpolden/node-acl-apiMartin Polden2016-11-1711-58/+279
|\
| * Add node ACL APIMartin Polden2016-11-177-27/+258
| * Move helper method to ProvisioningTesterMartin Polden2016-11-173-30/+11
| * Add node type for config serverMartin Polden2016-11-171-1/+4
| * Log error when name resolving failsMartin Polden2016-11-171-0/+6
* | Merge pull request #1121 from yahoo/vegard/parallelize-cppunit-test-runner-te...Tor Brede Vekterli2016-11-1711-11/+61
|\ \ | |/ |/|
| * Parallize cppunit test runner test suites using cppunit-parallelize.pyVegard Sjonfjell2016-11-1611-11/+61
* | Merge pull request #1072 from yahoo/vegard/remove-trace-when-tracelevel-is-zeroVegard Sjonfjell2016-11-171-12/+15
|\ \
| * | Remove trace when tracelevel is zeroVegard Sjonfjell2016-11-111-12/+15
* | | Merge pull request #1118 from yahoo/toregge/remove-old-multivaluemapping-fill...Geir Storli2016-11-1714-313/+131
|\ \ \
| * | | Use new API to get values from multi value mapping when calculatingTor Egge2016-11-171-3/+2
| * | | Use new API to get values from multi value mapping when savingTor Egge2016-11-173-20/+18
| * | | Use new API to get values from multivalue mapping.Tor Egge2016-11-161-6/+4
| * | | Add skeletons for not yet implemented methods.Tor Egge2016-11-162-3/+60
| * | | Make new style get api available on old multivalue mapping.Tor Egge2016-11-161-0/+17
| * | | Remove fillMapped method from old multi value mapping.Tor Egge2016-11-169-281/+30
* | | | Merge pull request #1119 from yahoo/revert-765-hmusum/disable-deployment-vali...Jon Bratseth2016-11-172-4/+1
|\ \ \ \
| * | | | Revert "Disable validation of deployment.xml"Harald Musum2016-11-172-4/+1
* | | | | Merge pull request #1120 from yahoo/hmusum/handle-processing-exceptionHaakon Dybdahl2016-11-171-3/+4
|\ \ \ \ \
| * | | | | Hand ProcessingException too (e.g. when connect times out)Harald Musum2016-11-171-3/+4
| |/ / / /
* | | | | Merge pull request #1115 from yahoo/hmusum/improve-log-messagehakonhall2016-11-171-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Change log level and improve log messageHarald Musum2016-11-161-1/+3
* | | | | Merge pull request #1117 from yahoo/balder/avoid-pulling-in-world-due-to-head...Henning Baldersheim2016-11-1610-36/+75
|\ \ \ \ \
| * | | | | Sometime forward declaration make the world of difference.Henning Baldersheim2016-11-1610-36/+75
|/ / / / /
* | | | | Merge pull request #1116 from yahoo/balder/avoid-taking-reference-to-temporaryHenning Baldersheim2016-11-161-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Avoid taking reference to temporary.Henning Baldersheim2016-11-161-2/+1
|/ / / /
* | | | Merge pull request #1114 from yahoo/bjorncs/rewrite-to-javaBjørn Christian Seime2016-11-1630-284/+574
|\ \ \ \
| * | | | Update Scala code to work with converted Java POJOsBjørn Christian Seime2016-11-163-23/+26
| * | | | Remove scalalib dependencyBjørn Christian Seime2016-11-161-5/+0
| * | | | Remove non-working provider for custom ObjectMapperBjørn Christian Seime2016-11-1610-57/+8
| * | | | Replace Scala case classes with Java POJOsBjørn Christian Seime2016-11-1625-207/+548
|/ / / /
* | | | Merge pull request #1113 from yahoo/balder/debugwait-feature-executorHenning Baldersheim2016-11-164-90/+62
|\ \ \ \
| * | | | They already existed, so I just cleaned up overspecifications ov namespace an...Henning Baldersheim2016-11-164-90/+62
|/ / / /
* | | | Merge pull request #1112 from yahoo/revert-1108-bjorncs/rewrite-to-javaHarald Musum2016-11-1630-574/+284
|\ \ \ \
| * | | | Revert "Bjorncs/rewrite to java"Harald Musum2016-11-1630-574/+284
|/ / / /
* | | | Merge pull request #1106 from yahoo/balder/introduce-soft-doomHenning Baldersheim2016-11-1614-79/+95
|\ \ \ \ | |/ / / |/| | |
| * | | Unify some more on hard versus soft doom.Henning Baldersheim2016-11-165-9/+8
| * | | Unify on hard/soft doom.Henning Baldersheim2016-11-162-14/+14
| * | | soft and hard doom.Henning Baldersheim2016-11-168-28/+24
| * | | Introduce softdoom. This is computed based on statistics from earlier requests.Henning Baldersheim2016-11-1610-55/+76
* | | | Merge pull request #1109 from yahoo/toregge/refactor-multivalue-loadingGeir Storli2016-11-1621-455/+327
|\ \ \ \
| * | | | Adjust comment.Tor Egge2016-11-161-1/+1
| * | | | Add function comment.Tor Egge2016-11-165-30/+31
| * | | | Factor out portion of loading of single value attribute from enumeratedTor Egge2016-11-1620-440/+213
| * | | | Factor out main portion of multivalue mapping loader toTor Egge2016-11-166-24/+122
* | | | | Merge pull request #1110 from yahoo/geirst/buffer-compaction-in-array-storeTor Egge2016-11-168-27/+245
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | No need to inc generation after trimming of hold lists.Geir Storli2016-11-161-1/+1