Roger Ferrel
|
f0a6f0841f
|
Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: 75e0d18dc9 [formerly 32ae3ba73f] [formerly bd2d40faee] [formerly 75e0d18dc9 [formerly 32ae3ba73f] [formerly bd2d40faee] [formerly ad6eac6e20 [formerly bd2d40faee [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]]]]
Former-commit-id: ad6eac6e20
Former-commit-id: c6e2725ccb [formerly 6e37a43757] [formerly bfed3ce96674059d15316bcc9f04471a2469b25b [formerly 801bdc8fc7]]
Former-commit-id: 2e59e5b070ee1cbe0348eca7fc85285c2835dcc9 [formerly 7fef8ed924]
Former-commit-id: f954d93c5a
|
2014-06-26 11:16:09 -05:00 |
|
Greg Armendariz
|
198ac126fe
|
Omaha #3299 - Fix qpid dependency
Former-commit-id: 261677faf9 [formerly 74500b05fc] [formerly 9d9ba5a78f] [formerly 261677faf9 [formerly 74500b05fc] [formerly 9d9ba5a78f] [formerly 9d1630a617 [formerly 9d9ba5a78f [formerly d292734da643f003d9d04e03b32727bf9c007443]]]]
Former-commit-id: 9d1630a617
Former-commit-id: c8f98b8bbc [formerly 4802ac344e] [formerly 916998cd8ec9d98a002702ddcef3487d8aa30f5c [formerly 58d09cc3ec]]
Former-commit-id: 5972f1e3db76a707ab98d2fc005b2896c303b32a [formerly 69f085c08c]
Former-commit-id: 4e06a55342
|
2014-06-19 09:56:10 -05:00 |
|
Greg Armendariz
|
fd99c75b72
|
Merge "Omaha #3247 - Update qpid dependency" into omaha_14.4.1
Former-commit-id: 670fb899a5 [formerly e73a0de182] [formerly faebbc13f7] [formerly 670fb899a5 [formerly e73a0de182] [formerly faebbc13f7] [formerly 8c568a223e [formerly faebbc13f7 [formerly 2484a3407392f64b51b93bd3a4dab04194debea5]]]]
Former-commit-id: 8c568a223e
Former-commit-id: 474d384f97 [formerly 5fd5c7f8ff] [formerly 06515ca3b86636dd0c3b90da3ce9e562cfb0a30f [formerly 5c8c3ba6b3]]
Former-commit-id: 5412638de8ae0255de5bb2e4a5872af5a408428e [formerly a4692c8966]
Former-commit-id: 8f76c38e68
|
2014-06-16 08:57:12 -05:00 |
|
Steve Harris
|
563cf7b455
|
Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java
Former-commit-id: 4d724b6474 [formerly 97843cf58e] [formerly 9213369739] [formerly 4d724b6474 [formerly 97843cf58e] [formerly 9213369739] [formerly e1c8ad2611 [formerly 9213369739 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]]
Former-commit-id: e1c8ad2611
Former-commit-id: 6cc0c35e76 [formerly d7cd0ac02c] [formerly 9dc77519d1d40439f9609aa1b8bb1f64c8a1ab8a [formerly 362988b9d7]]
Former-commit-id: 54590884305d436b0bff6e041169417a3fab2fbb [formerly 8270fd8a9f]
Former-commit-id: a0d17947a9
|
2014-06-16 08:19:12 -05:00 |
|
Greg Armendariz
|
f162074444
|
Omaha #3247 - Update qpid dependency
Former-commit-id: 65ced96c6b [formerly c14107d4cf] [formerly db4e94b713] [formerly 65ced96c6b [formerly c14107d4cf] [formerly db4e94b713] [formerly 70104bc9aa [formerly db4e94b713 [formerly 9a6a0c9941aaa9b49da7329cccb7e05456ad514c]]]]
Former-commit-id: 70104bc9aa
Former-commit-id: 00c243d3e5 [formerly 3bd1c7ff81] [formerly 6b75a398d844fb77466653db75848995341ac930 [formerly d2f9344b5f]]
Former-commit-id: 917cb592e0af915082b87572c982ef73760dcf81 [formerly b8b50069f5]
Former-commit-id: 377d8f3a70
|
2014-06-14 08:13:14 -05:00 |
|
Brian.Dyke
|
c7ea1d14a4
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: c4ecd90117 [formerly e802508e98] [formerly a011c0b6bb] [formerly c4ecd90117 [formerly e802508e98] [formerly a011c0b6bb] [formerly 6fcc2604e0 [formerly a011c0b6bb [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]]]
Former-commit-id: 6fcc2604e0
Former-commit-id: 319c42800a [formerly 50073f34b2] [formerly 06a7320d681143eaedbb5dc395076f3968649812 [formerly 10696504a0]]
Former-commit-id: 9d9acc84599e418a839ea20c9dba7c2ad790dc86 [formerly ac235bf20a]
Former-commit-id: 40fb1f6159
|
2014-06-12 07:07:17 -04:00 |
|
Ana Rivera
|
c48edea423
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Former-commit-id: c1e504cdfa [formerly 4b515bfd0a] [formerly 65e90953c2] [formerly c1e504cdfa [formerly 4b515bfd0a] [formerly 65e90953c2] [formerly 9da58db461 [formerly 65e90953c2 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]]]]
Former-commit-id: 9da58db461
Former-commit-id: 0d7b0bd224 [formerly e249a71765] [formerly 127510ed332577a010a023c75dc1fcecd022d0b6 [formerly 540a286595]]
Former-commit-id: 3cc1d10a8464122ec97adf27ec9a0a37f75958f3 [formerly 5721d2df05]
Former-commit-id: eb270f539a
|
2014-06-11 17:35:55 +00:00 |
|
Brian.Dyke
|
a32d416bba
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements...modified spec file
Former-commit-id: 67cef121bf [formerly de6a06bc8c] [formerly d708eeb7d8] [formerly 67cef121bf [formerly de6a06bc8c] [formerly d708eeb7d8] [formerly 7db87d6ccb [formerly d708eeb7d8 [formerly f671db68bfab4b9c17eb25050468e5b6306e6359]]]]
Former-commit-id: 7db87d6ccb
Former-commit-id: 60f06d1e18 [formerly c00bc1d654] [formerly 5941a66242df6eb16b8846d1f66fcfb8133681e4 [formerly bce3dc1bef]]
Former-commit-id: 00394615a5974c6470241fdef97e86ac565c48a6 [formerly c2d725a60c]
Former-commit-id: bf96a4ea21
|
2014-06-04 11:52:00 -04:00 |
|
Brian.Dyke
|
f8fec394e1
|
Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: a91c426ee7 [formerly feb26ee9b7] [formerly 61b206be0b] [formerly a91c426ee7 [formerly feb26ee9b7] [formerly 61b206be0b] [formerly 3919c9ec2f [formerly 61b206be0b [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]]]
Former-commit-id: 3919c9ec2f
Former-commit-id: 7d8dd856bd [formerly 8f6e365ece] [formerly f5c80b02fc2a80a424af9d583f9c067a6dab9c12 [formerly 244467210c]]
Former-commit-id: a57e4cdd13c530f19a214cf1874aa117dbeb8728 [formerly 75c6886f61]
Former-commit-id: cdbcdb6cbd
|
2014-06-04 07:46:16 -04:00 |
|
Kenneth Sperow
|
17b05cb9d9
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8
Former-commit-id: 764ffeb440 [formerly a59743ebe0] [formerly c302ef8967] [formerly 764ffeb440 [formerly a59743ebe0] [formerly c302ef8967] [formerly f2a738cc25 [formerly c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]]]
Former-commit-id: f2a738cc25
Former-commit-id: be5c7616f5 [formerly 1ba5f0a3c4] [formerly f37bc3930eb01b1551e48a86cb29ce5ebd4ca434 [formerly ca913b6159]]
Former-commit-id: c8835c1e57e17265888c244565b0ad22c4fe3c23 [formerly 3e94502542]
Former-commit-id: ca67a59e23
|
2014-06-03 20:55:29 -07:00 |
|
Sean.Webb
|
d704aeb88e
|
Merge "ASM #557 - Removed rh6 dependency from wxgtk rpm requirements" into asm_14.3.1
Former-commit-id: 7b1183d283 [formerly 411b64da45] [formerly e46c62660b] [formerly 7b1183d283 [formerly 411b64da45] [formerly e46c62660b] [formerly 94f2a4ab2a [formerly e46c62660b [formerly ca4cde97f7304f94bb990dcd53ac39e06c09c7de]]]]
Former-commit-id: 94f2a4ab2a
Former-commit-id: d15ce20f37 [formerly 893598ad2f] [formerly b3245e304fc0c85c3299ae9f4c915b9c21702ea7 [formerly ae1a95e55b]]
Former-commit-id: 2aff84db40b09a7ab9abe2f6744494ded3f4afd1 [formerly c3f6e5513b]
Former-commit-id: 1db1f40b55
|
2014-05-30 14:42:34 -05:00 |
|
Sean.Webb
|
67d44b16cc
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements
Change-Id: I5a59edfb974c945a4d382fad109e513e3a51eeee
Former-commit-id: 0f181e50c0 [formerly ba4f3b92ce] [formerly af990fb412] [formerly 0f181e50c0 [formerly ba4f3b92ce] [formerly af990fb412] [formerly 73c2add28e [formerly af990fb412 [formerly bba964bd6af7d307a27ee85b11bce03d79f52e97]]]]
Former-commit-id: 73c2add28e
Former-commit-id: 909d36fb70 [formerly 84dd29ce87] [formerly 6601c8f842e33b252797671c20cf9d755ff2e332 [formerly 7223f7454e]]
Former-commit-id: d34bc13889533d0f1647d4a25c03acd631f9e9f8 [formerly 7b3b92913d]
Former-commit-id: fa531fa4b1
|
2014-05-30 14:40:44 -04:00 |
|
Sean.Webb
|
eaf0a3cecf
|
ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: 8241b1904d [formerly d899f42637] [formerly c05e8e319e] [formerly 8241b1904d [formerly d899f42637] [formerly c05e8e319e] [formerly 75f8e82eeb [formerly c05e8e319e [formerly 88147ed5e5cd84e40acf61ad46d1baa554fd4e28]]]]
Former-commit-id: 75f8e82eeb
Former-commit-id: 3bc3e3a61f [formerly a6a5887fe8] [formerly 69c2ae20cae2240566ece68108ae8a55e64b93db [formerly 43bf2d622f]]
Former-commit-id: c43b5f5ccfa9cddc70bd6d9fbbb3d773442f52ca [formerly 6677a8db47]
Former-commit-id: d9abb4bf75
|
2014-05-30 14:27:59 -04:00 |
|
Nate Jensen
|
4898a1f6e4
|
Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1
Former-commit-id: 9fa1b78e76 [formerly a709601e2f] [formerly 5cfbcb7e98] [formerly 9fa1b78e76 [formerly a709601e2f] [formerly 5cfbcb7e98] [formerly c43a2bf217 [formerly 5cfbcb7e98 [formerly 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e]]]]
Former-commit-id: c43a2bf217
Former-commit-id: b6ca990c01 [formerly 9804b35063] [formerly 20a4aa18d611a016b3c901eec7c91704211023af [formerly c1d092a55d]]
Former-commit-id: 694a56355e00a39a28d8d855cc619da8cff90f1e [formerly b4b684876a]
Former-commit-id: a49343ddbf
|
2014-05-29 13:51:09 -05:00 |
|
Brian Clements
|
92fabd54e5
|
Omaha #2536 merge autobldsrv into text plugins
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52
Former-commit-id: de85e00fde [formerly 4aade4bf2e] [formerly 5d0eaf02ab] [formerly de85e00fde [formerly 4aade4bf2e] [formerly 5d0eaf02ab] [formerly 542d36f107 [formerly 5d0eaf02ab [formerly 5ae9b617dfeb4ff809916706ac1e849f762bd5a2]]]]
Former-commit-id: 542d36f107
Former-commit-id: 9afd194e29 [formerly 5a52531828] [formerly e0f60e70ed8514edd19df07556eaaed606a69df4 [formerly fcadd3dae9]]
Former-commit-id: c65d61ba49fd3a54dac5fc9473888a9c3fe5cadc [formerly 7d841b655c]
Former-commit-id: fe7c15daa4
|
2014-05-29 08:19:47 -05:00 |
|
Steve Harris
|
86d6a0cd4d
|
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly dc74953978 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]
Former-commit-id: dc74953978
Former-commit-id: aa133cc8a3 [formerly 0e9d0b2ef5] [formerly b7d992179f759d29da9804b9ffcafec8048bcefa [formerly 713cfeffc7]]
Former-commit-id: 4b80090552f8712feaf5137c27c2f010cda148e2 [formerly 6412cc1427]
Former-commit-id: 5fda99b1fe
|
2014-05-28 09:01:00 -05:00 |
|
Greg Armendariz
|
b8c298cd30
|
Omaha #3215 - Correct script
Former-commit-id: c7f349d5a5 [formerly 9c26a31d27] [formerly ac528037a1] [formerly c7f349d5a5 [formerly 9c26a31d27] [formerly ac528037a1] [formerly 73765c31ca [formerly ac528037a1 [formerly 2565b4c918f9215fd65a5dc44778db3a200da8bf]]]]
Former-commit-id: 73765c31ca
Former-commit-id: 772f68bbe4 [formerly be8b2a480b] [formerly 256e740af4db40ebc9aee9703b37df6292a84fff [formerly c7040bce82]]
Former-commit-id: 51888b856816f07cc52eb276ede7075340f060c7 [formerly 6a487942e9]
Former-commit-id: f746096b52
|
2014-05-27 15:19:37 -05:00 |
|
Greg Armendariz
|
336be12f33
|
Omaha #3215 - Add option for RPM build,
Change-Id: Ic3a50f9a493c9cd7b92ac99aeb026d3d991f69a5
Former-commit-id: 45856116c0 [formerly 0806135d2e] [formerly 265a455ca1] [formerly 45856116c0 [formerly 0806135d2e] [formerly 265a455ca1] [formerly a2e157ed35 [formerly 265a455ca1 [formerly 615c83cb701e3c8ddf7cbcc1c1fb735711771d3b]]]]
Former-commit-id: a2e157ed35
Former-commit-id: 9301eb1844 [formerly db01c4b45e] [formerly 220403a4b2cfd4083d722e770928cca821f9a677 [formerly 81ca8ed4c6]]
Former-commit-id: 559db09b22e37642d03476bd447ec4aa342fe2ad [formerly bdbdfdaa7a]
Former-commit-id: 1a976cb67b
|
2014-05-27 14:56:33 -05:00 |
|
Steve Harris
|
cf2950abdb
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
|
2014-05-27 14:48:24 -04:00 |
|
Kenneth Sperow
|
1b837bed5d
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 30173aa114 [formerly 476c78a2d7] [formerly 189e3cc1f2] [formerly 30173aa114 [formerly 476c78a2d7] [formerly 189e3cc1f2] [formerly 342398e6a3 [formerly 189e3cc1f2 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]]]]
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f
Former-commit-id: 5e3a370777 [formerly 6f8b069dbe] [formerly 8490f7ea33] [formerly 5e3a370777 [formerly 6f8b069dbe] [formerly 8490f7ea33] [formerly 9fa9425aea [formerly 8490f7ea33 [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]]]
Former-commit-id: 9fa9425aea
Former-commit-id: 186b8987ed [formerly 7302462544] [formerly 32e40a5886b016193ab4c39a18d36a93d1143fdb [formerly 846395fd42]]
Former-commit-id: bd2d790b3e0fdcecb8c3759c0035a981ed6db7b1 [formerly 51b0b4e566]
Former-commit-id: 386365e3cb
|
2014-05-22 14:16:49 -07:00 |
|
Brad Gonzales
|
8a5466edce
|
Omaha #3156 Removed geronimo servlet 2.5 jar from dependencies.txt and added it to rpms/awips2.qpid/0.18/SOURCES/awips2/.
Change-Id: I92c8380cdabcb1d4a8ced7fb5ff7d5add0708d82
Former-commit-id: b0e8fea5d2 [formerly 7d84f97bf8] [formerly 165f9a6e45] [formerly b0e8fea5d2 [formerly 7d84f97bf8] [formerly 165f9a6e45] [formerly 1dd2a8bf65 [formerly 165f9a6e45 [formerly 71e43fad4acee381d7ffb7ca8ba0438283cd99f6]]]]
Former-commit-id: 1dd2a8bf65
Former-commit-id: 2fa3979515 [formerly 07aa2f5871] [formerly 401a4555f0e94cf5cdd822b453909e28bf5296ca [formerly de22cb1649]]
Former-commit-id: b56731f70caf18eb0566718839672c42ad09e9fe [formerly a3a02dcc3a]
Former-commit-id: 4599cb6e4a
|
2014-05-21 15:22:58 -05:00 |
|
Brian.Dyke
|
4671c25ea4
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly db68b80bbd [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]]
Former-commit-id: db68b80bbd
Former-commit-id: 5a07e9c984 [formerly 937b9bb9ce] [formerly 6fbbfc0267046011d5fd8ba4c15aa6b2ab182188 [formerly ebcaebb28d]]
Former-commit-id: 6e138f1746a6c0aa092e3c298cd91ece951e39d3 [formerly f42d40c3a3]
Former-commit-id: b0b377e811
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
0febfec9e7
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]]
Former-commit-id: d3fa10028c
Former-commit-id: a6b42a776b [formerly b0837b4905] [formerly 91d88625eae6852df94fbb04133d89826c605aad [formerly 68f3a0169e]]
Former-commit-id: c54c6441e46c95271889db670ff46e1bedce8459 [formerly f87775928f]
Former-commit-id: 1d53f6d304
|
2014-05-14 16:08:16 -04:00 |
|
Brian.Dyke
|
db6b79a08f
|
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
Former-commit-id: e705786d12 [formerly 5a2e0c7e1b] [formerly e95bc87a19] [formerly e705786d12 [formerly 5a2e0c7e1b] [formerly e95bc87a19] [formerly fb4c7e55b3 [formerly e95bc87a19 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: bdbb6ec0fe [formerly f9474b087e] [formerly adafd612a1e8c387205bf9a2e7dcfd2a03d117c9 [formerly 0311366ffb]]
Former-commit-id: 4d9e420076ab9a3d2cb731f4d97896138289b45b [formerly 3b7a2f1645]
Former-commit-id: 4cedfadd77
|
2014-05-13 11:23:55 -04:00 |
|
Steve Harris
|
24df80c520
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: ae2d525c8a [formerly 32f255cada] [formerly a8635bd2e1fdd0fe84e47c2435e9f0073d86e4e2 [formerly 233922471a]]
Former-commit-id: d12e1920a9ce76da64ae45fed23fe5b2ed9fa884 [formerly 74a325ce74]
Former-commit-id: 82045e2409
|
2014-05-12 16:13:19 -05:00 |
|
Ana Rivera
|
73dc79feda
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: 49512f29bf [formerly 7e74e047a0] [formerly 91715e7a3f] [formerly 49512f29bf [formerly 7e74e047a0] [formerly 91715e7a3f] [formerly 81a9d4fa44 [formerly 91715e7a3f [formerly e71ef5db23122405fc6aab71526a9cc3ec3ad823]]]]
Former-commit-id: 81a9d4fa44
Former-commit-id: 950ceec5ef [formerly e33c6e2d69] [formerly 895faa71ddb8f2d028597a09ba5b9d1586644e9d [formerly 88520fc206]]
Former-commit-id: 520cb0cff082dafca89cc471443ec0532a3e3db4 [formerly 8cb1bfc3b8]
Former-commit-id: 94ceb3698f
|
2014-05-12 18:55:06 +00:00 |
|
Brian.Dyke
|
9bc1055c87
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]]
Former-commit-id: 41ba5fc348
Former-commit-id: 4004b627e2 [formerly dc5bc1d2a4] [formerly 3193dce8b50276edb5c6e0829236339aa91b9172 [formerly 2f704c898d]]
Former-commit-id: 4b5ff1e5a8372daadb66b3b58132714ed0a54eae [formerly 82663c0ab6]
Former-commit-id: 464cc1a479
|
2014-05-12 14:07:11 -04:00 |
|
Brad Gonzales
|
a99d5df09c
|
Omaha #3013 added libgfortran and libf2c requires to the awips2-python-numpy rpm.
Change-Id: I3f232c800a7d2768b9b13b35703db97b83789a7b
Former-commit-id: 8e97465d95 [formerly c71a842639] [formerly 982503cb41] [formerly 8e97465d95 [formerly c71a842639] [formerly 982503cb41] [formerly abf6125958 [formerly 982503cb41 [formerly 632b2cad7a328dead678026c673b001be0657394]]]]
Former-commit-id: abf6125958
Former-commit-id: 3a34fa94b8 [formerly 9679fb32dc] [formerly 79273dd077c6b21e43dbd9cf0c4da9314a753fa8 [formerly b032306b52]]
Former-commit-id: 4547f30d3922992aca968e3ea968394b2fc9e2f6 [formerly 7e434f3ae1]
Former-commit-id: ce306f188b
|
2014-05-12 11:25:16 -05:00 |
|
Brian Clements
|
ef0386fca8
|
Omaha #3147 removed spring from groovy RPM component spec
Former-commit-id: b6155d5482 [formerly 9d67a6c30b] [formerly 3bb680802a] [formerly b6155d5482 [formerly 9d67a6c30b] [formerly 3bb680802a] [formerly b334038a28 [formerly 3bb680802a [formerly 979ff20d55cc86319805f77ec53f32cb39555eb3]]]]
Former-commit-id: b334038a28
Former-commit-id: 08eeff08a7 [formerly 6192ab51ae] [formerly fe9d492be607366f7a5a5fb0e82f5ed775491ae6 [formerly 3a48b2036e]]
Former-commit-id: cedd5ab3d5f65e59bc8f360bc38aa723cc7373c8 [formerly f989cbe948]
Former-commit-id: 2aa0a7ad2b
|
2014-05-09 10:31:28 -05:00 |
|
Brad Gonzales
|
c9b9ec51e6
|
Omaha #3032 updated jdk to java 1.7.0_55
Change-Id: If1bcb03386aec265196cf8133a3f1e6b34eb1fc8
Former-commit-id: 286cecb8fb [formerly ad464cc0da] [formerly 91f94499aa] [formerly 286cecb8fb [formerly ad464cc0da] [formerly 91f94499aa] [formerly 35f6a5ac25 [formerly 91f94499aa [formerly 49cc6d83ac5fffc3f737699ab605948fa38117db]]]]
Former-commit-id: 35f6a5ac25
Former-commit-id: 52c91e75c3 [formerly 6bee1ed107] [formerly e7c3a113c1cfa1b639f60e13f2a8eb263f952460 [formerly f7cf5741b0]]
Former-commit-id: f2f1e349e6cc685382977526ad1c0e3f6ffcc90f [formerly 617e84afa7]
Former-commit-id: 4e4ebd83a9
|
2014-05-08 16:15:42 -05:00 |
|
Steve Harris
|
96bd49cc22
|
Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1
Former-commit-id: bffbcf61b8 [formerly a7211a72f0] [formerly c3509757f0] [formerly bffbcf61b8 [formerly a7211a72f0] [formerly c3509757f0] [formerly 0392577b6c [formerly c3509757f0 [formerly 575adeb94784b32ac0d89e3c4dd506c2fe500266]]]]
Former-commit-id: 0392577b6c
Former-commit-id: d191cc2ebd [formerly 8c5eb7774e] [formerly 9abd56b89aacb0711cf15f70eebafb12f9e5773d [formerly 6694af2d5e]]
Former-commit-id: 9da9bed1e53505b39d613806127348e6f88a3c1d [formerly 7819c2878f]
Former-commit-id: ab4d7cc569
|
2014-05-07 08:45:41 -05:00 |
|
Richard Peter
|
cbae8323b0
|
Issue #3102: Fix edexBridge connection leak
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: 1a2d875bd0 [formerly 2668f09447] [formerly 501980904d] [formerly 1a2d875bd0 [formerly 2668f09447] [formerly 501980904d] [formerly b091a8827a [formerly 501980904d [formerly 79c52892667d34abb651a36f7f5bd89f4143ffff]]]]
Former-commit-id: b091a8827a
Former-commit-id: 6eb5a21ec6 [formerly 8f1b5b647d] [formerly bc0584123479bf5fdaccff51f63a759a58593715 [formerly d03c47719f]]
Former-commit-id: 4585aeb1c1c934aa634aa78cc7373e3e0048cbf4 [formerly 87c6348e61]
Former-commit-id: e555144511
|
2014-05-06 10:32:31 -05:00 |
|
Sathya.Sankarasubbu
|
37700e4c33
|
ASM #560 - LDM 6.11.5 GRIB library causing crash
Modified Release number in component.spce from 10 to 11
Change-Id: I2f011e472688fa63d605db5d715f1aef6589a966
Former-commit-id: faa48d1691 [formerly 23102eaa8f] [formerly edd543c48d] [formerly faa48d1691 [formerly 23102eaa8f] [formerly edd543c48d] [formerly 1246776d3e [formerly edd543c48d [formerly cdeb7f00af695c6d0a79958af23862bd6f3c7ee5]]]]
Former-commit-id: 1246776d3e
Former-commit-id: 1455e80f01 [formerly 386091eb78] [formerly 7b40259554ba6085fa43f8748c94f70a55a15233 [formerly 1309866bb8]]
Former-commit-id: afe5b2e47bd32538c4d8a480a2703d5dd2533ab7 [formerly 6268f58f94]
Former-commit-id: 47bb8dfc50
|
2014-05-05 14:33:20 -04:00 |
|
Steve Harris
|
55644af2ca
|
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: 010301045d [formerly 9e149df799] [formerly 6ef3b9f1e5] [formerly 010301045d [formerly 9e149df799] [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 4b54c0498e [formerly 927a87b126] [formerly b9b41ab717fa5a9d55725f89e087b2c62f5811fa [formerly b797b4b1fa]]
Former-commit-id: 66b0c211b5eee3caba67b313d56f7fda8fa60cc9 [formerly 17318b1870]
Former-commit-id: 4fe84ba0fd
|
2014-05-05 08:21:02 -05:00 |
|
Greg Armendariz
|
10a36c1f9d
|
Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
Former-commit-id: fece69eb09 [formerly 2994753636] [formerly 1e48076fb2] [formerly fece69eb09 [formerly 2994753636] [formerly 1e48076fb2] [formerly 58eaf444bd [formerly 1e48076fb2 [formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]]]
Former-commit-id: 58eaf444bd
Former-commit-id: 72793f2c24 [formerly 9f6eff005b] [formerly ac1328cf7911a36196114732a8d00e8c762670a8 [formerly e1d91769fe]]
Former-commit-id: 3e7b3d58ae5b3be3e7237d313288d9787261f317 [formerly 733b64a851]
Former-commit-id: 4066e1c518
|
2014-04-30 19:34:43 -05:00 |
|
Brian Clements
|
a4b4e7422b
|
Issue #3089 fixed init.d script for collaboration dataserver RPM
Former-commit-id: b3825b8032 [formerly e49d150332] [formerly 57f5ac701c] [formerly b3825b8032 [formerly e49d150332] [formerly 57f5ac701c] [formerly 1273846844 [formerly 57f5ac701c [formerly 9cdef44104a7453a4b968afd1f3845b1ba69ba06]]]]
Former-commit-id: 1273846844
Former-commit-id: fc004a1db8 [formerly 9fc8796247] [formerly dfe08f3eccdfa7204ab4aa439b2e37da97873ec7 [formerly a074b27951]]
Former-commit-id: ac85044bf4c6fe01113c5248446893c4e42fe06b [formerly d1c9dbcc28]
Former-commit-id: 170d78b62b
|
2014-04-30 16:41:14 -05:00 |
|
Greg Armendariz
|
12b9229488
|
Issue #2571 - Update maps.db snapshot and lake shapefile
Former-commit-id: 239ce27244 [formerly 4c245da2a2] [formerly 4981b6a438] [formerly 239ce27244 [formerly 4c245da2a2] [formerly 4981b6a438] [formerly 2d38c69ac1 [formerly 4981b6a438 [formerly c223bac540568492253cf70a7c7d7521eda3a62d]]]]
Former-commit-id: 2d38c69ac1
Former-commit-id: b069ee1ea3 [formerly 94a55e5c31] [formerly 9e10990e64fcefc2ae835d7e6bae34e0905df35d [formerly 784235ab9f]]
Former-commit-id: ba6055d54db48a1a72242f8bdaf2f1b74a5a8483 [formerly 2cd476cc62]
Former-commit-id: e9ba949734
|
2014-04-30 15:42:42 -05:00 |
|
Richard Peter
|
e748b7c1e5
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
19b4bb7dcc
|
Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
|
2014-04-25 11:06:11 -04:00 |
|
Richard Peter
|
4b7ab25bbe
|
Merge "Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data." into development
Former-commit-id: b77f780b13 [formerly c0656c811d] [formerly b53d914640] [formerly b77f780b13 [formerly c0656c811d] [formerly b53d914640] [formerly a21a2bafe1 [formerly b53d914640 [formerly 45f01ee4e8bc0597c1fe55e1dbde7223f3dcc30d]]]]
Former-commit-id: a21a2bafe1
Former-commit-id: a0f425fe91 [formerly 608b342707] [formerly ee378d853649aba6df5e619b61b93f4fe55d590e [formerly d08c051727]]
Former-commit-id: 921179ad6d09f3e6409dbcf7400e3facd07763db [formerly d71cbdb5f9]
Former-commit-id: 547d2f5333
|
2014-04-24 15:43:15 -05:00 |
|
Brad Gonzales
|
78b13f0ead
|
Issue #3035 Increment java component.spec revision value.
Change-Id: I869e6f6adab74ef97d45a057fe42e48d1134dfbf
Former-commit-id: 6b41668093 [formerly 86036c0afb] [formerly 15985b9eac] [formerly 6b41668093 [formerly 86036c0afb] [formerly 15985b9eac] [formerly 7a0694adca [formerly 15985b9eac [formerly 245c5214910e1a69d1a6de4b46a36130dbd253b4]]]]
Former-commit-id: 7a0694adca
Former-commit-id: 7c1b5b5893 [formerly f9b04639a4] [formerly 8652fe2bf8054c087b7cef1ac2839772b6556ea6 [formerly 5fa1165519]]
Former-commit-id: 1a1724100a6c96d74868531c1bd3954b6072d33f [formerly d35d7c0b5e]
Former-commit-id: 036fbb9cf7
|
2014-04-24 12:48:40 -05:00 |
|
David Gillingham
|
06ad7d1968
|
Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data.
Change-Id: I750323b3330016a98eef9778e8491ac920ea77ec
Former-commit-id: 0566286204 [formerly 6186e67e5c] [formerly eea20ba3ef] [formerly 0566286204 [formerly 6186e67e5c] [formerly eea20ba3ef] [formerly 16adfb2573 [formerly eea20ba3ef [formerly 0b91ae192358aa162833fb332ba4e551878199f9]]]]
Former-commit-id: 16adfb2573
Former-commit-id: 0cbcdd8519 [formerly 123bd80fa9] [formerly 2e2cf73a5ee2285806fb961bd9f68a867233523e [formerly 9f27fa7562]]
Former-commit-id: e5674b6e1bb73e3444a4d85032d8fda52d364b9f [formerly aaa1340f81]
Former-commit-id: 99b4c52d36
|
2014-04-24 11:11:06 -05:00 |
|
Brad Gonzales
|
f149cab30e
|
Issue #3024 Removed edex feature build.xml files. Removed bkowal from the buildEnvironment.sh script.
Change-Id: Ic1ee22e604a68c2c475cb002901413c55bda6bd1
Former-commit-id: 9c6f68a56f [formerly 5957c45cea] [formerly fdfac581d6] [formerly 9c6f68a56f [formerly 5957c45cea] [formerly fdfac581d6] [formerly 1fcffc5db8 [formerly fdfac581d6 [formerly fdf7e47c2ddcfe4154ee117a0b5a722cd420df20]]]]
Former-commit-id: 1fcffc5db8
Former-commit-id: 26b95f945e [formerly c11506a0c9] [formerly 86a837c9ba02a232e781433a5fdcf46bfeb6af6d [formerly 679a623d87]]
Former-commit-id: 6e902fcd67eea53404b5aed28b2891e7daea7551 [formerly da2d3c0fe9]
Former-commit-id: 4e5664e0a2
|
2014-04-22 15:39:08 -05:00 |
|
Brad Gonzales
|
c945c549e0
|
Issue #3035 Removed jrockit missioncontrol from awips2 java rpm build.
Change-Id: I558e0f080b46c76cbdfb759ef1c1a701925273ca
Former-commit-id: ed82a7f477 [formerly 3a3e0be7a4] [formerly 90c7e699fa] [formerly ed82a7f477 [formerly 3a3e0be7a4] [formerly 90c7e699fa] [formerly 4c21afaa1b [formerly 90c7e699fa [formerly 254c7e0298ba7fb3ad91af2d51a1bd41b0535631]]]]
Former-commit-id: 4c21afaa1b
Former-commit-id: dd469cc103 [formerly 258ddf9036] [formerly 44e44ccc27afeb322968ac9c4d880dc5c0ee5207 [formerly 17ac32a672]]
Former-commit-id: c107369d06cae6babf5552c5a31602cd293d8f07 [formerly 55e11bf157]
Former-commit-id: 3fb2ac5ee2
|
2014-04-22 12:23:15 -05:00 |
|
Brian.Dyke
|
d2d085aa39
|
Merged 13.5.5-1 into 1412
Former-commit-id: 9075808d0a [formerly 65ad515a6e] [formerly 188d84cc87] [formerly 9075808d0a [formerly 65ad515a6e] [formerly 188d84cc87] [formerly 35ad867281 [formerly 188d84cc87 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]]]
Former-commit-id: 35ad867281
Former-commit-id: 4808bb32bb [formerly c0266e8988] [formerly 8837283d998164da174b3d8f18d42dbebeeb1257 [formerly 72618c4214]]
Former-commit-id: 856567af7814ca29ea4e90337f3ec6c13981ce04 [formerly 737283b94a]
Former-commit-id: 73efa466f9
|
2014-04-16 12:09:12 -04:00 |
|
Nate Jensen
|
4d5d6f8f16
|
Merge "Issue #2984 another attempt to fix build" into development
Former-commit-id: 8a1e3a9bef [formerly 7f56e20c03] [formerly 5424ffb850] [formerly 8a1e3a9bef [formerly 7f56e20c03] [formerly 5424ffb850] [formerly 26b20a770a [formerly 5424ffb850 [formerly 00ab3a620f85859976144f9cdddd52f4bc46c063]]]]
Former-commit-id: 26b20a770a
Former-commit-id: b63c42673f [formerly 0c82511428] [formerly 74e82875616825eaf646c27a93474963262f4aed [formerly cf3e9e9020]]
Former-commit-id: 13c36f6664a1f7ee9c7010895e5ea62e71775f93 [formerly 146d8259db]
Former-commit-id: 9621b9f8bf
|
2014-04-15 13:27:29 -05:00 |
|
Nate Jensen
|
7b1ac642f8
|
Issue #2984 another attempt to fix build
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb
Former-commit-id: fc8be532a1 [formerly cb406ef865] [formerly a2354a1d2a] [formerly fc8be532a1 [formerly cb406ef865] [formerly a2354a1d2a] [formerly 09305d263e [formerly a2354a1d2a [formerly 38195dc5de31cefd435f507a3aa9f7f60965c0ff]]]]
Former-commit-id: 09305d263e
Former-commit-id: f0ea970f51 [formerly 3186527f18] [formerly c383e23eae82fa10b3e1724bbc784d32fdfd1fee [formerly 60b8b6e4ad]]
Former-commit-id: 0ab807d694e5f70061683480aefc8ac501db90ab [formerly 529939f3d3]
Former-commit-id: eb9fba0305
|
2014-04-15 13:16:17 -05:00 |
|
Richard Peter
|
c37f234cb0
|
Issue #2726: Fix context mappings for topics
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f
Former-commit-id: bb04dd7885 [formerly f533275291] [formerly ecbd0d5720] [formerly bb04dd7885 [formerly f533275291] [formerly ecbd0d5720] [formerly 4ac996336e [formerly ecbd0d5720 [formerly b3d978d0e22b371eaa826d856156ba5360ee7be9]]]]
Former-commit-id: 4ac996336e
Former-commit-id: c54607083f [formerly d40449dae9] [formerly 39575ca8f26452d9d3cfc245c888d649d3dd6f86 [formerly 35b8b8bc15]]
Former-commit-id: f983f06d0cbe33c9d1879ab4b7133d99f068533d [formerly 100a0d3bbd]
Former-commit-id: c4edd6fd84
|
2014-04-15 12:49:15 -05:00 |
|
Richard Peter
|
47cfb79a36
|
Issue #2726: Fix edex_camel to wait for process to finish on stop, add logging of service calls to log files.
Change-Id: Ie1e8fce80e7e06b294e01deaf9174a6fb7180d5d
Former-commit-id: 63c484cf14 [formerly 45e6301b91] [formerly 4709e66b34] [formerly 63c484cf14 [formerly 45e6301b91] [formerly 4709e66b34] [formerly fa25d55384 [formerly 4709e66b34 [formerly dc798a7ca6badfcd6d732b43bb3e0175770398be]]]]
Former-commit-id: fa25d55384
Former-commit-id: a0c08e67ea [formerly 7e3e0fb984] [formerly 85a7299b471586523b314346c141f900d516f459 [formerly fa5c0f71ad]]
Former-commit-id: 19bc4fe78d6b4e9b55f97726a5c86ede5865c5b3 [formerly 4ed2eb3b03]
Former-commit-id: 64c9dbb764
|
2014-04-15 11:50:28 -05:00 |
|
Nate Jensen
|
e7c0adcec7
|
Issue #2984 attempt to fix build
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d
Former-commit-id: f39f61518f [formerly ce585ca9e4] [formerly 4aaa7c7096] [formerly f39f61518f [formerly ce585ca9e4] [formerly 4aaa7c7096] [formerly 456359ab1a [formerly 4aaa7c7096 [formerly 60dc6b2552cc2108f9c5c0bc25eae4a1829b62f9]]]]
Former-commit-id: 456359ab1a
Former-commit-id: e91352d8a8 [formerly 0177329d67] [formerly e7f43a47947a927cf841070a7c70e8a56b5e3f62 [formerly f6b3c3c05f]]
Former-commit-id: b961f3c4a6052627f06cb10b2b1510dca127b34c [formerly c5ad3ae2a2]
Former-commit-id: 24e970b87a
|
2014-04-15 09:57:11 -05:00 |
|