Brian.Dyke
|
d8256c4226
|
Fixed comment merge conflicts added .gitignore
Former-commit-id: 7cc471a9c9 [formerly 6093428342170b9fd8deb741a5721375e80bc955]
Former-commit-id: a0e7cb624a
|
2014-03-25 15:41:58 -04:00 |
|
Shawn.Hooper
|
62a0c1dadf
|
ASM #377 - Baseline National River Location Database fails
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae
Former-commit-id: 670da1895b [formerly 5dcb5b019f389e64435b0283d95fe477032d88cc]
Former-commit-id: 85db05e819
|
2014-03-07 13:12:11 -05:00 |
|
David Gillingham
|
1520317c24
|
Issue #2783: Rewrite run_report_alarm script into EDEX service.
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: 32719432ff [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]
Former-commit-id: de12904c7a
|
2014-02-18 13:24:37 -06:00 |
|
Brian.Dyke
|
6d58d8c016
|
Issue #179
Former-commit-id: a0626cdc00 [formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]
Former-commit-id: b23c6f59f7
|
2014-02-04 16:53:34 -05:00 |
|
Ron Anderson
|
624375267e
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]
Former-commit-id: 62c445d872
|
2014-01-13 17:45:20 -06:00 |
|
Steve Harris
|
35d8f5a281
|
14.1.1-15 baseline
Former-commit-id: 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]
Former-commit-id: d8e5799328
|
2014-01-06 14:08:08 -05:00 |
|
Steve Harris
|
6539b80ded
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]
Former-commit-id: b98eb9ffa4
|
2013-12-02 16:17:38 -06:00 |
|
Steve Harris
|
5526a8999d
|
14.1.1-11 baseline
Former-commit-id: 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]
Former-commit-id: 71ae71c850
|
2013-12-02 17:10:10 -05:00 |
|
Steve Harris
|
d97edb20d1
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)
Former-commit-id: 1015e180f1 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]
Former-commit-id: 2f0d53c9b2
|
2013-11-15 13:05:40 -06:00 |
|
Steve Harris
|
8c136f202d
|
14.1.1-9 baseline
Former-commit-id: f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]
Former-commit-id: 5a0a40e67c
|
2013-11-15 12:47:49 -05:00 |
|
Steve Harris
|
7c71117a50
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: c218866826 [formerly 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b]
Former-commit-id: d8afc4c58c
|
2013-11-06 13:22:12 -06:00 |
|
Steve Harris
|
26da1ce793
|
14.1.1-6 baseline
Former-commit-id: 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]
Former-commit-id: 6067af4252
|
2013-11-06 14:08:33 -05:00 |
|
Bryan Kowal
|
0954490a5a
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
nativeLib/files.native/files.native.ecl
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.cots.g2clib/.project
nativeLib/rary.cots.g2clib/g2_unpack3.c
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
Former-commit-id: 665911b033 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]
Former-commit-id: c76c856340
|
2013-10-31 15:23:08 -05:00 |
|
Steve Harris
|
7590a56e0e
|
14.1.1-4 baseline
Former-commit-id: bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]
Former-commit-id: 99e3707c5b
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
4a6a209aea
|
14.1.1-3 baseline
Former-commit-id: 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]
Former-commit-id: 5739b4f832
|
2013-10-28 10:46:02 -04:00 |
|
Steve Harris
|
c6a4241c5b
|
Merge branch 'master_14.1.1' (13.5.2-7) into omaha_14.1.1
Conflicts:
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/python.site-packages/Installer.qpid/component.spec
kept the omaha_14.1.1 versions of the .so files
Former-commit-id: fc0cdf4996 [formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]
Former-commit-id: 84ad96f2e0
|
2013-10-01 15:34:01 -05:00 |
|
Steve Harris
|
22cb9b98cd
|
13.5.2-6 baseline
Former-commit-id: 3821475d4e [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]
Former-commit-id: 3837fbe670
|
2013-09-23 10:03:15 -04:00 |
|
Steve Harris
|
abed443b59
|
13.5.2-4 baseline
Former-commit-id: e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]
Former-commit-id: 58c6821427
|
2013-09-12 11:13:59 -04:00 |
|
Bryan Kowal
|
573aeaa238
|
Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility
- Amend: restore mpe changes
- Amend: attempt rebase
Change-Id: I7763e2b8b56cc9d2caae022f35e72c82a7f1da90
Conflicts:
nativeLib/edex_com/.cproject
nativeLib/edex_notify/.cproject
Former-commit-id: 9db548db3e [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]
Former-commit-id: 326cae8be4
|
2013-09-04 10:08:21 -05:00 |
|
Bryan Kowal
|
5dffc9321c
|
Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6.
Conflicts:
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
Former-commit-id: 0b4961e9b0 [formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]
Former-commit-id: 8b51e353f1
|
2013-08-15 15:38:11 -05:00 |
|
Steve Harris
|
65beefde58
|
13.5.1-15 baseline
Former-commit-id: 53e96e21db [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]
Former-commit-id: c6dc1817e7
|
2013-08-14 10:24:26 -04:00 |
|
Greg Armendariz
|
8bfac41add
|
13.5.1-13 baseline
Former-commit-id: 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]
Former-commit-id: 5577e686c1
|
2013-08-08 17:00:36 -04:00 |
|
Steve Harris
|
2afb46f814
|
13.5.1-8 baseline
Former-commit-id: 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]
Former-commit-id: dfbf9a5afe
|
2013-07-26 09:02:34 -04:00 |
|
Steve Harris
|
f9c9aecba5
|
13.5.1-7 baseline
Former-commit-id: bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]
Former-commit-id: 86ce1248c2
|
2013-07-18 12:07:22 -04:00 |
|
Steve Harris
|
f658320357
|
13.5.1-4 baseline
Former-commit-id: 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]
Former-commit-id: e197f23ce3
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
3926dc20f7
|
13.5.1-2 baseline
Former-commit-id: adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]
Former-commit-id: 3386330894
|
2013-06-17 15:01:22 -04:00 |
|
Steve Harris
|
30ba1d634e
|
13.5.1-1 baseline
Former-commit-id: 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: fe872355a7
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
b35027f661
|
13.4.1-7 baseline
Former-commit-id: 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]
Former-commit-id: 8347bed50e
|
2013-05-13 12:58:10 -04:00 |
|