Richard Peter
|
6502f1f695
|
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: 0074b774f0 [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]
Former-commit-id: 79bdd34f4f
Former-commit-id: 2c753c427c
|
2013-11-14 14:40:23 -06:00 |
|
Bryan Kowal
|
8afbe25d22
|
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: e3639da703 [formerly a51231058a [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]
Former-commit-id: a51231058a
Former-commit-id: b2272ad695
|
2013-11-12 19:57:25 -06:00 |
|
Greg Armendariz
|
795d6cf541
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 64dd62005b [formerly f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]
Former-commit-id: f6d98d6317
Former-commit-id: 0daf07742e
|
2013-10-30 14:52:16 -05:00 |
|
Nate Jensen
|
a18df07586
|
Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]
Former-commit-id: f3143ba7b4
Former-commit-id: 554a9cddf3
|
2013-10-29 14:33:53 -05:00 |
|
Richard Peter
|
9b5d2fa69f
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d
Former-commit-id: 14d5b8656e [formerly cb33f5ada7 [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]
Former-commit-id: cb33f5ada7
Former-commit-id: f69bbf7952
|
2013-10-23 15:50:25 -05:00 |
|
Nate Jensen
|
3ea8b75d75
|
Issue #2476 fix in a better way the rare leak of local references of java args being passed to java methods
Change-Id: I1424ce53cb3dea01d932af8b87ee93aa33c6241a
Former-commit-id: 98660b5ae9 [formerly d27635ce4b [formerly e28dd5738aaebe4fe36779de09cb53f0f90a7744]]
Former-commit-id: d27635ce4b
Former-commit-id: a758761637
|
2013-10-21 15:13:54 -05:00 |
|
Steve Harris
|
65be1b928e
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 67136a50f2 [formerly f927209446 [formerly 608378b8e086a845f38e238eda127c7792f09b53]]
Former-commit-id: f927209446
Former-commit-id: 9a282049b0
|
2013-10-17 18:20:56 -05:00 |
|
Nate Jensen
|
e42a5dfd39
|
Issue #2476 delete local references of arguments to free up memory fast and free memory if someone decides to infinite loop in python
Change-Id: I944d16f506647b138d08c0a93c9b6164a9d55d6e
Former-commit-id: f08ee91f20 [formerly 1e620fde68 [formerly 016bcf45a28c1f99bee930a12d30a72beb9e4dd3]]
Former-commit-id: 1e620fde68
Former-commit-id: 9bd504cc75
|
2013-10-17 14:50:05 -05:00 |
|
Bryan Kowal
|
5b9b97b080
|
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: 326cae8be4 [formerly 9db548db3e [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]]
Former-commit-id: 9db548db3e
Former-commit-id: 5bcf751c50
|
2013-09-04 10:08:21 -05:00 |
|
Steve Harris
|
1b8e623c9b
|
13.3.1-17 baseline
Former-commit-id: a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: 7bf9966dcb
Former-commit-id: f28b85d42f
|
2013-04-01 12:04:56 -05:00 |
|
Bryan Kowal
|
d8b1984283
|
Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep
- add Eclipse CDT configuration for 32-bit and 64-bit Linux compiles
Former-commit-id: 955b5c84d3 [formerly c592e8a877 [formerly 6f51d7079a786534edfa4f60d365284611fb8c3e]]
Former-commit-id: c592e8a877
Former-commit-id: 5fe808757f
|
2013-03-28 10:42:51 -05:00 |
|
Nate Jensen
|
49fdcf9e55
|
Issue #1832 fix getNumPy() error handling
Change-Id: If2a0d3747c38cf716c3fa431c4135f2dee7c5405
Former-commit-id: 74b21dc1b4 [formerly e4cdfe0ca9 [formerly ce7e89b8300580a57a5c133a78e8c84e2cb7449e]]
Former-commit-id: e4cdfe0ca9
Former-commit-id: dc53db5181
|
2013-03-26 18:30:19 -05:00 |
|
Steve Harris
|
e8f4a2f031
|
13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
6e44abdba1
|
12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: d3497e47eb
Former-commit-id: 98171b5de9
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
0d8d18d7e2
|
12.10.1-4 baseline
Former-commit-id: 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: fd19ca5624
Former-commit-id: e38e81ab8c
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
264d870cbf
|
12.9.1-10 baseline
Former-commit-id: cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: 3adc50a783
Former-commit-id: bdb45cdfae
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
7fa9dbd5fb
|
12.4.1-10 baseline
Former-commit-id: 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 9f8cb727a5
Former-commit-id: 4bfbdad17d
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
4767b0e069
|
12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
6d3d1066eb
|
Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose to keep in 4-Thin_Client
Former-commit-id: 23cc9689de [formerly b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]
Former-commit-id: b9f4780fcb
Former-commit-id: 221a02882a
|
2012-02-15 14:39:43 -06:00 |
|
Bryan Kowal
|
7b5b643d18
|
Issue #243 - it is now possible to build meteolib on Windows; meteolib, jep, and gridslice are now all built using MSBuild when built from the command line.
Former-commit-id: 521756e57e [formerly 38eb4bd2b6 [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]]
Former-commit-id: 38eb4bd2b6
Former-commit-id: 2fabaff1d9
|
2012-02-15 10:31:58 -06:00 |
|
Bryan Kowal
|
02c48be369
|
Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console.
Former-commit-id: 4faf9831ed [formerly 67562b0674 [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]]
Former-commit-id: 67562b0674
Former-commit-id: c78e988d55
|
2012-02-13 13:57:10 -06:00 |
|
Bryan Kowal
|
c1d930b119
|
Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: cf4d56d0a0 [formerly 5039d66b12 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]
Former-commit-id: 5039d66b12
Former-commit-id: be0b6a87eb
|
2012-01-23 13:25:11 -06:00 |
|
Matt Nash
|
d8da2252c3
|
Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
|
2012-01-19 11:53:12 -06:00 |
|
root
|
133dc97f67
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
|
2012-01-06 08:55:05 -06:00 |
|