github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7477 from epixa/SNAPSHOT

Browse source 
Uppercase -SNAPSHOT on snapshot builds
This commit is contained in:
Court Ewing 2016-06-16 08:02:15 -04:00 • committed by GitHub
commit 6b98215833
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -43,7 +43,7 @@ For the daring, snapshot builds are available. These builds are created after ea
| platform | |
| --- | --- |
| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-darwin-x64.tar.gz) |
| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-linux-x64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_5.0.0-snapshot_amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0_snapshot-1.x86_64.rpm) |
| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-linux-x86.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_5.0.0-snapshot_i386.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0_snapshot-1.i386.rpm) |
| Windows | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-windows.zip) |
| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-darwin-x64.tar.gz) |
| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-linux-x64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_5.0.0-SNAPSHOT_amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0_SNAPSHOT-1.x86_64.rpm) |
| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-linux-x86.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_5.0.0-SNAPSHOT_i386.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0_SNAPSHOT-1.i386.rpm) |
| Windows | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-windows.zip) |

4
src/cli_plugin/install/__tests__/kibana.js
View file

@ -44,8 +44,8 @@ describe('kibana cli', function () {
workingPath: testWorkingPath,
tempArchiveFile: tempArchiveFilePath,
plugin: 'test-plugin',
version: '5.0.0-snapshot',
plugins: [ { name: 'foo', path: join(testWorkingPath, 'foo'), version: '5.0.0-snapshot' } ]
version: '5.0.0-SNAPSHOT',
plugins: [ { name: 'foo', path: join(testWorkingPath, 'foo'), version: '5.0.0-SNAPSHOT' } ]
};
const errorStub = sinon.stub();

2
src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json
View file

@ -13,7 +13,7 @@
{
"_index": ".kibana",
"_type": "config",
"_id": "4.0.1-snapshot",
"_id": "4.0.1-SNAPSHOT",
"_score": 1,
"_source": {
"buildNum": 5921,

4
src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
View file

@ -39,8 +39,8 @@ describe('plugins/elasticsearch', function () {
upgradeDoc('4.0.0-rc2', '4.0.2', true);
upgradeDoc('4.0.1', '4.1.0-rc', true);
upgradeDoc('4.0.0-rc1', '4.0.0', true);
upgradeDoc('4.0.0-rc1-snapshot', '4.0.0', false);
upgradeDoc('4.1.0-rc1-snapshot', '4.1.0-rc1', false);
upgradeDoc('4.0.0-rc1-SNAPSHOT', '4.0.0', false);
upgradeDoc('4.1.0-rc1-SNAPSHOT', '4.1.0-rc1', false);
upgradeDoc('5.0.0-alpha1', '5.0.0', false);
it('should handle missing _id field', function () {

2
src/plugins/elasticsearch/lib/__tests__/upgrade_config.js
View file

@ -94,7 +94,7 @@ describe('plugins/elasticsearch', function () {
it('should create new config if the nothing is upgradeable', function () {
get.withArgs('pkg.buildNum').returns(9833);
client.create.returns(Promise.resolve());
const response = { hits: { hits: [ { _id: '4.0.1-alpha3' }, { _id: '4.0.1-beta1' }, { _id: '4.0.0-snapshot1' } ] } };
const response = { hits: { hits: [ { _id: '4.0.1-alpha3' }, { _id: '4.0.1-beta1' }, { _id: '4.0.0-SNAPSHOT1' } ] } };
return upgrade(response).then(function (resp) {
sinon.assert.calledOnce(client.create);
const params = client.create.args[0][0];

4
src/plugins/elasticsearch/lib/__tests__/version_satisfies.js
View file

@ -21,9 +21,9 @@ const versionChecks = [
['2.0.1', '^2.0.0', true],
['2.1.1', '^2.1.0', true],
['2.2.0', '^2.1.0', true],
['3.0.0-snapshot', '^2.1.0', false],
['3.0.0-SNAPSHOT', '^2.1.0', false],
['3.0.0', '^2.1.0', false],
['2.10.20-snapshot', '^2.10.20', true],
['2.10.20-SNAPSHOT', '^2.10.20', true],
['2.10.999', '^2.10.20', true],
];

2
tasks/config/build.js
View file

@ -11,5 +11,5 @@ export default (grunt) => {
};
function buildVersion(isRelease, version) {
return isRelease ? version : `${version}-snapshot`;
return isRelease ? version : `${version}-SNAPSHOT`;
}