Yaniv Dary has uploaded a new change for review.
Change subject: build: post ovirt-engine-dwh-3.4.0-2
......................................................................
build: post ovirt-engine-dwh-3.4.0-2
Change-Id: I82ec5bc0f9fb819a3a159f92e721e7b169b5ebcd
Signed-off-by: Yaniv Dary <yd...@redhat.com>
---
M
etl_export/ovirt_engine_dwh/minimalversioncheck_3_4/contexts/Default.properties
M etl_export/ovirt_engine_dwh/parallelrun_3_4/contexts/Default.properties
M ovirt-engine-dwh.spec.in
M tos_project/context/connectionJDBC_3.4.item
M tos_project/process/HistoryETL_3.4.item
M tos_project/process/MinimalVersionCheck_3.4.item
M tos_project/process/ParallelRun_3.4.item
M version.mak
8 files changed, 12 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/09/26209/1
diff --git
a/etl_export/ovirt_engine_dwh/minimalversioncheck_3_4/contexts/Default.properties
b/etl_export/ovirt_engine_dwh/minimalversioncheck_3_4/contexts/Default.properties
index 4ecea92..a554efe 100644
---
a/etl_export/ovirt_engine_dwh/minimalversioncheck_3_4/contexts/Default.properties
+++
b/etl_export/ovirt_engine_dwh/minimalversioncheck_3_4/contexts/Default.properties
@@ -3,7 +3,7 @@
ovirtEngineHistoryDbDriverClass=org.postgresql.Driver
ovirtEngineHistoryMinimalETL=null
ovirtEngineHistoryDbUser=postgres
-etlVersion=3.4.0
+etlVersion=3.4.1
ovirtMinimalETL=null
ovirtEngineHistoryDbJdbcConnection=jdbc\:postgresql\://localhost\:5432/ovirt_engine_history?stringtype\=unspecified
ovirtEngineDbPassword=
diff --git
a/etl_export/ovirt_engine_dwh/parallelrun_3_4/contexts/Default.properties
b/etl_export/ovirt_engine_dwh/parallelrun_3_4/contexts/Default.properties
index 512031d..9a87d86 100644
--- a/etl_export/ovirt_engine_dwh/parallelrun_3_4/contexts/Default.properties
+++ b/etl_export/ovirt_engine_dwh/parallelrun_3_4/contexts/Default.properties
@@ -6,7 +6,7 @@
timeBetweenErrorEvents=300000
ovirtEngineHistoryDbUser=postgres
hoursToKeepHourly=1440
-etlVersion=3.4.0
+etlVersion=3.4.1
ovirtEngineHistoryDbJdbcConnection=jdbc\:postgresql\://localhost\:5432/ovirt_engine_history?stringtype\=unspecified
ovirtEngineDbPassword=
runInterleave=60
diff --git a/ovirt-engine-dwh.spec.in b/ovirt-engine-dwh.spec.in
index 54a17f8..08b9d44 100644
--- a/ovirt-engine-dwh.spec.in
+++ b/ovirt-engine-dwh.spec.in
@@ -242,6 +242,9 @@
%{_datadir}/ovirt-engine/setup/plugins/*/ovirt-engine-dwh/
%changelog
+* Sun Mar 30 2014 Yaniv Dary <yd...@redhat.com> - 3.4.1
+Changed version to 3.4.1 post 3.4.0 GA.
+
* Mon Mar 24 2014 Yaniv Dary <yd...@redhat.com> - 3.4.0-2
Fixed issues:
- move connect to database library (#1067058)
diff --git a/tos_project/context/connectionJDBC_3.4.item
b/tos_project/context/connectionJDBC_3.4.item
index 059b725..71b29df 100644
--- a/tos_project/context/connectionJDBC_3.4.item
+++ b/tos_project/context/connectionJDBC_3.4.item
@@ -14,7 +14,7 @@
<contextParameter comment="Enter the amout of hour to keep Daily level
records." name="hoursToKeepDaily" prompt="How many hours to keep of daily
data?" promptNeeded="true" type="id_Integer" value="43800"/>
<contextParameter comment="Enter the amout of hour to keep Samples level
records." name="hoursToKeepSamples" prompt="How many hours to keep of samples
data?" promptNeeded="true" type="id_Integer" value="24"/>
<contextParameter comment="End run time." name="endTime" prompt="endTime?"
promptNeeded="false" type="id_Date" value=""/>
- <contextParameter comment="" name="etlVersion" prompt="etlVersion?"
promptNeeded="false" type="id_String" value="3.4.0"/>
+ <contextParameter comment="" name="etlVersion" prompt="etlVersion?"
promptNeeded="false" type="id_String" value="3.4.1"/>
<contextParameter comment="Enter the time to run the delete job. Can only
run on round hour 24 hours clock." name="runDeleteTime" prompt="runDeleteTime?"
promptNeeded="true" type="id_Integer" value="3"/>
<contextParameter comment="" name="lastErrorSent" prompt="lastErrorSent?"
promptNeeded="true" type="id_Date" value="yyyy-MM-dd HH:mm:ss.SSSSSS;2011-07-03
12:46:47.000000"/>
<contextParameter comment="Enter the amout of to wait between sending error
events to audit log" name="timeBetweenErrorEvents"
prompt="timeBetweenErrorEvents?" promptNeeded="true" type="id_Long"
value="300000"/>
diff --git a/tos_project/process/HistoryETL_3.4.item
b/tos_project/process/HistoryETL_3.4.item
index 7505bcd..cdfadf9 100644
--- a/tos_project/process/HistoryETL_3.4.item
+++ b/tos_project/process/HistoryETL_3.4.item
@@ -888,7 +888,7 @@
</node>
<node componentName="tLibraryLoad" componentVersion="0.102" offsetLabelX="0"
offsetLabelY="0" posX="-64" posY="0">
<elementParameter field="TEXT" name="UNIQUE_NAME" value="tLibraryLoad_1"/>
- <elementParameter field="MODULE_LIST" name="LIBRARY"
value=""etltermination-3.4.0.jar""/>
+ <elementParameter field="MODULE_LIST" name="LIBRARY"
value=""etltermination-3.4.1.jar""/>
<elementParameter field="TABLE" name="HOTLIBS"/>
<elementParameter field="MEMO_IMPORT" name="IMPORT" value="//import
java.util.List;"/>
<elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
diff --git a/tos_project/process/MinimalVersionCheck_3.4.item
b/tos_project/process/MinimalVersionCheck_3.4.item
index 7d30ec3..4a6cfae 100644
--- a/tos_project/process/MinimalVersionCheck_3.4.item
+++ b/tos_project/process/MinimalVersionCheck_3.4.item
@@ -3,7 +3,7 @@
<context confirmationNeeded="false" name="Default">
<contextParameter comment="" name="ovirtEngineHistoryMinimalETL"
prompt="ovirtEngineHistoryMinimalETL?" promptNeeded="false" type="id_String"
value="null"/>
<contextParameter comment="" name="ovirtMinimalETL"
prompt="ovirtMinimalETL?" promptNeeded="false" type="id_String" value="null"/>
- <contextParameter comment="" name="etlVersion" prompt="etlVersion?"
promptNeeded="false" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw"
type="id_String" value="3.4.0"/>
+ <contextParameter comment="" name="etlVersion" prompt="etlVersion?"
promptNeeded="false" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw"
type="id_String" value="3.4.1"/>
<contextParameter comment="Enter the JDBC driver class for the ovirt
database." name="ovirtEngineDbDriverClass" prompt="Enter the JDBC driver class
for the ovirt database." promptNeeded="true"
repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String"
value="org.postgresql.Driver"/>
<contextParameter comment="Enter the JDBC driver class for the ovirt
engine history database." name="ovirtEngineHistoryDbDriverClass" prompt="Enter
the JDBC driver class for the ovirt engine history database."
promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw"
type="id_String" value="org.postgresql.Driver"/>
<contextParameter comment="Enter the ovirt engine history JDBC connection
URL." name="ovirtEngineHistoryDbJdbcConnection" prompt="Enter the ovirt engine
history JDBC connection URL." promptNeeded="true"
repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String"
value="jdbc:postgresql://localhost:5432/ovirt_engine_history?stringtype=unspecified"/>
diff --git a/tos_project/process/ParallelRun_3.4.item
b/tos_project/process/ParallelRun_3.4.item
index 22b2d0c..197bfa7 100644
--- a/tos_project/process/ParallelRun_3.4.item
+++ b/tos_project/process/ParallelRun_3.4.item
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<talendfile:ProcessType xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI";
xmlns:talendfile="platform:/resource/org.talend.model/model/TalendFile.xsd"
defaultContext="Default">
<context confirmationNeeded="false" name="Default">
- <contextParameter comment="" name="etlVersion" prompt="etlVersion?"
promptNeeded="false" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw"
type="id_String" value="3.4.0"/>
+ <contextParameter comment="" name="etlVersion" prompt="etlVersion?"
promptNeeded="false" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw"
type="id_String" value="3.4.1"/>
<contextParameter comment="Enter the amout of hour to keep Daily level
records." name="hoursToKeepDaily" prompt="How many hours to keep of daily
data?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw"
type="id_Integer" value="43800"/>
<contextParameter comment="Enter the amout of hour to keep Hourly level
records." name="hoursToKeepHourly" prompt="How many hours to keep of hourly
data?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw"
type="id_Integer" value="1440"/>
<contextParameter comment="Enter the amout of hour to keep Samples level
records." name="hoursToKeepSamples" prompt="How many hours to keep of samples
data?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw"
type="id_Integer" value="24"/>
diff --git a/version.mak b/version.mak
index 4f50419..50afbe5 100644
--- a/version.mak
+++ b/version.mak
@@ -4,7 +4,7 @@
# Fix release is manually specified,
# increment after releasing/branching
-VERSION=3.4.0
+VERSION=3.4.1
# Milestone is manually specified,
# example for ordering:
@@ -21,7 +21,7 @@
# - master
# - <none>
#
-MILESTONE=
+MILESTONE=master
# RPM release is manually specified,
# For pre-release:
@@ -32,4 +32,4 @@
# RPM_RELEASE=N
# while N is incremented each re-release
#
-RPM_RELEASE=2
+RPM_RELEASE=0.1.$(MILESTONE).$(shell date -u +%Y%m%d%H%M%S)
--
To view, visit http://gerrit.ovirt.org/26209
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82ec5bc0f9fb819a3a159f92e721e7b169b5ebcd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
Gerrit-Branch: master
Gerrit-Owner: Yaniv Dary <yd...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
