Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2739 from yahoo/bjorncs/docker-ci | Bjørn Christian Seime | 2017-06-13 | 1 | -1/+1 |
|\ | | | | | Cleanup container on exit | ||||
| * | Cleanup container on exit | Bjørn Christian Seime | 2017-06-13 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2738 from yahoo/hakon/make-patch-work | hakonhall | 2017-06-13 | 2 | -4/+3 |
|\ | | | | | Make patch work | ||||
| * | Remove obsolete note | Håkon Hallingstad | 2017-06-13 | 1 | -1/+0 |
| | | |||||
| * | Make patch work | Håkon Hallingstad | 2017-06-13 | 2 | -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 Seime | 2017-06-13 | 5 | -0/+66 |
| | | |||||
* | | Merge pull request #2735 from yahoo/toregge/rename-jdisc-logfmt-program | Geir Storli | 2017-06-13 | 7 | -13/+13 |
|\ \ | | | | | | | Rename jdisc_logfmt to vespa-jdisc-logfmt. | ||||
| * | | Rename jdisc_logfmt to vespa-jdisc-logfmt. | Tor Egge | 2017-06-13 | 7 | -13/+13 |
| | | | |||||
* | | | Merge pull request #2736 from yahoo/toregge/rename-logserver-programs | Geir Storli | 2017-06-13 | 2 | -1/+4 |
|\ \ \ | | | | | | | | | Rename logserver programs to have vespa- prefix. | ||||
| * | | | Rename logserver programs to have vespa- prefix. | Tor Egge | 2017-06-13 | 2 | -1/+4 |
| |/ / | | | | | | | | | | Temporarily add symlinks from old name to new name. | ||||
* | | | Merge pull request #2726 from yahoo/arnej/export-config-provisioning | gjoranv | 2017-06-13 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | export the package with generated config class | ||||
| * | | | Remove public api for now | Harald Musum | 2017-06-13 | 1 | -2/+0 |
| | | | | |||||
| * | | | export the package with generated config class | Arne H Juul | 2017-06-13 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge pull request #2734 from yahoo/toregge/rename-persistence-test-program | Geir Storli | 2017-06-13 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Rename persistence conformance test backend. | ||||
| * | | | | Rename persistence conformance test backend. | Tor Egge | 2017-06-13 | 2 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2728 from yahoo/gjoranv/refactor-instance-resolver | gjoranv | 2017-06-13 | 1 | -17/+9 |
|\ \ \ \ | |/ / / |/| | | | Remove last known usage of the default ctor on config classes. | ||||
| * | | | Remove last known usage of the default ctor on config classes. | gjoranv | 2017-06-13 | 1 | -17/+9 |
| | | | | | | | | | | | | | | | | - Do not create a config instance just to retrieve its class. | ||||
* | | | | Merge pull request #2730 from yahoo/toregge/rename-logd-programs | Geir Storli | 2017-06-13 | 5 | -4/+7 |
|\ \ \ \ | | | | | | | | | | | Rename logd programs to have vespa- prefix. | ||||
| * | | | | Rename logd programs to have vespa- prefix. | Tor Egge | 2017-06-13 | 5 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | Temporarily add symlinks from old name to new name. | ||||
* | | | | | Merge pull request #2731 from yahoo/toregge/rename-vespamalloc-util-program | Geir Storli | 2017-06-13 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Rename utility program for memory profiling. | ||||
| * | | | | Rename utility program for memory profiling. | Tor Egge | 2017-06-13 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #2729 from yahoo/kkraune/new-sample-app-searcher | Jon Bratseth | 2017-06-13 | 12 | -0/+455 |
|\ \ \ \ | |/ / / |/| | | | Sample app for handler and searcher | ||||
| * | | | Sample app for handler and searcher | Kristian Aune | 2017-06-13 | 12 | -0/+455 |
| | | | | | | | | | | | | | | | | - first cut, not properly tested yet | ||||
* | | | | Merge pull request #2725 from yahoo/toregge/rename-configd-programs | Geir Storli | 2017-06-13 | 12 | -17/+21 |
|\ \ \ \ | | | | | | | | | | | Rename configd programs to have vespa- prefix. | ||||
| * | | | | Rename configd programs to have vespa- prefix. | Tor Egge | 2017-06-13 | 12 | -17/+21 |
| |/ / / | | | | | | | | | | | | | Temporarily add symlinks from old name to new name. | ||||
* | | | | Merge pull request #2727 from yahoo/toregge/rename-filedistribution-programs | Geir Storli | 2017-06-13 | 8 | -7/+11 |
|\ \ \ \ | | | | | | | | | | | Rename filedistribution programs to have vespa- prefix. | ||||
| * | | | | Rename filedistribution programs to have vespa- prefix. | Tor Egge | 2017-06-13 | 8 | -7/+11 |
| |/ / / | | | | | | | | | | | | | Temporarily add symlinks from old name to new name. | ||||
* | | | | Merge pull request #2722 from yahoo/kkraune/new-sample-app | Jon Bratseth | 2017-06-13 | 10 | -0/+572 |
|\ \ \ \ | |_|_|/ |/| | | | add HTTP API sample app | ||||
| * | | | Create README.md | Kristian Aune | 2017-06-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | add HTTP API sample app | Kristian Aune | 2017-06-13 | 10 | -0/+572 |
| | | | | |||||
* | | | | Merge pull request #2724 from yahoo/gjoranv/remove-unused-method | Harald Musum | 2017-06-13 | 1 | -18/+0 |
|\ \ \ \ | | |_|/ | |/| | | Remove unused method in InstanceResolver. | ||||
| * | | | Remove unused method in InstanceResolver. | gjoranv | 2017-06-13 | 1 | -18/+0 |
| | |/ | |/| | |||||
* | | | Merge pull request #2723 from yahoo/balder/include-stacktrace-in-trace | Harald Musum | 2017-06-13 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Next time we will now what happened..... | ||||
| * | | | Next time we will now what happened..... | Henning Baldersheim | 2017-06-13 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #1749 from yahoo/mpolden/reintroduce-redundancy-requirement | Martin Polden | 2017-06-13 | 4 | -20/+20 |
|\ \ \ | |/ / |/| | | Reintroduce redundancy requirement for production | ||||
| * | | Reintroduce redundancy requirement for production | Martin Polden | 2017-06-13 | 4 | -20/+20 |
| | | | |||||
* | | | Merge pull request #2702 from yahoo/mpolden/docker-image-config | Jon Bratseth | 2017-06-13 | 35 | -172/+132 |
|\ \ \ | |_|/ |/| | | Docker image config | ||||
| * | | Include config for node-repository | Martin Polden | 2017-06-12 | 1 | -0/+1 |
| | | | |||||
| * | | Remove remaining docker-registry references in node-admin and docker-api | Martin Polden | 2017-06-12 | 3 | -4/+4 |
| | | | |||||
| * | | Use config to specify Docker image in node-repository | Martin Polden | 2017-06-12 | 30 | -109/+96 |
| | | | |||||
| * | | Fix TODO: Stop persisting deprecated version fields | Martin Polden | 2017-06-12 | 9 | -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-apps | Geir Storli | 2017-06-13 | 5 | -5/+0 |
|\ \ \ | |_|/ |/| | | Don't install test/internal applications. | ||||
| * | | Don't install test/internal applications. | Geir Storli | 2017-06-12 | 5 | -5/+0 |
| | | | |||||
* | | | Merge pull request #2721 from yahoo/hakon/use-put | Harald Musum | 2017-06-13 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Use PUT | ||||
| * | | | Use PUT | Håkon Hallingstad | 2017-06-12 | 1 | -2/+2 |
|/ / / | |||||
* | | | Ignore test (#2719) | Bjørn Christian Seime | 2017-06-12 | 1 | -0/+2 |
| | | | |||||
* | | | Use mocked clock (#2718) | Bjørn Christian Seime | 2017-06-12 | 1 | -2/+1 |
|/ / | |||||
* | | Merge pull request #2714 from ↵ | Jon Bratseth | 2017-06-12 | 5 | -5/+113 |
|\ \ | | | | | | | | | | | | | yahoo/vekterli/fix-document-serialization-compression-bugs Fix document serialization compression bugs | ||||
| * | | Use static final field instead of method for compressable string | Tor Brede Vekterli | 2017-06-12 | 1 | -6/+6 |
| | | | |||||
| * | | Add unit test for Compressor which reproduces buffer extent bug | Tor Brede Vekterli | 2017-06-12 | 2 | -2/+27 |
| | | |