summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add using statement for shared ptr (and change 'typedef' to 'using').Geir Storli2017-02-221-8/+9
* Add interface for DocumentDBReferenceResolver.Geir Storli2017-02-224-13/+27
* Add mock impl of IDocumentDBReferent interface.Geir Storli2017-02-223-23/+36
* Merge pull request #1826 from yahoo/balder/avoid/termwise-consider-non-hitsHåvard Pettersen2017-02-211-0/+1
|\
| * Set docId to max of its own and its child.Henning Baldersheim2017-02-211-2/+2
| * termwise must not re-consider documents already ignored.Henning Baldersheim2017-02-211-1/+2
* | Merge pull request #1823 from yahoo/geirst/impl-document-db-reference-resolverTor Egge2017-02-2114-114/+338
|\ \
| * | Add class to resolve references between document dbs.Geir Storli2017-02-2111-0/+257
| * | Add mock implementation of attribute manager.Geir Storli2017-02-203-114/+81
* | | Merge pull request #1824 from yahoo/arnej/ask-for-slime-docsumsHenning Baldersheim2017-02-212-0/+2
|\ \ \
| * | | ask for and expect slime docsumsArne H Juul2017-02-212-0/+2
* | | | Merge pull request #1821 from yahoo/gjoranv/add-cluster-membership-to-hostgjoranv2017-02-213-13/+60
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into gjoranv/add-cluster-membership-to-hostgjoranv2017-02-2141-226/+833
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1812 from yahoo/arnej/add-slime-conversion-in-vsmArne H Juul2017-02-214-15/+242
|\ \ \ \
| * | | | use range-based for loopsArne H Juul2017-02-211-11/+11
| * | | | update copyright yearArne H Juul2017-02-212-2/+2
| * | | | add new SlimeFieldWriter classArne H Juul2017-02-204-15/+242
* | | | | Merge pull request #1822 from yahoo/hmusum/remove-support-for-reassigning-bas...gjoranv2017-02-212-26/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove support for changing base port after a service has been initializedHarald Musum2017-02-202-26/+1
* | | | | Merge pull request #1816 from yahoo/arnej/remove-mirror-cacheHaakon Dybdahl2017-02-211-6/+1
|\ \ \ \ \
| * | | | | remove caching of mirror lookupArne H Juul2017-02-201-6/+1
* | | | | | Merge pull request #1817 from yahoo/bratseth/given-factory-more-timegjoranv2017-02-201-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Increase timeout in case of slow executionJon Bratseth2017-02-201-2/+2
| |/ / / /
* | | | | Merge pull request #1820 from yahoo/bjorncs/downgrade-jettyBjørn Christian Seime2017-02-202-26/+3
|\ \ \ \ \
| * | | | | Revert "Use Jetty 9.4.1"Bjørn Christian Seime2017-02-201-1/+1
| * | | | | Revert "Configure Jetty to log using java.util.logging"Bjørn Christian Seime2017-02-201-25/+2
|/ / / / /
* | | | | Merge pull request #1818 from yahoo/bjorncs/jetty-loggingHenning Baldersheim2017-02-201-2/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Configure Jetty to log using java.util.loggingBjørn Christian Seime2017-02-201-2/+25
|/ / / /
* | | | Merge pull request #1814 from yahoo/freva/add-arithmetic-fieldpathHaakon Dybdahl2017-02-208-46/+121
|\ \ \ \
| * | | | Moved stuff to helper methodsfreva2017-02-201-15/+36
| * | | | Merge branch 'master' into freva/add-arithmetic-fieldpathfreva2017-02-2036-86/+672
| |\ \ \ \
| * | | | | Added JSON arithmetic fieldpath operationsfreva2017-02-178-44/+98
* | | | | | Merge pull request #1815 from yahoo/mpolden/allow-loopback-trafficHarald Musum2017-02-202-0/+16
|\ \ \ \ \ \
| * | | | | | Allow loopback trafficMartin Polden2017-02-202-0/+16
* | | | | | | Merge pull request #1813 from yahoo/bjorncs/jetty-v9.4.1Henning Baldersheim2017-02-201-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use Jetty 9.4.1Bjørn Christian Seime2017-02-201-1/+1
|/ / / / / /
* | | | | | Merge pull request #1811 from yahoo/havardpe/lazy-params-for-compiled-functionsHenning Baldersheim2017-02-2012-107/+210
|\ \ \ \ \ \
| * | | | | | improve and extend micro-benchmarkHaavard2017-02-205-85/+156
| * | | | | | added support for lazy parameters to compiled functionsHaavard2017-02-179-22/+54
* | | | | | | Merge pull request #1807 from yahoo/hakon/use-relative-urls-in-cluster-contro...hakonhall2017-02-204-19/+17
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Use relative URLs in Cluster Controller status pageHåkon Hallingstad2017-02-174-19/+17
* | | | | | | Merge pull request #1810 from yahoo/freva/support-map-as-arrayHaakon Dybdahl2017-02-203-1/+166
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add tests for old formatfreva2017-02-202-0/+125
| * | | | | | Fix reading map from old array formatfreva2017-02-201-1/+41
|/ / / / / /
* | | | | | Merge pull request #1809 from yahoo/revert-1805-bjorncs/downgrade-jettyHenning Baldersheim2017-02-192-2/+2
|\ \ \ \ \ \
| * | | | | | Revert "Temporarily downgrade Jetty to evaluate performance degradation"Henning Baldersheim2017-02-192-2/+2
|/ / / / / /
* | | | | | Merge pull request #1808 from yahoo/balder/prove-jira-6518Henning Baldersheim2017-02-192-4/+55
|\ \ \ \ \ \
| * | | | | | If we can not safely and correctly detect presedence we play it safe.Henning Baldersheim2017-02-191-1/+7
| * | | | | | Add a test that proves that macro-inlining is broken.Henning Baldersheim2017-02-181-3/+48
|/ / / / / /
| | | | * | Let HostResource own a set of cluster memberships.gjoranv2017-02-213-1/+46