Commit graph

29 commits

Author SHA1 Message Date
Richard Peter
a0b6ea8bb2 Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: b09f1559254f06a82afa91f0cc14c8150f88ce64
2013-12-05 12:12:27 -06:00
Steve Harris
71ae71c850 14.1.1-11 baseline
Former-commit-id: c32b2b2037c84cc074e7dc5a5a13b93223640d7d
2013-12-02 17:10:10 -05:00
Steve Harris
99e3707c5b 14.1.1-4 baseline
Former-commit-id: 0cda967cc9da9d2a08a0197db23d48c65f03be81
2013-10-28 10:55:16 -04:00
Steve Harris
5739b4f832 14.1.1-3 baseline
Former-commit-id: cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03
2013-10-28 10:46:02 -04:00
Bryan Kowal
87087a5ea4 Issue #2422 - fix 14.2.1 RHEL6 build
Former-commit-id: 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6
2013-10-02 18:41:11 -05:00
Bryan Kowal
9829477ced Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/build/p2-build.xml
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	edexOsgi/meteolib.jni.linux64/libmeteoLib.so
	javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.meteorological/.cproject
	nativeLib/rary.meteorological/src/dcapeFunc.c
	rpms/awips2.cave/Installer.cave-etc/component.spec
	rpms/awips2.cave/Installer.cave-feature/component.spec
	rpms/awips2.core/Installer.aviation/component.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: 97612cb78e067c493f7b5a76a2a84d88c96a5094
2013-09-30 18:00:31 -05:00
Bryan Kowal
b002df8a06 Issue #2382 - fix qpid amqp path
Former-commit-id: 263ce6e82d1ecf3164961b599c2d4aac7d61f783
2013-09-17 17:51:43 -05:00
Steve Harris
58c6821427 13.5.2-4 baseline
Former-commit-id: da631849bc9eaaa5c83c2393520b6099413107a5
2013-09-12 11:13:59 -04:00
Bryan Kowal
79e88c19aa Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
Former-commit-id: 4503735d3a05071878683f4a523d0dbd37e47ea3
2013-09-06 12:30:01 -05:00
Bryan Kowal
03cadc5aa9 Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
Former-commit-id: 422e9b611535e9c20338041e0e1af62d38aab047
2013-09-04 13:48:08 -05:00
Bryan Kowal
ab3485a3ed Issue #2163 - RHEL6 14.1.1 build updates
Former-commit-id: b0e47f4548c235a7cbaefc12e97264ce4c782fce
2013-09-03 13:46:19 -05:00
Bryan Kowal
f2dd3ab85a Issue #2279 - updated python qpid library
- python qpid is no longer compiled; so, the rpm is now noarch


Former-commit-id: 8487a7abdc967f39f853919b5c274b354a674b2c
2013-08-29 16:00:45 -05:00
Bryan Kowal
e686f9bdda Issue #2163 - 64-bit RHEL6 rpm conversion
- converted ant and added ant source to the repository (will no longer need to be retrieved from awipscm)
- converted Java
- converted the hdf5 tools and lzf is now built from source in addition to the hdf5 tools
- fixed python h5py to correctly include the built libsz libraries


Former-commit-id: ffc8892888976ee4b9d9edeb315b74edc5bb375f
2013-08-15 15:24:48 -05:00
Bryan Kowal
be011d3b92 Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
Former-commit-id: f2497ff20afefdcf67b0b4bcc17f9ee358d2288d
2013-08-15 15:24:11 -05:00
Steve Harris
00332e6305 13.4.1-1 baseline
Former-commit-id: c03222bb480d87c05982b4d49f863e615b5b5584
2013-04-24 17:15:55 -05:00
Steve Harris
328c6dccad 13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Steve Harris
1e02387ff1 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: da126f587a1e3761dbe16ee2a41aee0caba85bfc
2012-10-08 13:26:20 -05:00
Steve Harris
49c3861597 12.10.1-4 baseline
Former-commit-id: 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed
2012-09-13 12:08:11 -05:00
Steve Harris
d708932029 12.10.1-1 baseline
Former-commit-id: 7d17407c5b0a4a3f9b4b083891a5a5975c645810
2012-09-04 12:07:27 -05:00
Steve Harris
cb9b80f3a0 12.9.1-10 baseline
Former-commit-id: 32048810bc091d7ba09a321c36cd5a78b2d4bd39
2012-08-30 14:28:27 -05:00
Steve Harris
f2fac39428 12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
Steve Harris
33b95fb96d 12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
2012-08-15 15:19:10 -05:00
Steve Harris
ca25d508ec 12.8.1-10 baseline
Former-commit-id: 7c799ab7b99993c77b6568529b46aaf13d01300b
2012-08-06 09:34:26 -05:00
Steve Harris
cd49ef3eda 12.8.1-5 baseline
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
2012-08-01 10:45:37 -05:00
Steve Harris
8485b90ff8 12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
2012-05-01 18:06:13 -05:00
Bryan Kowal
ea1c82452b Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 56068aa96fa6daf113861476bf4b7aebe2021ca4
2012-01-20 13:38:00 -06:00
Matt Nash
c83e5ff474 Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
Bryan Kowal
9d64e1df12 Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 40f016a9f9e605b039d41ed44a59a269caf8a024
2012-01-18 16:00:45 -06:00
root
06a8b51d6d Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00