Dustin Johnson
f612144af5
Merge "Issue #1802 Implemented ebxml registry replication" into development
...
Former-commit-id: 7adacb156f20ee731e624276b4efa17adacb156f20ee731e624276b4efa152095664e04276b4efa152095664e0c4c9410c7c7268795739fdf0f29feba66aceef23e5c79edc53
2013-04-15 12:42:23 -05:00
Bryan Kowal
b36387d51a
Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
...
Former-commit-id: 52f1aa5fda0800c14061cca3f4373652f1aa5fda0800c14061cca3f43736c797715efecca3f43736c797715efe763c9b7ca18e27924557671e600a62fa59505e287db0542069
2013-04-15 09:40:43 -05:00
Benjamin Phillippe
3733212782
Issue #1802 Implemented ebxml registry replication
...
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531
Former-commit-id: fa6cdf46dbe3f3483b51120906de78fa6cdf46dbe3f3483b51120906de78ec69cdeb44120906de78ec69cdeb440a930ce83ce5fbf006ddc0099a8a39d9b5511b8b1967c632e5
2013-04-12 11:27:45 -05:00
Nate Jensen
55bd1ec462
Merge "Issue #1871 convert parameters to Strings and make sure to return them" into development
...
Former-commit-id: 5d1ac5311300f75a3063e8218d0e3c5d1ac5311300f75a3063e8218d0e3cfe163c5c16e8218d0e3cfe163c5c16f9f1f8f90b0c1f005323e6a24551af0b2851bb053d50900ab3
2013-04-12 09:31:52 -05:00
Matt Nash
9044f422ba
Issue #1871 convert parameters to Strings and make sure to return them
...
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7
Former-commit-id: 6f12e80c0d64323fc0afcd77308fac6f12e80c0d64323fc0afcd77308fac6c488cee05cd77308fac6c488cee056e4cdda3234ee6085bda7dd72ab7d56969b0c0ae63a13ef503
2013-04-12 09:31:23 -05:00
Matt Nash
eb17cb0e94
Issue #1871 add default values for times so they don't need to be sent in from
...
Python, move getLatLonCoords()
Change-Id: Ic37728e269a9899adaf8be1c6d86cd644f417ba1
Former-commit-id: 01e9ab8a062ab1cf8abb3af61d711701e9ab8a062ab1cf8abb3af61d7117b44ee446643af61d7117b44ee446646a755f6a4be6fc7942b8c95e825d357b25f73a9adc0f234f02
2013-04-12 09:31:16 -05:00
Matt Nash
4de612db14
Issue #1871 make Java data access class better match Python version
...
Change-Id: Ic3ab7e771add58a693420a16a349e8208852a051
Former-commit-id: 9ed1c330a6baafdafed768c84fd8cc9ed1c330a6baafdafed768c84fd8cc4ac6480f5268c84fd8cc4ac6480f52eccbf5b9aa705be14b647ffd8efcf2af190ad2787f52894c51
2013-04-12 09:31:07 -05:00
Nate Jensen
2194f0341f
Merge "Issue #1870 implement PathManager interface in Python to allow Python code to get files" into development
...
Former-commit-id: 304be5221b03fac8cb0636ad161721304be5221b03fac8cb0636ad1617218561b201d536ad1617218561b201d56adb90b87f12d4837e78826e64a9907c22745ac06a16f63002
2013-04-12 09:30:38 -05:00
Matt Nash
0985877ac1
Issue #1870 implement PathManager interface in Python to allow Python code to
...
get files
Change-Id: I0192c996533b1539194aaeba0213074bef8a4717
Former-commit-id: 054c9afeed68892951c5bf01f50e17054c9afeed68892951c5bf01f50e174b23ec7c0abf01f50e174b23ec7c0a6f32d989c4123351e82bcaf1f1fdf7d6feca69b4b6d567fd72
2013-04-12 07:55:56 -05:00
Dustin Johnson
2f83476702
Merge "Issue #1891 Fix sorting in pending subscription table" into development
...
Former-commit-id: 9c1ad200a71aec1ca6cd355e654c1e9c1ad200a71aec1ca6cd355e654c1ed117a40e7c355e654c1ed117a40e7c463df283089b1a6c153cd149e5148466136037bbc72a44eb9e
2013-04-10 14:50:14 -05:00
Dustin Johnson
b4f0296480
Issue #1891 Fix sorting in pending subscription table
...
Amend: Rename getRowData() to getDisplayData()
Change-Id: Icc433f289d87273524468d0cf4e1bc799df134aa
Former-commit-id: ae7952ce648b6a9551a1d9544f3b73ae7952ce648b6a9551a1d9544f3b7336cdd94a65d9544f3b7336cdd94a6504eb46f448a4519615abf7505eefc26ee0d474f8919fda0e8c
2013-04-10 14:04:55 -05:00
Max Schenkelberg
872981ef0a
Issue #1638 Added cache of PluginDao objects in PluginFactory so they can safely cache data internally by not being recreated every store operation. Added default names to sample actions
...
Amend: Create copy on write for PluginFactory
Change-Id: I5373d1efadc1ab3c5e368a3caae55a5ff85a2d6f
Former-commit-id: cc26fc686f1bec335fd76e70b21f5fcc26fc686f1bec335fd76e70b21f5fb695de36986e70b21f5fb695de3698abb23e3ee8e369546b51f2a0f8223a0b2fed1f34f1617ea662
2013-04-10 10:04:17 -05:00
Dustin Johnson
ccc7e55122
Issue #1841 Update delta script for renaming PendingSubscription to PendingUserSubscription.
...
Change-Id: Ie1e485a5b8f5bce3032806fe3b0f4e78d46f93e6
Former-commit-id: 82f815752c7616bb80aabba356326582f815752c7616bb80aabba3563265ce96090763bba3563265ce9609076307176c47528c5d379b7208a08803fe0857b2766c1a743b6d9a
2013-04-09 11:43:53 -05:00
Dustin Johnson
511111545c
Issue #1826 Remove delivery/notify options for subscriptions
...
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509
Former-commit-id: ba51d9a911f3526508f311fd2d676bba51d9a911f3526508f311fd2d676b6bc69df12711fd2d676b6bc69df127a93be0ad070578916ec1b78f56f1cab61292ce4d60e910e3d3
2013-04-09 11:40:25 -05:00
Dustin Johnson
e7301e95c9
Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions.
...
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.
Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf
Former-commit-id: 3a6d9209dfcef805e79a61346b13883a6d9209dfcef805e79a61346b1388f3bdede2c861346b1388f3bdede2c873a8bb7a024b4eb8e4068c52cd190ffefc0dca3b5958178516
2013-04-05 12:41:02 -05:00
Bryan Kowal
4accd3bbd4
Issue #1805 - restore the full nightly delta build.
...
Former-commit-id: 84742433601ebf50c7ed52be309cac84742433601ebf50c7ed52be309cacdc522ede4452be309cacdc522ede44a5d79669d7607d5b205d04e22df174c97dccb62dce1f23692e
2013-04-04 16:16:53 -05:00
Greg Armendariz
db25658b91
Merge "Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE" into development
...
Former-commit-id: 88a6a8abb36e0ced27dcd6d0e0131f88a6a8abb36e0ced27dcd6d0e0131f71d400e09fd6d0e0131f71d400e09ff0957645adf452a4582ad463555ca3d176c441e7df0146764b
2013-04-04 13:00:39 -05:00
Bryan Kowal
a800e56338
Issue #1864 - datadelivery and kml are now dependent on the core viz feature.
...
Former-commit-id: c5afa1883b70c8ed6bc03fac666de5c5afa1883b70c8ed6bc03fac666de564c54f21103fac666de564c54f2110b4e684ad086a6615809749ee55327ddda6a904edcc94b29199
2013-04-04 12:48:59 -05:00
Steve Harris
1eecca8712
Merge branch 'omaha_13.4.1' into development
...
Former-commit-id: d331abc9118b5b1d286b56410d2a04d331abc9118b5b1d286b56410d2a04731ed52cd656410d2a04731ed52cd64fc654dbf8a400879732a419f72b2d7c3bfa901b2dad0ec07e
2013-04-04 12:01:23 -05:00
Steve Harris
084125dd3c
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 4dfea33cdd9879b94de98b607f82284dfea33cdd9879b94de98b607f82285c9a6b83cc8b607f82285c9a6b83ccbbfc0f76ef0f53c46d7aed8c0487fe7eda24c3b0a7b174bfaf
2013-04-04 11:58:50 -05:00
Steve Harris
370fe32515
Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1
...
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.product.awips/awips.product
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.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/gui/WarngenUIManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: 55655fdab93487a41532ea34b1db1e55655fdab93487a41532ea34b1db1ed98a119f4dea34b1db1ed98a119f4d1a2b88cd383ea89862c01a91fd82fff0918ec8ade0eda90af4
2013-04-04 11:12:22 -05:00
Bryan Kowal
d60c0c39e1
Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
...
Change-Id: I4d5a152dd44cd0a80405e04ce18d40e820bd06e6
Former-commit-id: a8fe170b53c44865106503a2e82b77a8fe170b53c44865106503a2e82b778d3c98eb5d03a2e82b778d3c98eb5d64dbc18c8e12e9b9d75b5816ddaf77bd47c627896032a8dd0c
2013-04-03 18:27:10 -05:00
Nate Jensen
0a621e8228
Merge "Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned. Change reviewer comments." into development
...
Former-commit-id: 59f084426cf43ac8bbc379a9d7691559f084426cf43ac8bbc379a9d7691573d86e892679a9d7691573d86e892691c6521d10e74f83d83ac87d157cbd5be8ef079eb151421989
2013-04-03 17:28:49 -05:00
Steve Harris
dd878fe749
13.2.1-21 baseline
...
Former-commit-id: 50106822eaa86d44584dd4358b93dc50106822eaa86d44584dd4358b93dc33bd359cfed4358b93dc33bd359cfe688327d3145c029bc4ac18d6fa4f4deb5258f0433d1d0a6a9c
2013-04-03 18:08:41 -04:00
Steve Harris
54f2f2b94a
13.2.1-20 baseline
...
Former-commit-id: 3aa43b1b0dad663b925c6a55bc5dff3aa43b1b0dad663b925c6a55bc5dff539faf0a716a55bc5dff539faf0a713be498b2fcb06237304812d4316b3a9c51f2d15ffbddfb5a25
2013-04-03 18:05:39 -04:00
Steve Harris
114eec390d
Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
...
Former-commit-id: 77c0dd0b552bc12f7a230f000f448577c0dd0b552bc12f7a230f000f4485327d05f3b50f000f4485327d05f3b5b2de6fd4c10342b648b6c7b9690456f22108c973dc0baf57ba
2013-04-03 15:52:19 -05:00
Ron Anderson
6ed11bbc88
Merge "Issue #1855 fix python threading in GFE procedures and smart tools" into omaha_13.3.1
...
Former-commit-id: 492587b91cb880af3c48de856db77a492587b91cb880af3c48de856db77ac82968c1e6de856db77ac82968c1e60acc778948a633b96fdf237e414b5dfb76bf6d49e5252cf3a4
2013-04-03 15:25:52 -05:00
Richard Peter
f03594dc87
Merge "Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode." into omaha_13.3.1
...
Former-commit-id: 7d2b8a7576920ba0628cd282a49b6f7d2b8a7576920ba0628cd282a49b6f6d73e25290d282a49b6f6d73e25290dcc6ca72028ac6ae353964dc5c4d230548ee285d75a2845464
2013-04-03 15:14:17 -05:00
Richard Peter
3215738fd4
Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1
...
Former-commit-id: f0450ff6f2dd527a4ef2cbbd9ab90df0450ff6f2dd527a4ef2cbbd9ab90dcfcacd20e9cbbd9ab90dcfcacd20e9bddc4b1bdfd973d8351958908a0fd7d2dd57fee4aca16ca6f9
2013-04-03 15:13:26 -05:00
Steve Harris
0cd73a41a1
13.3.1-18 baseline
...
Former-commit-id: e621424fcbf3e79bcc9da2b098d86de621424fcbf3e79bcc9da2b098d86dce6a06a7e3a2b098d86dce6a06a7e3a196ebc11b0edd049e3bbf6c3b6762044912d48bfc009792e3
2013-04-03 14:58:29 -05:00
Nate Jensen
cf069478fe
Issue #1855 fix python threading in GFE procedures and smart tools
...
Change-Id: I6420338991c1961ce63ff944b516925f83a12994
Former-commit-id: 52e83d902b5c830c3c9ce3462292ab52e83d902b5c830c3c9ce3462292abfe24e34163e3462292abfe24e3416362eb52e2951c6643e7dee18e798a9401b25904adf0abb60a1b
2013-04-03 14:33:24 -05:00
Lee Venable
13754c533c
Merge "Issue #1858 Handled creating a follow up when initial was created before 0z but issued after." into omaha_13.3.1
...
Former-commit-id: bd785bf5a4c8549e67d640b8ecf27dbd785bf5a4c8549e67d640b8ecf27dff910d99fc40b8ecf27dff910d99fc49fc55ce033d129d452636a15b3be15b0fb8eeaf542dfcaf9b
2013-04-03 14:14:41 -05:00
Nate Jensen
5a88c9820b
Merge "Issue #1562 max's fix for topo with custom colormaps" into omaha_13.3.1
...
Former-commit-id: 3334d9b065a109ec4601dbbad421db3334d9b065a109ec4601dbbad421db1bc148b468dbbad421db1bc148b4680a783718a92d4dc636ceec8cdfd8f0ab51de7da52c6e995faf
2013-04-03 14:13:14 -05:00
Nate Jensen
fc40cab9bc
Issue #1562 max's fix for topo with custom colormaps
...
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e
Former-commit-id: 869f5498f6d64e0a2a39057a929903869f5498f6d64e0a2a39057a9299036c711f037c057a9299036c711f037c10b70e42226ca17c5a2a616612e550fb5bce6afe0e25d15232
2013-04-03 14:10:53 -05:00
Bryan Kowal
aab5a08bdb
Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
...
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment
Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc
Former-commit-id: 981638c532d1663ea98be788c7b471981638c532d1663ea98be788c7b471ee8c99ef6ee788c7b471ee8c99ef6eea6a9687f7b60bea920c344237d9ee962755143e1aa28394c4
2013-04-03 14:03:54 -05:00
Bryan Kowal
d62b0d3d5f
Issue #1661 - yajsw will now log to both the console and log file indefinitely
...
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm
Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0
Former-commit-id: 2dbabffbe5ad523b9cee939ff752e82dbabffbe5ad523b9cee939ff752e842ab5f4244939ff752e842ab5f4244e618c4833f93cd16508c4fe7bace99e709933a4f6ab8e23421
2013-04-03 14:03:18 -05:00
Ron Anderson
8a2c181df6
Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter
...
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59
Former-commit-id: 3e61a8050834c8aad5593a3cdcbf463e61a8050834c8aad5593a3cdcbf46b703b4779e3a3cdcbf46b703b4779ea0c34f17500d57a752dc065ba613892222201f433be7ce8bab
2013-04-03 14:01:18 -05:00
Roger Ferrel
89be749f8d
Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
...
Change reviewer comments.
Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d
Former-commit-id: e87e4c869df8d1a13c3854cbf656e9e87e4c869df8d1a13c3854cbf656e9d2aae617b254cbf656e9d2aae617b23248f4bcf22b4b10d6437b829a2fecad658b46bf2cad51c18f
2013-04-03 12:48:18 -05:00
Jonathan Sanchez
7a7a1b7ea0
Issue #1858 Handled creating a follow up when initial was created before
...
0z but issued after.
Former-commit-id: 262f2808219b547cab989c322bf4b7262f2808219b547cab989c322bf4b7799b8c57ef9c322bf4b7799b8c57ef689334d2e17ca110890abd25782b7a30a728e6416f25295c90
2013-04-03 11:43:59 -05:00
Ben Steffensmeier
9239e64c15
Issue #1824 Fix Tile Geometry creation.
...
Former-commit-id: f8db56c0affe561d7af0fedbc28588f8db56c0affe561d7af0fedbc28588cfcc33cd7bfedbc28588cfcc33cd7bf2915807a0e0bbe368be58d81f655615be152be1eb98e23be1
2013-04-03 10:59:11 -05:00
Lee Venable
a32d254419
Merge "Issue #1731 - fix problem with dmd updating." into omaha_13.3.1
...
Former-commit-id: 15c707ac5048433d4d370693b0255615c707ac5048433d4d370693b025567bdf9c31150693b025567bdf9c3115503ac4a1c9f254b070ebea855823472912d66b16d5a12212d9
2013-04-02 17:46:48 -05:00
Mike Duff
0f8a831c01
Issue #1731 - fix problem with dmd updating.
...
Change-Id: I1f3eb576cf26a42195ca9c4cadfbeaeb77394af6
Former-commit-id: 335b85ea48c3ab8259d564cdb3c7fd335b85ea48c3ab8259d564cdb3c7fd23c808540264cdb3c7fd23c8085402a932186e2fbb14757eed3f2f0937ce5298fb6633aef1bc779f
2013-04-02 16:22:23 -05:00
Greg Armendariz
2b710f3540
Issue #1782 - Restoring #1813 & #1478
...
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d
Former-commit-id: b8e7d3644cf1776b887de5408c3807b8e7d3644cf1776b887de5408c380754f56fde29e5408c380754f56fde292bfe8fccfde3cf306ce402e79dfe8a9ca713f588e389a3bf6a
2013-04-02 15:00:26 -05:00
Nate Jensen
b65824a812
Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
...
Former-commit-id: cb6cd91f06ab28523a09f57358cff8cb6cd91f06ab28523a09f57358cff88f9ec8dd2cf57358cff88f9ec8dd2cc82a67f3781ad5bb1a52374eed35b3d1f53fb57ee0cb68cc06
2013-04-02 14:29:15 -05:00
Bryan Kowal
a3a009e375
Issue #1850 - the ebxml schema will now be created within the metadata database
...
Former-commit-id: 3d13334576d6e3d521268d63244b4e3d13334576d6e3d521268d63244b4e2dbd62e9ce8d63244b4e2dbd62e9ce55b84c59c6a57a457c79b31ade077094b01918433f9bcfe936
2013-04-02 10:49:46 -05:00
Dustin Johnson
b6c2c0194c
Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
...
Amend:
Use TimeUtil.newGmtCalendar() and remove whitespace only change
Add TODO for point data types.
Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3
Former-commit-id: 5b7fcb1ce248a2002e68c981b7250f5b7fcb1ce248a2002e68c981b7250f6129d86be4c981b7250f6129d86be4c42ca22867644ed2396ddd8f4d845415ed8a6f58e57b8314d8
2013-04-01 15:35:51 -05:00
Max Schenkelberg
bb8e2cf3e1
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
...
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Former-commit-id: a59484e2329d032f3e84b32fbad9c8a59484e2329d032f3e84b32fbad9c8547190329bb32fbad9c8547190329b984e67acdaba262e2bc5635388a7ad80b0f7c159ee60a2a80c
2013-04-01 12:41:50 -05:00
Lee Venable
e77b20af5d
Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
...
Former-commit-id: 6109daf744e9940408874a8c4b64df6109daf744e9940408874a8c4b64dff1e8faf9ff4a8c4b64dff1e8faf9ff7e4696f58258c83b966235d27f89f1e66a72fbedca38aca6df
2013-04-01 12:26:23 -05:00
Steve Harris
6a3f6359d6
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
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/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 5ec1c01d3a736bb45741140765a43e5ec1c01d3a736bb45741140765a43e437a04011a140765a43e437a04011a47c7f66f2b7b27767d7e0b48e96314d0e61c59e8ac6704c7e9
2013-04-01 12:19:04 -05:00
Steve Harris
4dc4b40b9f
Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
...
Conflicts:
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Former-commit-id: d2d91959253b722f107674a47b9bd9d2d91959253b722f107674a47b9bd914c9de225974a47b9bd914c9de225912055591eaf85a1ab9aba6dd28cc820fee31b1a8e74f4ae39e
2013-04-01 12:15:04 -05:00
