summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2739 from yahoo/bjorncs/docker-ciBjørn Christian Seime2017-06-131-1/+1
|\ | | | | Cleanup container on exit
| * Cleanup container on exitBjørn Christian Seime2017-06-131-1/+1
|/
* Merge pull request #2738 from yahoo/hakon/make-patch-workhakonhall2017-06-132-4/+3
|\ | | | | Make patch work
| * Remove obsolete noteHåkon Hallingstad2017-06-131-1/+0
| |
| * Make patch workHåkon Hallingstad2017-06-132-3/+3
| | | | | | | | | | | | Removes the PathParams annotation on the subclass, which caused Jersey to ignore the annotations on the superclass(!?). I have verified these changes work in CD.
* | Add scripts for CI on Docker (#2732)Bjørn Christian Seime2017-06-135-0/+66
| |
* | Merge pull request #2735 from yahoo/toregge/rename-jdisc-logfmt-programGeir Storli2017-06-137-13/+13
|\ \ | | | | | | Rename jdisc_logfmt to vespa-jdisc-logfmt.
| * | Rename jdisc_logfmt to vespa-jdisc-logfmt.Tor Egge2017-06-137-13/+13
| | |
* | | Merge pull request #2736 from yahoo/toregge/rename-logserver-programsGeir Storli2017-06-132-1/+4
|\ \ \ | | | | | | | | Rename logserver programs to have vespa- prefix.
| * | | Rename logserver programs to have vespa- prefix.Tor Egge2017-06-132-1/+4
| |/ / | | | | | | | | | Temporarily add symlinks from old name to new name.
* | | Merge pull request #2726 from yahoo/arnej/export-config-provisioninggjoranv2017-06-131-0/+5
|\ \ \ | | | | | | | | export the package with generated config class
| * | | Remove public api for nowHarald Musum2017-06-131-2/+0
| | | |
| * | | export the package with generated config classArne H Juul2017-06-131-0/+7
| | | |
* | | | Merge pull request #2734 from yahoo/toregge/rename-persistence-test-programGeir Storli2017-06-132-2/+2
|\ \ \ \ | | | | | | | | | | Rename persistence conformance test backend.
| * | | | Rename persistence conformance test backend.Tor Egge2017-06-132-2/+2
| | |/ / | |/| |
* | | | Merge pull request #2728 from yahoo/gjoranv/refactor-instance-resolvergjoranv2017-06-131-17/+9
|\ \ \ \ | |/ / / |/| | | Remove last known usage of the default ctor on config classes.
| * | | Remove last known usage of the default ctor on config classes.gjoranv2017-06-131-17/+9
| | | | | | | | | | | | | | | | - Do not create a config instance just to retrieve its class.
* | | | Merge pull request #2730 from yahoo/toregge/rename-logd-programsGeir Storli2017-06-135-4/+7
|\ \ \ \ | | | | | | | | | | Rename logd programs to have vespa- prefix.
| * | | | Rename logd programs to have vespa- prefix.Tor Egge2017-06-135-4/+7
| | | | | | | | | | | | | | | | | | | | Temporarily add symlinks from old name to new name.
* | | | | Merge pull request #2731 from yahoo/toregge/rename-vespamalloc-util-programGeir Storli2017-06-131-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Rename utility program for memory profiling.
| * | | | Rename utility program for memory profiling.Tor Egge2017-06-131-1/+1
| |/ / /
* | | | Merge pull request #2729 from yahoo/kkraune/new-sample-app-searcherJon Bratseth2017-06-1312-0/+455
|\ \ \ \ | |/ / / |/| | | Sample app for handler and searcher
| * | | Sample app for handler and searcherKristian Aune2017-06-1312-0/+455
| | | | | | | | | | | | | | | | - first cut, not properly tested yet
* | | | Merge pull request #2725 from yahoo/toregge/rename-configd-programsGeir Storli2017-06-1312-17/+21
|\ \ \ \ | | | | | | | | | | Rename configd programs to have vespa- prefix.
| * | | | Rename configd programs to have vespa- prefix.Tor Egge2017-06-1312-17/+21
| |/ / / | | | | | | | | | | | | Temporarily add symlinks from old name to new name.
* | | | Merge pull request #2727 from yahoo/toregge/rename-filedistribution-programsGeir Storli2017-06-138-7/+11
|\ \ \ \ | | | | | | | | | | Rename filedistribution programs to have vespa- prefix.
| * | | | Rename filedistribution programs to have vespa- prefix.Tor Egge2017-06-138-7/+11
| |/ / / | | | | | | | | | | | | Temporarily add symlinks from old name to new name.
* | | | Merge pull request #2722 from yahoo/kkraune/new-sample-appJon Bratseth2017-06-1310-0/+572
|\ \ \ \ | |_|_|/ |/| | | add HTTP API sample app
| * | | Create README.mdKristian Aune2017-06-131-1/+1
| | | |
| * | | add HTTP API sample appKristian Aune2017-06-1310-0/+572
| | | |
* | | | Merge pull request #2724 from yahoo/gjoranv/remove-unused-methodHarald Musum2017-06-131-18/+0
|\ \ \ \ | | |_|/ | |/| | Remove unused method in InstanceResolver.
| * | | Remove unused method in InstanceResolver.gjoranv2017-06-131-18/+0
| | |/ | |/|
* | | Merge pull request #2723 from yahoo/balder/include-stacktrace-in-traceHarald Musum2017-06-131-1/+1
|\ \ \ | | | | | | | | Next time we will now what happened.....
| * | | Next time we will now what happened.....Henning Baldersheim2017-06-131-1/+1
| |/ /
* | | Merge pull request #1749 from yahoo/mpolden/reintroduce-redundancy-requirementMartin Polden2017-06-134-20/+20
|\ \ \ | |/ / |/| | Reintroduce redundancy requirement for production
| * | Reintroduce redundancy requirement for productionMartin Polden2017-06-134-20/+20
| | |
* | | Merge pull request #2702 from yahoo/mpolden/docker-image-configJon Bratseth2017-06-1335-172/+132
|\ \ \ | |_|/ |/| | Docker image config
| * | Include config for node-repositoryMartin Polden2017-06-121-0/+1
| | |
| * | Remove remaining docker-registry references in node-admin and docker-apiMartin Polden2017-06-123-4/+4
| | |
| * | Use config to specify Docker image in node-repositoryMartin Polden2017-06-1230-109/+96
| | |
| * | Fix TODO: Stop persisting deprecated version fieldsMartin Polden2017-06-129-60/+32
| | | | | | | | | | | | | | | | | | | | | | | | This removes hostedVersion and convergedStateVersion from the model, but keeps external API compatibility. Patching these fields does nothing. In read calls, these fields will always have the same value as vespaVersion.
* | | Merge pull request #2717 from yahoo/geirst/dont-install-test-and-internal-appsGeir Storli2017-06-135-5/+0
|\ \ \ | |_|/ |/| | Don't install test/internal applications.
| * | Don't install test/internal applications.Geir Storli2017-06-125-5/+0
| | |
* | | Merge pull request #2721 from yahoo/hakon/use-putHarald Musum2017-06-131-2/+2
|\ \ \ | | | | | | | | Use PUT
| * | | Use PUTHåkon Hallingstad2017-06-121-2/+2
|/ / /
* | | Ignore test (#2719)Bjørn Christian Seime2017-06-121-0/+2
| | |
* | | Use mocked clock (#2718)Bjørn Christian Seime2017-06-121-2/+1
|/ /
* | Merge pull request #2714 from ↵Jon Bratseth2017-06-125-5/+113
|\ \ | | | | | | | | | | | | yahoo/vekterli/fix-document-serialization-compression-bugs Fix document serialization compression bugs
| * | Use static final field instead of method for compressable stringTor Brede Vekterli2017-06-121-6/+6
| | |
| * | Add unit test for Compressor which reproduces buffer extent bugTor Brede Vekterli2017-06-122-2/+27
| | |