Zhidong.Hao
|
ac40440ce5
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c
Former-commit-id: 8e54cb2958 [formerly 48ee7712c7 ] [formerly 009c6e067a ] [formerly 8e54cb2958 [formerly 48ee7712c7 ] [formerly 009c6e067a ] [formerly 1a91b820d9 [formerly 009c6e067a [formerly 30eba1a2397c41fed1b564af4c31791040b14eac]]]]
Former-commit-id: 1a91b820d9
Former-commit-id: 531eea30e1 [formerly ab0c9a65d2 ] [formerly 3276287380788647756570a048989a84fecfcd89 [formerly c6d9a3926e ]]
Former-commit-id: 2be119384e43516b510a208409a4f3c49e88e8d7 [formerly a94bf1a110 ]
Former-commit-id: a846d4c4f5
|
2014-04-11 15:34:06 -04:00 |
|
David Gillingham
|
be6e42d91b
|
Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1.
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: d14aee89aa [formerly 402adfeddb ] [formerly a529bc8cad ] [formerly d14aee89aa [formerly 402adfeddb ] [formerly a529bc8cad ] [formerly 70b28b4e1e [formerly a529bc8cad [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]]]]
Former-commit-id: 70b28b4e1e
Former-commit-id: 13017ce731 [formerly 64981356c8 ] [formerly a8749ff88e3ad01c4b1fec62d193a19acac4a3ef [formerly 22266d36b9 ]]
Former-commit-id: b2a35016bf9e27eefdf55483242773ab74367055 [formerly 3ad0872bda ]
Former-commit-id: 14f927fe54
|
2014-03-31 15:49:33 -05:00 |
|
Steve Harris
|
a19beb1e5d
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 52226061e9 [formerly 3ba28aabea ] [formerly 069093884f ] [formerly 52226061e9 [formerly 3ba28aabea ] [formerly 069093884f ] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d ] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0 ]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19 ]
Former-commit-id: 2db5dcf6eb
|
2014-03-06 08:39:43 -06:00 |
|
Brian.Dyke
|
9db7ca881a
|
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 9158806dd2 [formerly 363403fb34 ] [formerly 2faab606e5 ] [formerly 9158806dd2 [formerly 363403fb34 ] [formerly 2faab606e5 ] [formerly 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 6b1b6d38e3 [formerly 73a1c238f4 ] [formerly c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1 ]]
Former-commit-id: b22adde77eff6179b00b4c7389d58bbde1684f4b [formerly 38829b9014 ]
Former-commit-id: 0bcf7c89b8
|
2014-02-24 14:51:00 -05:00 |
|
Brian.Dyke
|
de9e6553a9
|
OB_14.1.1-19 baseline
Former-commit-id: 3508e488f5 [formerly 779553142c ] [formerly cfa4997978 ] [formerly 3508e488f5 [formerly 779553142c ] [formerly cfa4997978 ] [formerly 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 5a11fbbfdb [formerly c41dd22ff2 ] [formerly f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5 ]]
Former-commit-id: 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585 [formerly 1b359c2564 ]
Former-commit-id: f86f9f8918
|
2014-02-21 06:50:59 -05:00 |
|
Ron Anderson
|
c3b687b9a5
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 410f956cff [formerly e7f2b6883d ] [formerly 32bcf9d0d0 ] [formerly 410f956cff [formerly e7f2b6883d ] [formerly 32bcf9d0d0 ] [formerly 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 8779564e3a [formerly 0135771eec ] [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94 ]]
Former-commit-id: 55baedb811a56a020df3ba68f97e40ee6307fb4c [formerly 68e03bf02f ]
Former-commit-id: 8a7af092f2
|
2014-02-18 10:45:20 -06:00 |
|
Steve Harris
|
a5d78a7f44
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 1b7e02636d [formerly d0352c69d4 ] [formerly 267cc881a4 ] [formerly 1b7e02636d [formerly d0352c69d4 ] [formerly 267cc881a4 ] [formerly 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 1fbbb6e73f [formerly 146412a8bd ] [formerly 4c759335f64413680ab7d7fe1fc420d460dacc98 [formerly e115197bb7 ]]
Former-commit-id: 3a7d7a0e21b09081b233b6aa8dcf49e018ef8486 [formerly 28aa3dd195 ]
Former-commit-id: 7805eac857
|
2014-02-17 08:54:34 -06:00 |
|
Ron Anderson
|
86f067bac9
|
Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 69ee4792ad [formerly 3e78908bb5 ] [formerly fcf45916f4 ] [formerly 69ee4792ad [formerly 3e78908bb5 ] [formerly fcf45916f4 ] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]
Former-commit-id: 2f067699f2
Former-commit-id: 4d8ebf6712 [formerly d9b82b4ebe ] [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84 ]]
Former-commit-id: d0c2bdea1752a1aeb905c70a45c12e3d9bda80dc [formerly d298aabe40 ]
Former-commit-id: 7447a71c10
|
2014-02-13 10:10:34 -06:00 |
|
Ron Anderson
|
3d1cd70b57
|
Issue #2719 Update NHA GFE domain
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c
Former-commit-id: 0b73d0703e [formerly 0f9b44ff94 ] [formerly a665530831 ] [formerly 0b73d0703e [formerly 0f9b44ff94 ] [formerly a665530831 ] [formerly ee89463d27 [formerly a665530831 [formerly 28008b46b5d68e544dace5f721b283c222701699]]]]
Former-commit-id: ee89463d27
Former-commit-id: 07fdb410c6 [formerly 1ca9c95567 ] [formerly 92ba98108868529a68af7962661c0c08a1eade14 [formerly bfa65ed39e ]]
Former-commit-id: 738332a4bfc2ad7f86c63c6827a2be4e66627c41 [formerly dd597e8349 ]
Former-commit-id: 454ce0268d
|
2014-02-11 17:07:01 -06:00 |
|
Brian.Dyke
|
fc21d2dee4
|
14.1.1-18 baseline
Former-commit-id: 1f27652aa3 [formerly f05a2220cd ] [formerly 575e328123 ] [formerly 1f27652aa3 [formerly f05a2220cd ] [formerly 575e328123 ] [formerly 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: 1c7bf39f73 [formerly d61ae6c5f4 ] [formerly 57fbd21c8831f46d66fe301b77916657b0ab9f05 [formerly c5857c30f2 ]]
Former-commit-id: 48b7eeaa6cb834b10db17643ac629aaa112f6878 [formerly d1db845406 ]
Former-commit-id: f47dd3ef59
|
2014-02-11 15:52:50 -05:00 |
|
Brian.Dyke
|
97bf17521e
|
Issue #88
Former-commit-id: 6510e6da5a [formerly d56bdce6ff ] [formerly 643ef1a1a6 ] [formerly 6510e6da5a [formerly d56bdce6ff ] [formerly 643ef1a1a6 ] [formerly edccef5569 [formerly 643ef1a1a6 [formerly 66a1b2ba9933754b0d6d0324108268563e6381bc]]]]
Former-commit-id: edccef5569
Former-commit-id: 9cf763cd13 [formerly cdb408daf8 ] [formerly 99d3c8608feda52225fe2dd85b896e03bfe99a30 [formerly a5606c86c7 ]]
Former-commit-id: 4ab0b8424f27ebdbb06be07987bd8f71c6cdee8a [formerly 83ebe8826f ]
Former-commit-id: 904ffbd83e
|
2014-02-04 16:34:40 -05:00 |
|
Brian.Dyke
|
e0236cc20a
|
14.1.1-17 baseline
Former-commit-id: 4c6eb0c001 [formerly f3d34b0c38 ] [formerly 180d1356cd ] [formerly 4c6eb0c001 [formerly f3d34b0c38 ] [formerly 180d1356cd ] [formerly 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]]
Former-commit-id: 23280af290
Former-commit-id: 6e66bb7b6e [formerly f1cc9d6ee2 ] [formerly 50e190ed8cb3b89c055f33e543707eeb6346818a [formerly 947ec5fd96 ]]
Former-commit-id: b5864c63c56c26489ecbcefc3b1a67b8472182a1 [formerly 948fffa361 ]
Former-commit-id: b8f7317b9d
|
2014-02-04 12:33:46 -05:00 |
|
Ron Anderson
|
a967ebbe67
|
Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1
Former-commit-id: c717b6d805 [formerly 81f9709ae7 ] [formerly fb262fdad2 ] [formerly c717b6d805 [formerly 81f9709ae7 ] [formerly fb262fdad2 ] [formerly 7c06f0b011 [formerly fb262fdad2 [formerly 2c3e2b9bf8bf01065d79221febe9e95a8efaa46e]]]]
Former-commit-id: 7c06f0b011
Former-commit-id: 70e1a066d4 [formerly 25123bdeb0 ] [formerly a3818c2ef69b516c0e2514d6b82f2afc46368905 [formerly 64f55c6b02 ]]
Former-commit-id: e95cf485b4181e0315e0ab7317375623e930e02c [formerly d2d7920575 ]
Former-commit-id: 7e541f2f77
|
2014-01-29 14:16:31 -06:00 |
|
Ron Anderson
|
6c7d4c2b4a
|
Issue #2719 Add NHA domain to serverConfig.py
Change-Id: Ia7c5026ab5b8ae4c9c00adaf90b01d9fa527a044
Former-commit-id: 9215ca8f82 [formerly ea12cecc04 ] [formerly ce28c6c47f ] [formerly 9215ca8f82 [formerly ea12cecc04 ] [formerly ce28c6c47f ] [formerly 0f6e082769 [formerly ce28c6c47f [formerly 2c8d067a3a4c4848bc2eb313c4e901507844074d]]]]
Former-commit-id: 0f6e082769
Former-commit-id: ba249df313 [formerly 09335f5372 ] [formerly ee24887886668d70e0e574bfe841a1f6d4aa3cec [formerly 5427d15150 ]]
Former-commit-id: 3e899872dc8686e49208b77ba9de94a800567a7c [formerly 280434a03f ]
Former-commit-id: 2086f03c28
|
2014-01-29 13:55:54 -06:00 |
|
David Gillingham
|
ea868da200
|
Issue #2170: Fix SPCWatchSrv and TPCWatchSrv spring routes, add exception handling for WCLWatchSrv route.
Former-commit-id: 304eaa9f29 [formerly fc25bbe1e9 ] [formerly 5edfbaa4a5 ] [formerly 304eaa9f29 [formerly fc25bbe1e9 ] [formerly 5edfbaa4a5 ] [formerly c802315ddc [formerly 5edfbaa4a5 [formerly 3dfffb5f49a84a6ed82481d08c809e1217750f70]]]]
Former-commit-id: c802315ddc
Former-commit-id: 009e8c553d [formerly 04d6bc5a42 ] [formerly 6efd1e8e262f0905b42ba0a2df62a1b5c000be88 [formerly 17d38b4974 ]]
Former-commit-id: e9128c3f59d7240b2b0d840be6a80f40df8effd2 [formerly 38333b45a7 ]
Former-commit-id: 14326b8c8d
|
2014-01-29 11:56:05 -06:00 |
|
Ron Anderson
|
c131201be8
|
Issue #2504 Change other GFESuite scripts to use iscUtil.getLogger for consistency
Change-Id: I4ce123e8030075bf4a247152dd053ba16dad6987
Former-commit-id: 567c7b0fe5 [formerly c353c4aa74 ] [formerly c133dc5506 ] [formerly 567c7b0fe5 [formerly c353c4aa74 ] [formerly c133dc5506 ] [formerly a54c44a6fb [formerly c133dc5506 [formerly b0357df1c4b82623f1345362ddd6ca57d514a1e6]]]]
Former-commit-id: a54c44a6fb
Former-commit-id: f445c7eb7b [formerly 380f161220 ] [formerly 784492436cc2531dac82b914b739ebae83ee86f2 [formerly a330f388b0 ]]
Former-commit-id: 72da3459151480b123dd0fa53eba75d776f89209 [formerly a722dba9a0 ]
Former-commit-id: 694ff599dd
|
2014-01-24 17:01:40 -06:00 |
|
Ron Anderson
|
20a4e5929b
|
Issue #2504 Add hostname to log path for GFESuite scripts
Change-Id: I734d8f6ec89720d23371bd9c1187ef95eeaf22eb
Former-commit-id: f9e56a01aa [formerly 2c3cad8a81 ] [formerly 25cf05060d ] [formerly f9e56a01aa [formerly 2c3cad8a81 ] [formerly 25cf05060d ] [formerly e13a34a8b3 [formerly 25cf05060d [formerly 975cf49b49e6266081e7b9ebcce6782b3e411667]]]]
Former-commit-id: e13a34a8b3
Former-commit-id: 6782b20868 [formerly bfd5c96cd9 ] [formerly 8be0103561de6922e68ce83a93df118bbf55e71b [formerly ca80941c5b ]]
Former-commit-id: 8ed7513637d19080fe931d45fb47a8989653e4ee [formerly d819cc2512 ]
Former-commit-id: da1b299e40
|
2014-01-24 09:04:11 -06:00 |
|
Ron Anderson
|
14ad1410e4
|
Issue #2720 Improve efficiency of merging polygons in edit area generation
Change-Id: I8fd83384431942fd71f30aba6053ee12af7d0eb4
Former-commit-id: 70c0e383d7 [formerly bd3778fdd4 ] [formerly 8fde77b529 ] [formerly 70c0e383d7 [formerly bd3778fdd4 ] [formerly 8fde77b529 ] [formerly 9805de99fa [formerly 8fde77b529 [formerly c1ab9bc049528eb33b311355f6b089e67ea4997d]]]]
Former-commit-id: 9805de99fa
Former-commit-id: e5a7836741 [formerly 2c6abd4ff0 ] [formerly cb51a674bc89a25be22f221003c36d747aa8391f [formerly 7649381c8c ]]
Former-commit-id: 3371b469f52cc30056c817e52c750aff859ecc92 [formerly 0873c4ce9a ]
Former-commit-id: a6ec9db185
|
2014-01-21 13:25:31 -06:00 |
|
David Gillingham
|
da41766e87
|
Issue #2418: Fix PHISH parameter name case issues discovered in test.
Former-commit-id: 23878cd0d0 [formerly 1179080434 ] [formerly c0065ec2a9 ] [formerly 23878cd0d0 [formerly 1179080434 ] [formerly c0065ec2a9 ] [formerly 5401124a1f [formerly c0065ec2a9 [formerly a33e5eb63fe0ad7b9d79e878a9877500065a05a8]]]]
Former-commit-id: 5401124a1f
Former-commit-id: dc658ff27d [formerly f2bc6abb80 ] [formerly 43eb7ae8cb9a0b320f8e37fc7b98908c6475de3d [formerly cc9f2dcd27 ]]
Former-commit-id: b58824382e4ec03062c7f5384a47b6d622c3d8e8 [formerly ce0d4cef69 ]
Former-commit-id: c1fcd5f3af
|
2014-01-20 15:37:52 -06:00 |
|
Steve Harris
|
f8496662a0
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
Former-commit-id: 002b2492ac [formerly 5fcccbff1b ] [formerly 454d557884 ] [formerly 002b2492ac [formerly 5fcccbff1b ] [formerly 454d557884 ] [formerly 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 9843517cb3 [formerly 7ea285c48b ] [formerly 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616 ]]
Former-commit-id: 656727c4e55c34f4fb4a1128b81b68286b1e7757 [formerly b5f7f35ccb ]
Former-commit-id: ccd2f6cdaa
|
2014-01-20 10:17:44 -06:00 |
|
gerritcm
|
e924818487
|
14.1.1-16 baseline
Former-commit-id: 57472968be [formerly 9e935404d8 ] [formerly 6be938e6eb ] [formerly 57472968be [formerly 9e935404d8 ] [formerly 6be938e6eb ] [formerly b84f7d4203 [formerly 6be938e6eb [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]]]]
Former-commit-id: b84f7d4203
Former-commit-id: c1df3eb55c [formerly b72cd19055 ] [formerly 8a149ceb12545503e179389c0569fad3eefaed15 [formerly 644da23327 ]]
Former-commit-id: d2214c65a6550cba23bc7837777ef6a2fc6d443a [formerly 5f79da2501 ]
Former-commit-id: 6bf3189db9
|
2014-01-16 16:43:05 -05:00 |
|
Ron Anderson
|
17fd0b0fcd
|
Issue #2660 Improved error logging in GetBrokerConnections.py
Change-Id: Icf39a847106c13785e16aaef12283f44f4791cd1
Former-commit-id: 76c4f81485 [formerly 8531b21576 ] [formerly f47313690a ] [formerly 76c4f81485 [formerly 8531b21576 ] [formerly f47313690a ] [formerly 2db1ae7b2d [formerly f47313690a [formerly b078a4fa3dc8df69903fa07e172b5de6313bb17a]]]]
Former-commit-id: 2db1ae7b2d
Former-commit-id: 8de16b0553 [formerly b7ca6eca30 ] [formerly 9299a09360a65becc4e20cd2ee0487943e8737a8 [formerly 7ae517c5d2 ]]
Former-commit-id: 73efd9453991f262b3c43753649034075fea6bd8 [formerly 4939e09c4a ]
Former-commit-id: eff389d23d
|
2014-01-16 09:04:15 -06:00 |
|
Ron Anderson
|
d5324b195f
|
Issue #1571 Fix bug in GFE where DbId in ParmId did not match the Database.
Change-Id: I08b5ec1dbbf95d269c9f1ad7fb5e02a8a471b7ec
Former-commit-id: fe81181bf1 [formerly a656439fb2 ] [formerly 46f00786ed ] [formerly fe81181bf1 [formerly a656439fb2 ] [formerly 46f00786ed ] [formerly fae5283358 [formerly 46f00786ed [formerly c03aacd100a73d84d96bfcd3db447597f478fcb7]]]]
Former-commit-id: fae5283358
Former-commit-id: c2c4142235 [formerly 4f4f4996be ] [formerly cc91b608d397b8f1c96faf04a7964719df9bec04 [formerly 151cb21153 ]]
Former-commit-id: 3f000ca5732dfdf9905d3245bfea3385136cb592 [formerly 57fd63be92 ]
Former-commit-id: bbe66d7472
|
2014-01-15 16:16:44 -06:00 |
|
Ron Anderson
|
f33f5aec85
|
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: 2e8cbade9f [formerly 0bde38cef3 ] [formerly ba7a25a88f ] [formerly 2e8cbade9f [formerly 0bde38cef3 ] [formerly ba7a25a88f ] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]
Former-commit-id: 62c445d872
Former-commit-id: 46735c9afe [formerly dca7f21f7b ] [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e ]]
Former-commit-id: 550b8ecf890edc1befc4cc61d160811052a5c599 [formerly 5076217d8f ]
Former-commit-id: 77c132f706
|
2014-01-13 17:45:20 -06:00 |
|
Ron Anderson
|
5b0c947cd3
|
Issue #2044 Fix some error handling in GFE to eliminate exceptions in edex logs.
Change-Id: Iad8edf92318d6c9277648396ba450a3fc6eb5c5a
Former-commit-id: 41354cddf7 [formerly 7cae1b981d ] [formerly 89f07fe932 ] [formerly 41354cddf7 [formerly 7cae1b981d ] [formerly 89f07fe932 ] [formerly 1c520b8cd1 [formerly 89f07fe932 [formerly 3f9f254229066cfe12501aacd14e68937764fadb]]]]
Former-commit-id: 1c520b8cd1
Former-commit-id: 2e9d07a0cf [formerly 9df631248d ] [formerly 0a9b4434bf29a1eed5671f4ab66b9040010b48e6 [formerly bbac6df77d ]]
Former-commit-id: 29ea19f0c002dc1e3533d16c374ae3d76c6f17ef [formerly 638da99b1d ]
Former-commit-id: 048ff50564
|
2014-01-10 15:01:10 -06:00 |
|
Ron Anderson
|
20ca294505
|
Issue #2508 Restore DiscreteGridSlice.setKey method used by iscMosaic.
Change-Id: I503cf82ce896e8cdf39c238eda0f31453d8510a5
Former-commit-id: 4e479cf9bd [formerly 17ed8a6e75 ] [formerly 3017260991 ] [formerly 4e479cf9bd [formerly 17ed8a6e75 ] [formerly 3017260991 ] [formerly d80ce4a19e [formerly 3017260991 [formerly 142f68c426c4e2fbeb1e0b97cbb7b47c38e3b90d]]]]
Former-commit-id: d80ce4a19e
Former-commit-id: 7b369af525 [formerly d70701cc6e ] [formerly aa04179c7e3f5387a4ead15786aaad0bb4f86872 [formerly 57d3503ed6 ]]
Former-commit-id: a2375dc72af403acc329b020bfe7940ad5ac4fe3 [formerly 4d9a0da7d6 ]
Former-commit-id: 42da1cc555
|
2014-01-10 13:17:44 -06:00 |
|
Ron Anderson
|
a26c79995f
|
Issue #2509 Fix merge error in iscMosaic (fix indentation)
Change-Id: I1745af1a51d6fffe221168cc8dca217d2f309007
Former-commit-id: 167ef0a302 [formerly b0fa3c6514 ] [formerly 4da9799eaf ] [formerly 167ef0a302 [formerly b0fa3c6514 ] [formerly 4da9799eaf ] [formerly 82d3277785 [formerly 4da9799eaf [formerly 94c97fee9c6925ac9e73530bd18ec03d8cab4a40]]]]
Former-commit-id: 82d3277785
Former-commit-id: 9aae54c713 [formerly 89c27cc683 ] [formerly 400aac7d966ddfd5fb28ad35617d4abd86685c39 [formerly 4fe580f47b ]]
Former-commit-id: afde3205f025f1a1bc084329669b6e1b977e033a [formerly 93c933e2c7 ]
Former-commit-id: 6305678357
|
2014-01-08 08:49:32 -06:00 |
|
Steve Harris
|
e44faa7943
|
14.1.1-15 baseline
Former-commit-id: c6cb11a5f4 [formerly f88ff2bde9 ] [formerly 8bbd803ace ] [formerly c6cb11a5f4 [formerly f88ff2bde9 ] [formerly 8bbd803ace ] [formerly d8e5799328 [formerly 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]]
Former-commit-id: d8e5799328
Former-commit-id: 188b12a1b0 [formerly 282d10fe6d ] [formerly 390c383ede3823f4b855f6230e3fad20d31e0e07 [formerly 35d8f5a281 ]]
Former-commit-id: 86d049732a94fe967ea42eb6fadaec484ef0117f [formerly cd4a09623c ]
Former-commit-id: 1ca553385c
|
2014-01-06 14:08:08 -05:00 |
|
Steve Harris
|
f8f17037ca
|
14.1.1-14 baseline
Former-commit-id: 94a748fa8d [formerly 6df7c67f95 ] [formerly f2ad9da4eb ] [formerly 94a748fa8d [formerly 6df7c67f95 ] [formerly f2ad9da4eb ] [formerly 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 4a516444b6 [formerly 0989c17710 ] [formerly 0c5e0a197ceb1a6b84da775143e65603564a8877 [formerly 43cc501e0d ]]
Former-commit-id: a6acd13ea8d0052cec52c8cee5a726953d78e66e [formerly a2bdee5cc1 ]
Former-commit-id: 5862555160
|
2014-01-06 14:02:30 -05:00 |
|
Richard Peter
|
08d2290f97
|
Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
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.viz.gfe/GFESuite/ifpIMAGE
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7
Former-commit-id: cc89b16338 [formerly e4f59ea119 ] [formerly 1de516964b ] [formerly cc89b16338 [formerly e4f59ea119 ] [formerly 1de516964b ] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 73f12bf669 [formerly 5c0cf804f1 ] [formerly 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744 ]]
Former-commit-id: 3e8093536581ac6595438ca5eb497ae394fe30e8 [formerly 4059813742 ]
Former-commit-id: 1c743d4d44
|
2013-12-17 21:04:53 -06:00 |
|
Steve Harris
|
e242b041ad
|
14.1.1-13 baseline
Former-commit-id: a2ae393ec1 [formerly 85eebac7e2 ] [formerly c88b10039a ] [formerly a2ae393ec1 [formerly 85eebac7e2 ] [formerly c88b10039a ] [formerly b0b55a676b [formerly c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]]
Former-commit-id: b0b55a676b
Former-commit-id: 690b177ded [formerly 5368f23247 ] [formerly afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979 ]]
Former-commit-id: 0ea21b66b82286c758014c97bc2a1696ff006efb [formerly ff08301890 ]
Former-commit-id: 800136d61b
|
2013-12-12 16:59:57 -05:00 |
|
Richard Peter
|
a9fca155ac
|
Issue #2509: Fix IFPWE merge issue
Change-Id: Ic2a675228f066302eba10e52ba61ea62ab411d75
Former-commit-id: 98d1934501 [formerly 5ad19e32a9 ] [formerly 73960ce29a ] [formerly 98d1934501 [formerly 5ad19e32a9 ] [formerly 73960ce29a ] [formerly a8b251223a [formerly 73960ce29a [formerly 9450ca459d6b2efdea0d0124a6f9e7100eb5472a]]]]
Former-commit-id: a8b251223a
Former-commit-id: 405274c409 [formerly f473851db8 ] [formerly 353ea204d786797b9a8d11a6fa8df1eaa4fe8faa [formerly 7bcdabd8dd ]]
Former-commit-id: 6c14189c557acf3e1b8a1b3e6050994837f87b02 [formerly c909291e15 ]
Former-commit-id: 20b1c9cfbc
|
2013-12-05 12:33:51 -06:00 |
|
Richard Peter
|
f362062048
|
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: ba577ff354 [formerly b3b23647b4 ] [formerly 0c4ae068ad ] [formerly ba577ff354 [formerly b3b23647b4 ] [formerly 0c4ae068ad ] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 530b3bd588 [formerly 60679a818a ] [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4 ]]
Former-commit-id: 53e9784af497b834229cb70070f6499791f6f567 [formerly fd93b7d85e ]
Former-commit-id: ae6e34be4b
|
2013-12-05 12:12:27 -06:00 |
|
Ron Anderson
|
d3d2ea3745
|
Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3
Former-commit-id: 218a052bbf [formerly 497236ca74 ] [formerly b5906249cc ] [formerly 218a052bbf [formerly 497236ca74 ] [formerly b5906249cc ] [formerly 20eeb2796e [formerly b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]]
Former-commit-id: 20eeb2796e
Former-commit-id: fb3b7b0a9f [formerly e30d6041ee ] [formerly 473bec12d3fe432d141080f1a78bde66bd1ac17b [formerly 103fed386f ]]
Former-commit-id: 89e88491b334d8f079138c920fd456262fa46656 [formerly 89e87a1683 ]
Former-commit-id: bbd7ea36a1
|
2013-12-04 17:10:48 -06:00 |
|
Richard Peter
|
052119fffe
|
Issue #2170: Update Plugin Notification Framework
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277
Former-commit-id: f2d99af20e [formerly 5905c5d08d ] [formerly 2085a9cd33 ] [formerly f2d99af20e [formerly 5905c5d08d ] [formerly 2085a9cd33 ] [formerly fbda83aeb9 [formerly 2085a9cd33 [formerly 081a19d5cfca3d717a332357dbaead199767e0b8]]]]
Former-commit-id: fbda83aeb9
Former-commit-id: 14ed9331d3 [formerly 670e63d0dd ] [formerly 92cc0eed5d5ca22d3b43329858c1619c9363e66a [formerly f7f9a4e57c ]]
Former-commit-id: 5edc348b297d22aeb20b7b1cbe81e90329464d25 [formerly ff5fbcf012 ]
Former-commit-id: 90e23f5c6b
|
2013-12-03 11:41:21 -06:00 |
|
Steve Harris
|
941d5f65df
|
14.1.1-11 baseline
Former-commit-id: 401ee156b8 [formerly 337b138200 ] [formerly 70a6f1936e ] [formerly 401ee156b8 [formerly 337b138200 ] [formerly 70a6f1936e ] [formerly 71ae71c850 [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]]
Former-commit-id: 71ae71c850
Former-commit-id: 41a54a5ca6 [formerly 8bd818de09 ] [formerly 2a75dd3165e6ee0eb548ce9cbb694967018bb4bf [formerly 5526a8999d ]]
Former-commit-id: 163b900bd16bb48d13431ad4d1511ea0204fdfed [formerly f88a635a58 ]
Former-commit-id: bfa9d638cc
|
2013-12-02 17:10:10 -05:00 |
|
Steve Harris
|
8a1ea4d35f
|
14.1.1-10 baseline
Former-commit-id: 69cef95302 [formerly 8251107646 ] [formerly ca0f65bd9a ] [formerly 69cef95302 [formerly 8251107646 ] [formerly ca0f65bd9a ] [formerly 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]]
Former-commit-id: 9248695a1f
Former-commit-id: 2c49ed51ac [formerly e35ec60f7e ] [formerly 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304 ]]
Former-commit-id: 1da4cf492cf27e8f6e06f3cfbfcc4a4b3ce25255 [formerly 36d788890a ]
Former-commit-id: ea65181d19
|
2013-11-19 16:40:25 -05:00 |
|
Steve Harris
|
7facd4fe25
|
14.1.1-8 baseline
Former-commit-id: 8606fed724 [formerly 90bc008a50 ] [formerly aa6c977e7b ] [formerly 8606fed724 [formerly 90bc008a50 ] [formerly aa6c977e7b ] [formerly c7d36eb6ad [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 1902ca9cfb [formerly b7ca6163e3 ] [formerly 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7 [formerly 0123596fd9 ]]
Former-commit-id: 299bb48cc93fac70de777c99a73fd516cc085238 [formerly 42ece4fb6a ]
Former-commit-id: d2104614be
|
2013-11-13 12:32:17 -05:00 |
|
Richard Peter
|
ff729f46b5
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: 061fa07147 [formerly 7ba466f5a6 ] [formerly 306bd6fae1 ] [formerly 061fa07147 [formerly 7ba466f5a6 ] [formerly 306bd6fae1 ] [formerly 460a7b8b5d [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 112816a54c [formerly 3f68fc6eed ] [formerly 617c9d2d122683ab3ac05ff74694962b33afa16d [formerly 59671c1e7d ]]
Former-commit-id: 8b93a7813019963981a150f64ec44daf5d188cde [formerly c8ef435295 ]
Former-commit-id: ef23a8f65b
|
2013-11-12 11:11:36 -06:00 |
|
Bryan Kowal
|
f190760123
|
Issue #2297 - fix 14.2.1 merge
Former-commit-id: 8d412d7aa0 [formerly fee6a5dc9c ] [formerly e2a02ca247 ] [formerly 8d412d7aa0 [formerly fee6a5dc9c ] [formerly e2a02ca247 ] [formerly 411e0fa7c4 [formerly e2a02ca247 [formerly e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b]]]]
Former-commit-id: 411e0fa7c4
Former-commit-id: 608f00417e [formerly b1a6d2d828 ] [formerly 9608fdc09cce1ba5077a173bab8ffc316408830f [formerly e937ba954b ]]
Former-commit-id: 0775c166800f807532941473117b90119faa9398 [formerly 18bb3ef947 ]
Former-commit-id: f986662369
|
2013-11-11 13:04:21 -06:00 |
|
Steve Harris
|
8c0239d4e9
|
Merge branch 'omaha_13.5.3' (13.5.3-6) into development
Former-commit-id: cf9f426faa [formerly 33e02b548d ] [formerly fbfe1a5faf ] [formerly cf9f426faa [formerly 33e02b548d ] [formerly fbfe1a5faf ] [formerly 8a2e9f1725 [formerly fbfe1a5faf [formerly a4c8e9a5fb9d50844da854e453b6146c2a6e75c3]]]]
Former-commit-id: 8a2e9f1725
Former-commit-id: ef183dd7af [formerly 4e09ce78c8 ] [formerly acaa9065d51878d26f0253e193ea63bd14a6d273 [formerly b4fe17406f ]]
Former-commit-id: f7cc13eda46ebb68547c95ae89a815a7690440c4 [formerly 76ca0835e7 ]
Former-commit-id: c9bbd30adf
|
2013-11-11 11:45:35 -06:00 |
|
Bryan Kowal
|
74664b1def
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.uf.viz.archive.feature/feature.xml
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ICaseCopy.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cots/edu.uci.ics.crawler4j/.classpath
cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF
cots/edu.uci.ics.crawler4j/build.properties
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/build.edex/esb/conf/spring/cron.properties
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/AirepDecoder.java
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
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/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GridToGribConverter.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/CPCoutlookGribPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/Nam80PostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/SixHrPrecipGridProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/ThreeHrPrecipGridProcessor.java
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/PirepDecoder.java
edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/unit-test/test/edex/transform/shef/TestMetarToShefTransformer.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.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/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java
edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/MESOWestDecoder.java
edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java
edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoder.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/src/gov/noaa/nws/ncep/edex/plugin/ncccfp/decoder/NcccfpDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgridAssembler.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/NcPirepDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/ObservedSoundingQuery.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java
rpms/awips2.ade/Installer.eclipse/component.spec.3.6.1
Former-commit-id: f6b8d99e70 [formerly 3b8ce3fd34 ] [formerly c3eb4e9af9 ] [formerly f6b8d99e70 [formerly 3b8ce3fd34 ] [formerly c3eb4e9af9 ] [formerly f1cd2f2e5a [formerly c3eb4e9af9 [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: b2fb3cc71b [formerly 464a8d1001 ] [formerly 9832b7353c98edff371d73697564b1585403dd75 [formerly 1909193f0c ]]
Former-commit-id: bbe6693bef01b8fb05627cf015f2b987c0a64c90 [formerly dfba50bf2e ]
Former-commit-id: 9f749f3079
|
2013-11-08 14:51:47 -06:00 |
|
Richard Peter
|
0bcf000a31
|
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
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.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: 1ba8eb3891 [formerly 25df870b67 ] [formerly fa7d77ae97 ] [formerly 1ba8eb3891 [formerly 25df870b67 ] [formerly fa7d77ae97 ] [formerly 93c776022a [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]]
Former-commit-id: 93c776022a
Former-commit-id: aec254aac0 [formerly c97efbf656 ] [formerly 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4 [formerly 520dd57f02 ]]
Former-commit-id: 8eb1848d92c6225ecf7e4aff08b65f9f7fc71abe [formerly 910464ea6a ]
Former-commit-id: 94e0faa6c6
|
2013-11-07 14:25:45 -06:00 |
|
Steve Harris
|
f1688d58e6
|
13.5.3-5 baseline
Former-commit-id: 257f69c55c [formerly 5b3cd9befd ] [formerly 06b5e0e0ec ] [formerly 257f69c55c [formerly 5b3cd9befd ] [formerly 06b5e0e0ec ] [formerly f175680b89 [formerly 06b5e0e0ec [formerly 427119d391ffb23c0db3fa0dab0a893322a60f8c]]]]
Former-commit-id: f175680b89
Former-commit-id: 3fac0e0b27 [formerly d9efe087e5 ] [formerly cae6925bd9b5a490e72c32e60a0c8c7f114e2386 [formerly 31b57882cb ]]
Former-commit-id: 2004c192e88b30c3491b310a59ba776377cf312a [formerly b816e9e555 ]
Former-commit-id: e8e1307ee0
|
2013-11-07 12:22:32 -05:00 |
|
Steve Harris
|
2608595d90
|
14.1.1-7 baseline
Former-commit-id: 21ff310620 [formerly 80614c0e52 ] [formerly 3328e2dd1d ] [formerly 21ff310620 [formerly 80614c0e52 ] [formerly 3328e2dd1d ] [formerly 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]]
Former-commit-id: 4fff87723f
Former-commit-id: 4d2f53ebc6 [formerly b694612fe0 ] [formerly d44a91d984ae1d600e17c54655b8255108cade35 [formerly 48df058653 ]]
Former-commit-id: 39afc27726ae906146c56faa8073b17caaeb711d [formerly 647b908fed ]
Former-commit-id: cfb3194426
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
24ec3c5993
|
14.1.1-6 baseline
Former-commit-id: f44bae4383 [formerly 946a9be17e ] [formerly 0cb2978c13 ] [formerly f44bae4383 [formerly 946a9be17e ] [formerly 0cb2978c13 ] [formerly 6067af4252 [formerly 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]]
Former-commit-id: 6067af4252
Former-commit-id: 2a5f4c26d6 [formerly e86a0aa489 ] [formerly 70967acd51143f4f43cec1322c400d567f95c3ce [formerly 26da1ce793 ]]
Former-commit-id: 30c24036c09dc21bf6f32deefe9a7a44f35d8005 [formerly 270c5f1a2d ]
Former-commit-id: 0aa90a7855
|
2013-11-06 14:08:33 -05:00 |
|
Steve Harris
|
c3ac33582f
|
13.5.3-4 baseline
Former-commit-id: 667ec69fbc [formerly 0ee69293ec ] [formerly 8aeae1c481 ] [formerly 667ec69fbc [formerly 0ee69293ec ] [formerly 8aeae1c481 ] [formerly da7d1ce05e [formerly 8aeae1c481 [formerly 103d478433e8d0aad0599511c30ef0792f854d13]]]]
Former-commit-id: da7d1ce05e
Former-commit-id: a4cc3f0bf6 [formerly 7454b37d59 ] [formerly 7369078223f22949c985fdf82f677dcb829640f5 [formerly b8d3fd62d0 ]]
Former-commit-id: 0df02f675ff87a29fb8942ecbcc9ef833301020e [formerly 8f9b121f90 ]
Former-commit-id: 90f27a16c9
|
2013-11-01 14:20:00 -04:00 |
|
Bryan Kowal
|
7cd17382dc
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Former-commit-id: fd5a5096de [formerly 04bcd7e6dc ] [formerly 49422aea62 ] [formerly fd5a5096de [formerly 04bcd7e6dc ] [formerly 49422aea62 ] [formerly d08a652e23 [formerly 49422aea62 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]]
Former-commit-id: d08a652e23
Former-commit-id: 874bd8aa36 [formerly d53ec9c750 ] [formerly 2f7241bd44af27a962760419963b91198396fa99 [formerly adb62df96a ]]
Former-commit-id: 7bb259e517c1ed9b9182d1d9842aa0cc9ad29f26 [formerly 70d4374ce8 ]
Former-commit-id: 0d8ab84604
|
2013-10-31 15:43:29 -05:00 |
|
Ron Anderson
|
2b4809ead7
|
Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c
Former-commit-id: f0529e0eee [formerly b61ccc1609 ] [formerly 38e33092a2 ] [formerly f0529e0eee [formerly b61ccc1609 ] [formerly 38e33092a2 ] [formerly 42e924e021 [formerly 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]]
Former-commit-id: 42e924e021
Former-commit-id: dd1b50d116 [formerly 2f23072e41 ] [formerly e573e83de25a263065e03ab739ab5d58c0ca7fb1 [formerly eef9d2dfb0 ]]
Former-commit-id: 6420457c498cf2f6184538b3831ba133f0623c15 [formerly e3a0440825 ]
Former-commit-id: 49ea9c0444
|
2013-10-31 14:04:55 -05:00 |
|
Steve Harris
|
4d2a15c959
|
13.5.3-3 baseline
Former-commit-id: 8df88e1b77 [formerly 883ad32443 ] [formerly baa036cd62 ] [formerly 8df88e1b77 [formerly 883ad32443 ] [formerly baa036cd62 ] [formerly 1503847a4b [formerly baa036cd62 [formerly c261e0753eb106a2912314056a1b4903695750c5]]]]
Former-commit-id: 1503847a4b
Former-commit-id: 3a5911368f [formerly a58b825dde ] [formerly e27f6359a046d1d0047ec0fc1c24c9d171c5bf82 [formerly 6b879b2465 ]]
Former-commit-id: 00b390ce880010abcc3167a5427b564527ba940c [formerly 5be6e21405 ]
Former-commit-id: ef72863e6f
|
2013-10-31 12:52:07 -04:00 |
|