Richard Peter
|
d289419c40
|
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: 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]]
Former-commit-id: 0074b774f0
Former-commit-id: 625647a717 [formerly b4aac09ff4] [formerly 9dbc5783e450aca6291faa5547b5b3369711eda7 [formerly 96b4944b41]]
Former-commit-id: 2067b058e879c394c330dccfc1994698c7f7cb05 [formerly e2a16fd876]
Former-commit-id: 705339a320
|
2013-11-14 14:40:23 -06:00 |
|
Bryan Kowal
|
1134d55c7b
|
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: 8afbe25d22 [formerly b2272ad695] [formerly a51231058a] [formerly 8afbe25d22 [formerly b2272ad695] [formerly a51231058a] [formerly e3639da703 [formerly a51231058a [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]]]
Former-commit-id: e3639da703
Former-commit-id: ad1e4c66b8 [formerly b2c63727ba] [formerly 9b2674319137dc98ffe2e221d63d5f3dae8f1e22 [formerly 48d5d8c3a1]]
Former-commit-id: 05930d677355374fbcc6438692928f1740b35460 [formerly a575f41589]
Former-commit-id: cfb3717a61
|
2013-11-12 19:57:25 -06:00 |
|
Greg Armendariz
|
a7d7c6447f
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 795d6cf541 [formerly 0daf07742e] [formerly f6d98d6317] [formerly 795d6cf541 [formerly 0daf07742e] [formerly f6d98d6317] [formerly 64dd62005b [formerly f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]]]
Former-commit-id: 64dd62005b
Former-commit-id: 83262b6cc4 [formerly 5cf091c499] [formerly 3a7bea98c42e7d77a7480bbc262fa233cb1f6a6b [formerly 4fb0e0bd2f]]
Former-commit-id: cc39f166545faa38560a0e3c8a7dafc13408d077 [formerly eefcbf7dcb]
Former-commit-id: c846280439
|
2013-10-30 14:52:16 -05:00 |
|
Nate Jensen
|
89b3b81ab3
|
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: a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]]
Former-commit-id: 6880a18f1a
Former-commit-id: dced4c4d11 [formerly 19043faeaa] [formerly df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e]]
Former-commit-id: 15fd50423e5c76bf2d7d7f54653759492ef97c8d [formerly e8c199f108]
Former-commit-id: f2184b9379
|
2013-10-29 14:33:53 -05:00 |
|
Richard Peter
|
0a7c1f2fd7
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d
Former-commit-id: 9b5d2fa69f [formerly f69bbf7952] [formerly cb33f5ada7] [formerly 9b5d2fa69f [formerly f69bbf7952] [formerly cb33f5ada7] [formerly 14d5b8656e [formerly cb33f5ada7 [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]]]
Former-commit-id: 14d5b8656e
Former-commit-id: b29e037e05 [formerly a49c67203e] [formerly e43a9bab4c68a481f2c9959d56447b4b556d21ba [formerly 6ecb80e892]]
Former-commit-id: eeadb56d97d16e80b358cd1042a03be4d25aa4bb [formerly e27a298e62]
Former-commit-id: 9b381e593d
|
2013-10-23 15:50:25 -05:00 |
|
Nate Jensen
|
10638e76df
|
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: 3ea8b75d75 [formerly a758761637] [formerly d27635ce4b] [formerly 3ea8b75d75 [formerly a758761637] [formerly d27635ce4b] [formerly 98660b5ae9 [formerly d27635ce4b [formerly e28dd5738aaebe4fe36779de09cb53f0f90a7744]]]]
Former-commit-id: 98660b5ae9
Former-commit-id: affd3fa4ec [formerly e602327f28] [formerly b034a3addc905690a5955ac5980bad3b99169fa0 [formerly 67e02cad76]]
Former-commit-id: 523e8d90429f134914b679916f45f45f637c4173 [formerly d60cae44fe]
Former-commit-id: d5f2cc0bef
|
2013-10-21 15:13:54 -05:00 |
|
Steve Harris
|
15a3d11213
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 65be1b928e [formerly 9a282049b0] [formerly f927209446] [formerly 65be1b928e [formerly 9a282049b0] [formerly f927209446] [formerly 67136a50f2 [formerly f927209446 [formerly 608378b8e086a845f38e238eda127c7792f09b53]]]]
Former-commit-id: 67136a50f2
Former-commit-id: 9f45bcf5e3 [formerly ef45113f4a] [formerly 8e3dca09afd27063e0daca5c2fb240d07113d443 [formerly a1544c7c74]]
Former-commit-id: e031cdb27c50586c0ab6bafa1989f8c43810a2d5 [formerly 6c1d53b1f6]
Former-commit-id: 930e62fc8c
|
2013-10-17 18:20:56 -05:00 |
|
Nate Jensen
|
3a5198043e
|
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: e42a5dfd39 [formerly 9bd504cc75] [formerly 1e620fde68] [formerly e42a5dfd39 [formerly 9bd504cc75] [formerly 1e620fde68] [formerly f08ee91f20 [formerly 1e620fde68 [formerly 016bcf45a28c1f99bee930a12d30a72beb9e4dd3]]]]
Former-commit-id: f08ee91f20
Former-commit-id: 2a7af1912a [formerly 129ac026e8] [formerly 064ee315791a4d2d63b0fa1245abf5579f5c4fa8 [formerly f88dd78056]]
Former-commit-id: 984738eec6d4092230acdaa461d9a6c879b40b9e [formerly da4bd4680c]
Former-commit-id: 07e7928cd9
|
2013-10-17 14:50:05 -05:00 |
|
Bryan Kowal
|
8e130b4e87
|
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: 5b9b97b080 [formerly 5bcf751c50] [formerly 9db548db3e] [formerly 5b9b97b080 [formerly 5bcf751c50] [formerly 9db548db3e] [formerly 326cae8be4 [formerly 9db548db3e [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]]]]
Former-commit-id: 326cae8be4
Former-commit-id: 47160fb743 [formerly 98e4f44a7d] [formerly 5f5e74b7dd3ceb43cb11f3eb9a628232439ee13d [formerly 573aeaa238]]
Former-commit-id: 93a7eb9a61c5d85f72ea4773b0ba6a1b47c86231 [formerly 929e30a520]
Former-commit-id: 3daf51dacf
|
2013-09-04 10:08:21 -05:00 |
|
Steve Harris
|
fd3b082c54
|
13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]]
Former-commit-id: a3fe998f8f
Former-commit-id: a6ff543f88 [formerly ef413da5f7] [formerly 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]]
Former-commit-id: aceedb117eb5695a6155a52973b981de9bb6252a [formerly 50becef97f]
Former-commit-id: a112803c98
|
2013-04-01 12:04:56 -05:00 |
|
Bryan Kowal
|
458a79ba89
|
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: d8b1984283 [formerly 5fe808757f] [formerly c592e8a877] [formerly d8b1984283 [formerly 5fe808757f] [formerly c592e8a877] [formerly 955b5c84d3 [formerly c592e8a877 [formerly 6f51d7079a786534edfa4f60d365284611fb8c3e]]]]
Former-commit-id: 955b5c84d3
Former-commit-id: b3e4b32a20 [formerly 1a11fef532] [formerly a12041d3a7c9c7077cb0b926732f1947bc7372ae [formerly 7a6f32796b]]
Former-commit-id: b4e10e373658408d4cba2dcde87722f859449334 [formerly 087e7b2468]
Former-commit-id: cb965ceb79
|
2013-03-28 10:42:51 -05:00 |
|
Nate Jensen
|
91981ee9da
|
Issue #1832 fix getNumPy() error handling
Change-Id: If2a0d3747c38cf716c3fa431c4135f2dee7c5405
Former-commit-id: 49fdcf9e55 [formerly dc53db5181] [formerly e4cdfe0ca9] [formerly 49fdcf9e55 [formerly dc53db5181] [formerly e4cdfe0ca9] [formerly 74b21dc1b4 [formerly e4cdfe0ca9 [formerly ce7e89b8300580a57a5c133a78e8c84e2cb7449e]]]]
Former-commit-id: 74b21dc1b4
Former-commit-id: d3bd10f1f2 [formerly 0cf9a03133] [formerly 22ed5d848545d777dd0f275f81d9601e754f7d4f [formerly 494a673c37]]
Former-commit-id: deb894038ea05f553bcc6b86032347aefd7562d8 [formerly d1d647a778]
Former-commit-id: d7a7b66b1d
|
2013-03-26 18:30:19 -05:00 |
|
Steve Harris
|
745f2c6409
|
13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
8794e3b599
|
12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
ed04125cd7
|
12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec]
Former-commit-id: e57e7237a9
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
cba4faf995
|
12.9.1-10 baseline
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: c704490769 [formerly f43a5af47f] [formerly eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]]
Former-commit-id: 8b8bb30a759783a20d278f5fb0049d2db76cb8dc [formerly 5bb474d33c]
Former-commit-id: ede38c4b3f
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
7f90924706
|
12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
f1abad69fd
|
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: 6d3d1066eb [formerly 221a02882a] [formerly b9f4780fcb] [formerly 6d3d1066eb [formerly 221a02882a] [formerly b9f4780fcb] [formerly 23cc9689de [formerly b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]]]
Former-commit-id: 23cc9689de
Former-commit-id: f3d32f34ce [formerly a85a777232] [formerly 601b02191762801f860cf28b52a200c6e003e7ea [formerly a2e3aabc60]]
Former-commit-id: 14ed1eaa2666eb1db1b97a732045d1fc5b864aba [formerly b2999a6d59]
Former-commit-id: 3598fb2fcd
|
2012-02-15 14:39:43 -06:00 |
|
Bryan Kowal
|
f4fb4ad7b9
|
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: 7b5b643d18 [formerly 2fabaff1d9] [formerly 38eb4bd2b6] [formerly 7b5b643d18 [formerly 2fabaff1d9] [formerly 38eb4bd2b6] [formerly 521756e57e [formerly 38eb4bd2b6 [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]]]]
Former-commit-id: 521756e57e
Former-commit-id: 83ba57dcd1 [formerly 134b8f2915] [formerly 66ae2354057f0c9b76ece5f6ef014f53d118b46b [formerly 1c023403e2]]
Former-commit-id: 588279ad4f4dbf9fd1f3f78ffb920ff7bc7e9ca6 [formerly e19d034858]
Former-commit-id: b59b0ef8d5
|
2012-02-15 10:31:58 -06:00 |
|
Bryan Kowal
|
4cd41c4137
|
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: 02c48be369 [formerly c78e988d55] [formerly 67562b0674] [formerly 02c48be369 [formerly c78e988d55] [formerly 67562b0674] [formerly 4faf9831ed [formerly 67562b0674 [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]]]]
Former-commit-id: 4faf9831ed
Former-commit-id: 2e2b3b4869 [formerly 0bf4fecb62] [formerly e75d6befa5289852fa8cf3ebd7ce2bc1848f4f41 [formerly eb91bb964e]]
Former-commit-id: e2850a17d1b816139542eb5da9c6e23e34013580 [formerly 0978aa5d1d]
Former-commit-id: 4ccdc365e1
|
2012-02-13 13:57:10 -06:00 |
|
Bryan Kowal
|
819b77d5d0
|
Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: c1d930b119 [formerly be0b6a87eb] [formerly 5039d66b12] [formerly c1d930b119 [formerly be0b6a87eb] [formerly 5039d66b12] [formerly cf4d56d0a0 [formerly 5039d66b12 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]]]
Former-commit-id: cf4d56d0a0
Former-commit-id: 3bc50618b7 [formerly f6b08149ad] [formerly 04447b381e8f34176bf56aeac8375d7e5d6866ba [formerly 90c33ef882]]
Former-commit-id: 5deeaa5352ab19e9521a87ced725f98ed250df11 [formerly a5a50ccfe0]
Former-commit-id: f0cdfeb9a8
|
2012-01-23 13:25:11 -06:00 |
|
Matt Nash
|
515196cb86
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
|
2012-01-19 11:53:12 -06:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|