xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2408 commits 31 branches 40 tags 3.8 GiB
Commit graph

2408 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Nash
4ee6085bda Issue #1871 convert parameters to Strings and make sure to return them 
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7

Former-commit-id: 64323fc0af [formerly cd77308fac] [formerly 6c488cee05 [formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]
Former-commit-id: 6c488cee05
Former-commit-id: 7dd72ab7d5
 2013-04-12 09:31:23 -05:00
Matt Nash
e6fc7942b8 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: 2ab1cf8abb [formerly 3af61d7117] [formerly b44ee44664 [formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]
Former-commit-id: b44ee44664
Former-commit-id: c95e825d35
 2013-04-12 09:31:16 -05:00
Matt Nash
705be14b64 Issue #1871 make Java data access class better match Python version 
Change-Id: Ic3ab7e771add58a693420a16a349e8208852a051

Former-commit-id: baafdafed7 [formerly 68c84fd8cc] [formerly 4ac6480f52 [formerly 21a59e4f9ab0e5a870b764259a1a0fc102f3b86f]]
Former-commit-id: 4ac6480f52
Former-commit-id: 7ffd8efcf2
 2013-04-12 09:31:07 -05:00
Nate Jensen
12d4837e78 Merge "Issue #1870 implement PathManager interface in Python to allow Python code to get files" into development 
Former-commit-id: 03fac8cb06 [formerly 36ad161721] [formerly 8561b201d5 [formerly f4c7a9294f6218b40e582ba5e5dc8faacf52436e]]
Former-commit-id: 8561b201d5
Former-commit-id: 826e64a990
 2013-04-12 09:30:38 -05:00
Matt Nash
123351e82b Issue #1870 implement PathManager interface in Python to allow Python code to 
get files

Change-Id: I0192c996533b1539194aaeba0213074bef8a4717

Former-commit-id: 68892951c5 [formerly bf01f50e17] [formerly 4b23ec7c0a [formerly e3df8efa51ad95c952318b59edca702157a59856]]
Former-commit-id: 4b23ec7c0a
Former-commit-id: caf1f1fdf7
 2013-04-12 07:55:56 -05:00
Dustin Johnson
9b1a6c153c Merge "Issue #1891 Fix sorting in pending subscription table" into development 
Former-commit-id: 1aec1ca6cd [formerly 355e654c1e] [formerly d117a40e7c [formerly f1360b8ef80c343ad16b2345c500ea48c17ba209]]
Former-commit-id: d117a40e7c
Former-commit-id: d149e51484
 2013-04-10 14:50:14 -05:00
Dustin Johnson
a4519615ab Issue #1891 Fix sorting in pending subscription table 
Amend:  Rename getRowData() to getDisplayData()

Change-Id: Icc433f289d87273524468d0cf4e1bc799df134aa

Former-commit-id: 8b6a9551a1 [formerly d9544f3b73] [formerly 36cdd94a65 [formerly b37624ebadc626e3dc30f669881d0b7bb87a7c45]]
Former-commit-id: 36cdd94a65
Former-commit-id: f7505eefc2
 2013-04-10 14:04:55 -05:00
Max Schenkelberg
e369546b51 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: 1bec335fd7 [formerly 6e70b21f5f] [formerly b695de3698 [formerly 4249c63fb4ee62862cb9bbaa36d47607ba6784e8]]
Former-commit-id: b695de3698
Former-commit-id: f2a0f8223a
 2013-04-10 10:04:17 -05:00
Dustin Johnson
8c5d379b72 Issue #1841 Update delta script for renaming PendingSubscription to PendingUserSubscription. 
Change-Id: Ie1e485a5b8f5bce3032806fe3b0f4e78d46f93e6

Former-commit-id: 7616bb80aa [formerly bba3563265] [formerly ce96090763 [formerly d2a1704aa98f03086f7a07e416aa6aaea1d36121]]
Former-commit-id: ce96090763
Former-commit-id: 08a08803fe
 2013-04-09 11:43:53 -05:00
Dustin Johnson
0578916ec1 Issue #1826 Remove delivery/notify options for subscriptions 
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509

Former-commit-id: f3526508f3 [formerly 11fd2d676b] [formerly 6bc69df127 [formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]
Former-commit-id: 6bc69df127
Former-commit-id: b78f56f1ca
 2013-04-09 11:40:25 -05:00
Dustin Johnson
4b4eb8e406 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: cef805e79a [formerly 61346b1388] [formerly f3bdede2c8 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]
Former-commit-id: f3bdede2c8
Former-commit-id: 8c52cd190f
 2013-04-05 12:41:02 -05:00
Bryan Kowal
607d5b205d Issue #1805 - restore the full nightly delta build. 
Former-commit-id: 1ebf50c7ed [formerly 52be309cac] [formerly dc522ede44 [formerly 9dc700dbf0d7ff8347fda64bdd60879c267dd2f4]]
Former-commit-id: dc522ede44
Former-commit-id: 04e22df174
 2013-04-04 16:16:53 -05:00
Greg Armendariz
f452a4582a 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: 6e0ced27dc [formerly d6d0e0131f] [formerly 71d400e09f [formerly fa1c24a0aa4004b9403e39ce94a99a88f423466e]]
Former-commit-id: 71d400e09f
Former-commit-id: d463555ca3
 2013-04-04 13:00:39 -05:00
Bryan Kowal
6a66158097 Issue #1864 - datadelivery and kml are now dependent on the core viz feature. 
Former-commit-id: 70c8ed6bc0 [formerly 3fac666de5] [formerly 64c54f2110 [formerly c5b6f20402cfa47cbc421596b81139f24db2c552]]
Former-commit-id: 64c54f2110
Former-commit-id: 49ee55327d
 2013-04-04 12:48:59 -05:00
Steve Harris
a400879732 Merge branch 'omaha_13.4.1' into development 
Former-commit-id: 8b5b1d286b [formerly 56410d2a04] [formerly 731ed52cd6 [formerly 6e7c89a07a4105097de3ffa1b7522fdae93baa5b]]
Former-commit-id: 731ed52cd6
Former-commit-id: a419f72b2d
 2013-04-04 12:01:23 -05:00
Steve Harris
0f53c46d7a Merge branch 'omaha_13.3.1' into development 
Former-commit-id: 9879b94de9 [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: ed8c0487fe
 2013-04-04 11:58:50 -05:00
Steve Harris
3ea89862c0 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: 3487a41532 [formerly ea34b1db1e] [formerly d98a119f4d [formerly 735ce03302b54116c8545daf043585fb16fabd11]]
Former-commit-id: d98a119f4d
Former-commit-id: 1a91fd82ff
 2013-04-04 11:12:22 -05:00
Bryan Kowal
12e9b9d75b 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: c448651065 [formerly 03a2e82b77] [formerly 8d3c98eb5d [formerly 54f97bfeaecf8fc99d8572a94977d863c547fe17]]
Former-commit-id: 8d3c98eb5d
Former-commit-id: 5816ddaf77
 2013-04-03 18:27:10 -05:00
Nate Jensen
e74f83d83a 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: f43ac8bbc3 [formerly 79a9d76915] [formerly 73d86e8926 [formerly eaabe1a4935051d003ed302de193cfb183118845]]
Former-commit-id: 73d86e8926
Former-commit-id: c87d157cbd
 2013-04-03 17:28:49 -05:00
Steve Harris
5c029bc4ac 13.2.1-21 baseline 
Former-commit-id: a86d44584d [formerly d4358b93dc] [formerly 33bd359cfe [formerly f80eddbb15e5ca1710c15d245957345d6f840546]]
Former-commit-id: 33bd359cfe
Former-commit-id: 18d6fa4f4d
 2013-04-03 18:08:41 -04:00
Steve Harris
b062373048 13.2.1-20 baseline 
Former-commit-id: ad663b925c [formerly 6a55bc5dff] [formerly 539faf0a71 [formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]]
Former-commit-id: 539faf0a71
Former-commit-id: 12d4316b3a
 2013-04-03 18:05:39 -04:00
Steve Harris
0342b648b6 Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1 
Former-commit-id: 2bc12f7a23 [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]
Former-commit-id: 327d05f3b5
Former-commit-id: c7b9690456
 2013-04-03 15:52:19 -05:00
Ron Anderson
a633b96fdf Merge "Issue #1855 fix python threading in GFE procedures and smart tools" into omaha_13.3.1 
Former-commit-id: b880af3c48 [formerly de856db77a] [formerly c82968c1e6 [formerly 53ace4843058424627c3b670caa77972ddbe01be]]
Former-commit-id: c82968c1e6
Former-commit-id: 237e414b5d
 2013-04-03 15:25:52 -05:00
Richard Peter
8ac6ae3539 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: 920ba0628c [formerly d282a49b6f] [formerly 6d73e25290 [formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]
Former-commit-id: 6d73e25290
Former-commit-id: 64dc5c4d23
 2013-04-03 15:14:17 -05:00
Richard Peter
d973d83519 Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1 
Former-commit-id: dd527a4ef2 [formerly cbbd9ab90d] [formerly cfcacd20e9 [formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]
Former-commit-id: cfcacd20e9
Former-commit-id: 58908a0fd7
 2013-04-03 15:13:26 -05:00
Steve Harris
0edd049e3b 13.3.1-18 baseline 
Former-commit-id: f3e79bcc9d [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]
Former-commit-id: ce6a06a7e3
Former-commit-id: bf6c3b6762
 2013-04-03 14:58:29 -05:00
Nate Jensen
1c6643e7de Issue #1855 fix python threading in GFE procedures and smart tools 
Change-Id: I6420338991c1961ce63ff944b516925f83a12994

Former-commit-id: 5c830c3c9c [formerly e3462292ab] [formerly fe24e34163 [formerly c4549e0279a3026adc2f7b40bb272fc4f59acf59]]
Former-commit-id: fe24e34163
Former-commit-id: e18e798a94
 2013-04-03 14:33:24 -05:00
Lee Venable
3d129d4526 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: c8549e67d6 [formerly 40b8ecf27d] [formerly ff910d99fc [formerly ad96c48345c8b6f89ea337bd663cb7585981e941]]
Former-commit-id: ff910d99fc
Former-commit-id: 36a15b3be1
 2013-04-03 14:14:41 -05:00
Nate Jensen
2d4dc636ce Merge "Issue #1562 max's fix for topo with custom colormaps" into omaha_13.3.1 
Former-commit-id: a109ec4601 [formerly dbbad421db] [formerly 1bc148b468 [formerly 0b617c32afd67c5f64efa89e18abfef0de51a00f]]
Former-commit-id: 1bc148b468
Former-commit-id: ec8cdfd8f0
 2013-04-03 14:13:14 -05:00
Nate Jensen
6ca17c5a2a Issue #1562 max's fix for topo with custom colormaps 
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e

Former-commit-id: d64e0a2a39 [formerly 057a929903] [formerly 6c711f037c [formerly 88e676506f6dec74514c25260edcc44d9e0564d5]]
Former-commit-id: 6c711f037c
Former-commit-id: 616612e550
 2013-04-03 14:10:53 -05:00
Bryan Kowal
b60bea920c 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: d1663ea98b [formerly e788c7b471] [formerly ee8c99ef6e [formerly cadc51640a1349742bde98a5ae7189d507391d7e]]
Former-commit-id: ee8c99ef6e
Former-commit-id: 344237d9ee
 2013-04-03 14:03:54 -05:00
Bryan Kowal
93cd16508c 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: ad523b9cee [formerly 939ff752e8] [formerly 42ab5f4244 [formerly d19b2efc155e5834ee079bcfc88b0263f8652279]]
Former-commit-id: 42ab5f4244
Former-commit-id: 4fe7bace99
 2013-04-03 14:03:18 -05:00
Ron Anderson
0d57a752dc Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter 
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59

Former-commit-id: 34c8aad559 [formerly 3a3cdcbf46] [formerly b703b4779e [formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]
Former-commit-id: b703b4779e
Former-commit-id: 065ba61389
 2013-04-03 14:01:18 -05:00
Roger Ferrel
2b4b10d643 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: f8d1a13c38 [formerly 54cbf656e9] [formerly d2aae617b2 [formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]
Former-commit-id: d2aae617b2
Former-commit-id: 7b829a2fec
 2013-04-03 12:48:18 -05:00
Jonathan Sanchez
7ca110890a Issue #1858 Handled creating a follow up when initial was created before 
0z but issued after.

Former-commit-id: 9b547cab98 [formerly 9c322bf4b7] [formerly 799b8c57ef [formerly b123df8e9dea005c35865f4a71ef28b1d9c8cba8]]
Former-commit-id: 799b8c57ef
Former-commit-id: bd25782b7a
 2013-04-03 11:43:59 -05:00
Ben Steffensmeier
e0bbe368be Issue #1824 Fix Tile Geometry creation. 
Former-commit-id: fe561d7af0 [formerly fedbc28588] [formerly cfcc33cd7b [formerly 9c77d1a4d12dd8fd0c684bd48a7fc1a02a34dbac]]
Former-commit-id: cfcc33cd7b
Former-commit-id: 58d81f6556
 2013-04-03 10:59:11 -05:00
Lee Venable
f254b070eb Merge "Issue #1731 - fix problem with dmd updating." into omaha_13.3.1 
Former-commit-id: 48433d4d37 [formerly 0693b02556] [formerly 7bdf9c3115 [formerly 321f2a9f7b8c204937a8685b402b0f90db13f321]]
Former-commit-id: 7bdf9c3115
Former-commit-id: ea85582347
 2013-04-02 17:46:48 -05:00
Mike Duff
bb14757eed Issue #1731 - fix problem with dmd updating. 
Change-Id: I1f3eb576cf26a42195ca9c4cadfbeaeb77394af6

Former-commit-id: c3ab8259d5 [formerly 64cdb3c7fd] [formerly 23c8085402 [formerly a8c25cfced44c7e3edfd1b37af73b2af8753212b]]
Former-commit-id: 23c8085402
Former-commit-id: 3f2f0937ce
 2013-04-02 16:22:23 -05:00
Greg Armendariz
e3cf306ce4 Issue #1782 - Restoring #1813 & #1478 
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d

Former-commit-id: f1776b887d [formerly e5408c3807] [formerly 54f56fde29 [formerly e138a6c57a9bc1da5b00eb31dfb1e8ae426f998a]]
Former-commit-id: 54f56fde29
Former-commit-id: 02e79dfe8a
 2013-04-02 15:00:26 -05:00
Nate Jensen
1ad5bb1a52 Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development 
Former-commit-id: ab28523a09 [formerly f57358cff8] [formerly 8f9ec8dd2c [formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: 374eed35b3
 2013-04-02 14:29:15 -05:00
Bryan Kowal
a57a457c79 Issue #1850 - the ebxml schema will now be created within the metadata database 
Former-commit-id: d6e3d52126 [formerly 8d63244b4e] [formerly 2dbd62e9ce [formerly 0e7bcb156a4958639f38c83ae1d0e2f55398cb94]]
Former-commit-id: 2dbd62e9ce
Former-commit-id: b31ade0770
 2013-04-02 10:49:46 -05:00
Dustin Johnson
644ed2396d 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: 48a2002e68 [formerly c981b7250f] [formerly 6129d86be4 [formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]
Former-commit-id: 6129d86be4
Former-commit-id: dd8f4d8454
 2013-04-01 15:35:51 -05:00
Max Schenkelberg
ba262e2bc5 Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development. 
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Former-commit-id: 9d032f3e84 [formerly b32fbad9c8] [formerly 547190329b [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]
Former-commit-id: 547190329b
Former-commit-id: 635388a7ad
 2013-04-01 12:41:50 -05:00
Lee Venable
58c83b9662 Merge "Issue #1830 - Don't allow base level config files for FFMP" into development 
Former-commit-id: e994040887 [formerly 4a8c4b64df] [formerly f1e8faf9ff [formerly 9c117d43e77ffa074c8464771918116f8835b382]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 35d27f89f1
 2013-04-01 12:26:23 -05:00
Steve Harris
7b27767d7e 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: 736bb45741 [formerly 140765a43e] [formerly 437a04011a [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]
Former-commit-id: 437a04011a
Former-commit-id: 0b48e96314
 2013-04-01 12:19:04 -05:00
Steve Harris
f85a1ab9ab 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: 3b722f1076 [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]
Former-commit-id: 14c9de2259
Former-commit-id: a6dd28cc82
 2013-04-01 12:15:04 -05:00
Lee Venable
4e95ffe2ae Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development 
Former-commit-id: 7d73b8dacf [formerly fe89cb7fe4] [formerly d3390596f4 [formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]
Former-commit-id: d3390596f4
Former-commit-id: 89da26a266
 2013-04-01 12:06:16 -05:00
Steve Harris
ef413da5f7 13.3.1-17 baseline 
Former-commit-id: f28b85d42f [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4afa41d4e7
 2013-04-01 12:04:56 -05:00
Steve Harris
6b75202d07 13.3.1-16 baseline 
Former-commit-id: a262f22cee [formerly 51380726d4] [formerly 3066dd33e5 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]
Former-commit-id: 3066dd33e5
Former-commit-id: 36a4b3eb51
 2013-04-01 11:39:08 -05:00
Mike Duff
e627279d7c Issue #1830 - Don't allow base level config files for FFMP 
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77

Former-commit-id: fa8ca827d1 [formerly 261a39122d] [formerly 9c2ac87482 [formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]
Former-commit-id: 9c2ac87482
Former-commit-id: 11ca7c2c20
 2013-04-01 11:36:53 -05:00