Commit graph

1408 commits

Author SHA1 Message Date
Ben Steffensmeier
87b21c053d Issue #1804 Cache db queries in radar decoder.
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be

Former-commit-id: 337e450f94 [formerly 7b83f6bdfa] [formerly 337e450f94 [formerly 7b83f6bdfa] [formerly 5d2d834cf7 [formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]]]
Former-commit-id: 5d2d834cf7
Former-commit-id: 489a180622 [formerly ff0e5696e8]
Former-commit-id: 044eeebe97
2013-03-19 14:11:36 -05:00
Dustin Johnson
17fe9aee59 Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
Former-commit-id: bc323d3f25 [formerly 5b4035fb11] [formerly bc323d3f25 [formerly 5b4035fb11] [formerly 8363eba409 [formerly 9761b41160000713d00113c5267badafc9613a0d]]]
Former-commit-id: 8363eba409
Former-commit-id: 3c8e14edc7 [formerly e0b6e6187e]
Former-commit-id: 889953c712
2013-03-19 13:09:48 -05:00
Dave Hladky
af0898807b Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d

Former-commit-id: d7e8709cde [formerly ddb23ae59f] [formerly d7e8709cde [formerly ddb23ae59f] [formerly 81ad1ce2ed [formerly a52596494feb2255269513a3cd19490628d4ae10]]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: 618f737fab [formerly f0244f54a4]
Former-commit-id: 64f8c46e64
2013-03-19 13:08:14 -05:00
Ben Steffensmeier
f2466d6066 Issue #1804 Remove AlphanumericValues from radar HDF5.
Former-commit-id: 7b7b708eee [formerly 6c741a9ab3] [formerly 7b7b708eee [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]]
Former-commit-id: 86dffab17d
Former-commit-id: 160b6a7040 [formerly dfe8de96f2]
Former-commit-id: e176478c7a
2013-03-18 17:16:44 -05:00
Steve Harris
481cee4c74 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: 28ef804e1b [formerly b8f0635ad6] [formerly 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 2a26783ba7 [formerly 900b9aadde]
Former-commit-id: 22bb7ecd33
2013-03-18 16:52:00 -05:00
Steve Harris
9d4d1baefe Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: ea27f9cd17 [formerly 245afb28c8]
Former-commit-id: fc6748cb3e
2013-03-18 16:43:22 -05:00
Bryan Kowal
81ebbd5a5b Issue #1741 - what was once two is now one
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts


Former-commit-id: a93dcff1b5 [formerly b954bc17bf] [formerly a93dcff1b5 [formerly b954bc17bf] [formerly 7fd035256d [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]]
Former-commit-id: 7fd035256d
Former-commit-id: 3e8d5449fc [formerly 66e2ed79ec]
Former-commit-id: 56f2b3f0c2
2013-03-18 16:36:33 -05:00
Steve Harris
1c2dffd66d 13.3.1-8 baseline
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 81a3f29afc [formerly 5f492500ea]
Former-commit-id: 0c94cc97fb
2013-03-18 15:43:32 -05:00
Dustin Johnson
225c664129 Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
Former-commit-id: 36cc80590c [formerly b7a5311dde] [formerly 36cc80590c [formerly b7a5311dde] [formerly 7fe3c254fd [formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]]]
Former-commit-id: 7fe3c254fd
Former-commit-id: 7afc4a083b [formerly 55095f0041]
Former-commit-id: 805c491c04
2013-03-15 16:14:17 -05:00
Nate Jensen
499209754a Issue #1795 speed up publish by optimizing publish time updates in grid histories
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8

Former-commit-id: 30ddd909bf [formerly e65267d5f3] [formerly 30ddd909bf [formerly e65267d5f3] [formerly 235952a115 [formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]]]
Former-commit-id: 235952a115
Former-commit-id: 4ea1508baa [formerly dad08657aa]
Former-commit-id: d622b8c12e
2013-03-15 16:10:11 -05:00
Max Schenkelberg
286fc9a6ec Issue #1638 Fixed Velocity templates for windows build
Change-Id: I144825fc138f0064294f7d540b51f5cff7995a3a

Former-commit-id: 07a6fd494d [formerly 2c3ee8d35d] [formerly 07a6fd494d [formerly 2c3ee8d35d] [formerly beb801517e [formerly da9666be71adf84f394f255406a66afa6c3f28be]]]
Former-commit-id: beb801517e
Former-commit-id: c3232f2581 [formerly 582de5717c]
Former-commit-id: af973ff5a6
2013-03-15 12:16:59 -05:00
Dustin Johnson
83034c3f43 Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: fff7e7983f [formerly ecb0d2c826] [formerly fff7e7983f [formerly ecb0d2c826] [formerly 43a9f608ef [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]]
Former-commit-id: 43a9f608ef
Former-commit-id: 7adf94e9f6 [formerly 1b82ad0dc4]
Former-commit-id: a08059dd34
2013-03-15 11:51:58 -05:00
Bryan Kowal
a897e41993 Issue #1663 - name the default geometry column
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: b0d31729e8 [formerly 0d33c86abe] [formerly b0d31729e8 [formerly 0d33c86abe] [formerly 8c0ee91c5b [formerly 365f6dde01877efb9f75fa742f670420e30d07d5]]]
Former-commit-id: 8c0ee91c5b
Former-commit-id: ebaea489bc [formerly e83033b314]
Former-commit-id: bc0c82dad8
2013-03-14 10:37:20 -05:00
Ben Steffensmeier
24b97d7625 Issue #1777 fix subgridding range problems
Former-commit-id: 5e81f2154d [formerly 5bd20414eb] [formerly 5e81f2154d [formerly 5bd20414eb] [formerly 0daa5817d0 [formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]]]
Former-commit-id: 0daa5817d0
Former-commit-id: d22cbc7ce9 [formerly a6140145a4]
Former-commit-id: bc92e1be6b
2013-03-14 09:56:00 -05:00
Bryan Kowal
851eb395f7 Issue #1772 - remove references to the DEV_MODE jvm parameter
- removed ScriptLibraryManager.java

Change-Id: Ia373f431f0faac1020ee80962d20705bc3c6080e

Former-commit-id: 19b26c9f04 [formerly dd811f674b] [formerly 19b26c9f04 [formerly dd811f674b] [formerly 58316907ae [formerly 627fd3ccd5baa06d63f0e24b9824a5739d48e91a]]]
Former-commit-id: 58316907ae
Former-commit-id: 8c91869c8e [formerly 86c287bb33]
Former-commit-id: 39ff5c7945
2013-03-14 09:54:11 -05:00
David Gillingham
34a1c7b784 Issue #1759: Convert ifpnetCDF and iscMosaic to use more robust request
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.

Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152

Former-commit-id: 87013aad89 [formerly 7c74510723] [formerly 87013aad89 [formerly 7c74510723] [formerly 566927980a [formerly edaef1edf93ed7d7f626591ecfd86fb4c76f92e8]]]
Former-commit-id: 566927980a
Former-commit-id: d8dd50f2ba [formerly 90b8c80837]
Former-commit-id: b121f99015
2013-03-13 17:14:59 -05:00
Nate Jensen
165fbf3646 Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
Former-commit-id: d0db96df45 [formerly dbd2729336] [formerly d0db96df45 [formerly dbd2729336] [formerly eaef235e8e [formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]]]
Former-commit-id: eaef235e8e
Former-commit-id: 15b3d5add6 [formerly d881ab1442]
Former-commit-id: 4539ef8b58
2013-03-13 16:17:44 -05:00
Bryan Kowal
ea0950d836 Issue #1663 - PostgreSQL Upgrade
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
   * geos 3.3.7
   * postgis 2.0.2
   * proj 4.8.0
   * gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers

Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8

Former-commit-id: db02ab18ed [formerly 729bc9c4bb] [formerly db02ab18ed [formerly 729bc9c4bb] [formerly 5e86ef080e [formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]]
Former-commit-id: 5e86ef080e
Former-commit-id: f6139755a5 [formerly 58e035a024]
Former-commit-id: 1e9054ce15
2013-03-13 14:44:05 -05:00
Dave Hladky
b85e19282b Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 9e97fc9efe [formerly 160e1594b8]
Former-commit-id: cb5ee4a7b8
2013-03-13 13:56:33 -05:00
Ben Steffensmeier
15a16c8d81 Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
Former-commit-id: 51955a719a [formerly 36b3c16a42] [formerly 51955a719a [formerly 36b3c16a42] [formerly ddf2092bde [formerly 9491a90efdb389372e3ff3c988eb19aac9d508b6]]]
Former-commit-id: ddf2092bde
Former-commit-id: a1ca2ae2d7 [formerly 247c9f6c1f]
Former-commit-id: 04882c798f
2013-03-13 13:21:16 -05:00
Steve Harris
88b28c39c1 13.3.1-7 baseline
Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: ed5f1dbab6 [formerly 31c0a97dca]
Former-commit-id: 3084a860cd
2013-03-13 09:50:28 -05:00
Dustin Johnson
be4fe08b9d Issue #1784 Move NCF bandwidth manager code to data delivery repo
Amend:
  Publish JUnit test reports as XML, in support of Jenkins.
  Fix build/merge of 13.3.1 code so it compiles.

Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4

Former-commit-id: 2983ed29e4 [formerly 71365cd945] [formerly 2983ed29e4 [formerly 71365cd945] [formerly 1930183036 [formerly 60efd125706d618ae06eb84f959302213da2f7f1]]]
Former-commit-id: 1930183036
Former-commit-id: f5a3b57107 [formerly 48a96911c8]
Former-commit-id: 06b39b848b
2013-03-13 08:39:08 -05:00
Roger Ferrel
cf7b0e99f7 Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4

Former-commit-id: f912d9ece3 [formerly c5a2786c84] [formerly f912d9ece3 [formerly c5a2786c84] [formerly b5743e8f9b [formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]]]
Former-commit-id: b5743e8f9b
Former-commit-id: a9a0a471f9 [formerly 8bb9044e3a]
Former-commit-id: 5546691fd6
2013-03-12 16:58:06 -05:00
Nate Jensen
40d5631842 Merge "Issue #1638 fix velocity on windows" into development
Former-commit-id: 37d996c64c [formerly 4486bd9941] [formerly 37d996c64c [formerly 4486bd9941] [formerly 676b3c9d11 [formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]]]
Former-commit-id: 676b3c9d11
Former-commit-id: a4a5a1e94f [formerly 33f185d021]
Former-commit-id: d0f70dafb3
2013-03-12 16:43:13 -05:00
Nate Jensen
52139d5bcf Issue #1638 fix velocity on windows
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a

Former-commit-id: 5e545cc9c4 [formerly 863d4cf3df] [formerly 5e545cc9c4 [formerly 863d4cf3df] [formerly cbf0343d72 [formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]]]
Former-commit-id: cbf0343d72
Former-commit-id: 35d0187e3d [formerly b00ccd2b77]
Former-commit-id: d8197235fe
2013-03-12 16:04:59 -05:00
Steve Harris
346b22b196 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 36261cb095 [formerly 753a5213ab] [formerly 36261cb095 [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: bca46a1354 [formerly d5bcdb0015]
Former-commit-id: 5232592cfa
2013-03-12 16:04:23 -05:00
Dave Hladky
cdfbcc7136 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: 155903d135 [formerly 6ea95002de]
Former-commit-id: 29ed641a13
2013-03-12 15:48:34 -05:00
Dustin Johnson
226be42368 Issue #1778 Watch for bandwidth configuration changes
Amend: Peer review comments

Change-Id: Idf4f70677a0ebb082e9cec986c9d17e60645751e

Former-commit-id: 6eed493b3e [formerly 4c7f7801fa] [formerly 6eed493b3e [formerly 4c7f7801fa] [formerly 794812fb23 [formerly ebc03ff41b450140ffa2bb6df44b128a75205a7b]]]
Former-commit-id: 794812fb23
Former-commit-id: d63cdbfd17 [formerly 33fe353252]
Former-commit-id: fbb8745ce5
2013-03-12 12:02:09 -05:00
Mike Duff
360da06974 Issue #1646 - Format the output
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6

Former-commit-id: 75b6040ff6 [formerly d1d694e1db] [formerly 75b6040ff6 [formerly d1d694e1db] [formerly ec0d814aa6 [formerly bdda0e529ccab13fab63e08330b3dcfcef330318]]]
Former-commit-id: ec0d814aa6
Former-commit-id: f1f79fc498 [formerly 7fbc376ec4]
Former-commit-id: 5ed9b7b6d0
2013-03-12 10:42:13 -05:00
Steve Harris
c28f3aeb02 13.3.1-6 baseline
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: 6fe4b16924 [formerly 4ed21b702b]
Former-commit-id: c6f379f59a
2013-03-12 08:35:45 -05:00
Roger Ferrel
241dfb9451 Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 70bd9aafa7 [formerly 4deb731bd0] [formerly 70bd9aafa7 [formerly 4deb731bd0] [formerly b421c97d86 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]
Former-commit-id: b421c97d86
Former-commit-id: 0deb290c24 [formerly 334f2c4a57]
Former-commit-id: 0bbe51355e
2013-03-11 13:00:44 -05:00
Roger Ferrel
408663b2b4 Issue #1735 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: a73687c1b8 [formerly 6744238fce] [formerly a73687c1b8 [formerly 6744238fce] [formerly 9e8472bab6 [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]]
Former-commit-id: 9e8472bab6
Former-commit-id: 7e5bb824d9 [formerly 3684c7efed]
Former-commit-id: a8436c76ad
2013-03-11 11:16:22 -05:00
David Gillingham
bfb26f70e6 Issue #1759: Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
GfeScriptExecutor and GfeScript.

Change-Id: If3c789549a071e54f9020433f6221e688c51c44a

Former-commit-id: 6b695c6a5e [formerly 4459ecfa78] [formerly 6b695c6a5e [formerly 4459ecfa78] [formerly 1518c0b53c [formerly a3918b30452a829a8f0cd562021959246bf1144a]]]
Former-commit-id: 1518c0b53c
Former-commit-id: b0665586e1 [formerly 251da90765]
Former-commit-id: 87d4bdd646
2013-03-07 17:25:14 -06:00
Nate Jensen
d0bed867b0 Issue #1773 log publish times
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85

Former-commit-id: 5d9778a8d6 [formerly 5e3d6df7e0] [formerly 5d9778a8d6 [formerly 5e3d6df7e0] [formerly 5c59a61cef [formerly 392feade3f36680edcdb135f7c061be172210c26]]]
Former-commit-id: 5c59a61cef
Former-commit-id: 21863c5db5 [formerly d7902aba68]
Former-commit-id: a2f804350a
2013-03-07 16:49:40 -06:00
Dustin Johnson
e1625d40ba Issue #1647 Write out data targeted for the SBN as hidden, then rename
Change-Id: I5ea684eb0f3bfa4a97dfdb65b8d50b3774c8760e

Former-commit-id: 84642b4f33 [formerly 959e7e39d3] [formerly 84642b4f33 [formerly 959e7e39d3] [formerly 2a6edae82b [formerly 71229a6b442ed3a6fc92b2603c2d90507528d495]]]
Former-commit-id: 2a6edae82b
Former-commit-id: f808444d6b [formerly e5670ffdb4]
Former-commit-id: d9585dd27e
2013-03-07 14:39:34 -06:00
David Gillingham
a1029acb7c Issue #1447: Implement active table fetching, make bug fixes
to active table sharing from testing.

Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d

Former-commit-id: 75e82d9fca [formerly 95f8074c97] [formerly 75e82d9fca [formerly 95f8074c97] [formerly 0a79d08dd8 [formerly cede300be734c8a05f90b9c84372866d9bd4f695]]]
Former-commit-id: 0a79d08dd8
Former-commit-id: 94bccc87a3 [formerly 5ad72e2a7f]
Former-commit-id: 2ca8e5e42a
2013-03-06 14:23:00 -06:00
Dustin Johnson
9346a14482 Merge "Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks" into development
Former-commit-id: def94b337f [formerly 2262872d2d] [formerly def94b337f [formerly 2262872d2d] [formerly 90b18cc477 [formerly fdb6fdd88c80e1f9d33c5d0b72aca389910599ed]]]
Former-commit-id: 90b18cc477
Former-commit-id: ec0e13e509 [formerly c28f99971c]
Former-commit-id: e6fb231413
2013-03-05 15:01:02 -06:00
Dustin Johnson
d28ff6d3c2 Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
Former-commit-id: 21abece1f2 [formerly d4c6c29f5f] [formerly 21abece1f2 [formerly d4c6c29f5f] [formerly 3eddb2d286 [formerly 6fd60728a421630cea913d11db02b48f7940554e]]]
Former-commit-id: 3eddb2d286
Former-commit-id: b88a1eefc1 [formerly bfed4555a2]
Former-commit-id: f6431b52bf
2013-03-05 13:32:04 -06:00
Steve Harris
2b489e4e40 Merge branch 'omaha_13.3.1' into development
Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 4a0b8772ec [formerly b9563da8a8]
Former-commit-id: 46d0c9fcee
2013-03-05 12:29:44 -06:00
Steve Harris
d842ed88a7 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 61a19a460b [formerly 305dd72969] [formerly 61a19a460b [formerly 305dd72969] [formerly 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]
Former-commit-id: 57f42761d7
Former-commit-id: b423579e4a [formerly a8e1557c62]
Former-commit-id: b630339eb7
2013-03-05 12:27:49 -06:00
Dustin Johnson
5464463722 Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks
Change-Id: Idcd9cc06543582252ddbabe42d7c30cb741dfbdd

Former-commit-id: 2bd62ad4b6 [formerly 8107f76d98] [formerly 2bd62ad4b6 [formerly 8107f76d98] [formerly 547780f9a3 [formerly ec1ed5a20e1aca5761fd0ed62b450a8fa6f70ecc]]]
Former-commit-id: 547780f9a3
Former-commit-id: 8c99bc1f17 [formerly 043f122356]
Former-commit-id: 13db762ae2
2013-03-05 11:39:42 -06:00
Mike Duff
ffbc3e4b9f Issue #1752 - Lock down user admin dialog
Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb

Former-commit-id: 9d99eea617 [formerly 6809cb6f80] [formerly 9d99eea617 [formerly 6809cb6f80] [formerly 193cf1e54f [formerly e43718de9e5b0f73e4168c724f82eb021e616a34]]]
Former-commit-id: 193cf1e54f
Former-commit-id: af84910ac6 [formerly 775a0e3edd]
Former-commit-id: 78953a3fd7
2013-03-05 11:26:54 -06:00
Steve Harris
79ff805090 13.3.1-5 baseline
Former-commit-id: 8123d5ac45 [formerly a89221c75b] [formerly 8123d5ac45 [formerly a89221c75b] [formerly e26f7eb151 [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]
Former-commit-id: e26f7eb151
Former-commit-id: a240379588 [formerly a40c9136fe]
Former-commit-id: 1f98e01c57
2013-03-05 10:47:06 -06:00
Steve Harris
153aadc1d7 13.3.1-4 baseline
Former-commit-id: d79303de13 [formerly 8c0b90f292] [formerly d79303de13 [formerly 8c0b90f292] [formerly 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]
Former-commit-id: 2edca90902
Former-commit-id: 3e0614b43a [formerly 5e55ded3a9]
Former-commit-id: 0df35cc5ec
2013-03-05 10:39:59 -06:00
Nate Jensen
2f8389cd69 Merge "Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build" into development
Former-commit-id: c21079cc06 [formerly 75d959f536] [formerly c21079cc06 [formerly 75d959f536] [formerly 8d44b9ea05 [formerly 9d53ac277f9a83c7060552e5becda2b2d708ee9e]]]
Former-commit-id: 8d44b9ea05
Former-commit-id: 70c75b3bcd [formerly 910b8c7d25]
Former-commit-id: 432a0d1550
2013-03-05 09:10:31 -06:00
Dustin Johnson
b23fe8b9e7 Merge "Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions" into development
Former-commit-id: 9a6b647989 [formerly c6137e89e7] [formerly 9a6b647989 [formerly c6137e89e7] [formerly ef632b7bfa [formerly aae57f37aa7da6374958220bc09f91fd0d05a3b1]]]
Former-commit-id: ef632b7bfa
Former-commit-id: 9932db9b09 [formerly b3f7f77bf6]
Former-commit-id: a5c331790e
2013-03-05 08:53:09 -06:00
Richard Peter
fa19a76a42 Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: e74f6074e7 [formerly 070f62d08e] [formerly e74f6074e7 [formerly 070f62d08e] [formerly 784cd2145f [formerly 01d727795063ff365f3209f44c223c707c3942ab]]]
Former-commit-id: 784cd2145f
Former-commit-id: a4bf42628a [formerly 180540eb47]
Former-commit-id: 6b08735982
2013-03-04 17:48:05 -06:00
Dave Hladky
ac69f97305 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: 22ebfe0ecb [formerly 680317d9c4] [formerly 22ebfe0ecb [formerly 680317d9c4] [formerly fc36146f48 [formerly ef45479b067655db8203f199502ea4e772a80e34]]]
Former-commit-id: fc36146f48
Former-commit-id: 0f3c9ba997 [formerly 1260b40307]
Former-commit-id: fc90d47619
2013-03-04 17:41:11 -06:00
Bryan Kowal
0a60b0f122 Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build
Change-Id: I8284ad58f4f3ddd16ad04f00720f3de9e63a954a

Former-commit-id: eb4d75de7f [formerly 862f97a19b] [formerly eb4d75de7f [formerly 862f97a19b] [formerly cd08f88c43 [formerly d92a3c612b59d594a24ea253ad1289af7e8b7b8b]]]
Former-commit-id: cd08f88c43
Former-commit-id: 8512836953 [formerly d9c1a92b8e]
Former-commit-id: 5dae6fd039
2013-03-04 15:52:07 -06:00
Dustin Johnson
2f7bdb18f9 Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions
Amend:
  Use isEmpty() where possible in BandwidthManager.

Change-Id: I85fe54982245e088f60dd33148aed72e6abfc9ec

Former-commit-id: 73f884753a [formerly 1161125c84] [formerly 73f884753a [formerly 1161125c84] [formerly 54c3980cba [formerly 28c97849800c624bdaa161f05777703ee2a510ac]]]
Former-commit-id: 54c3980cba
Former-commit-id: 67d6a4ac99 [formerly c0a1ae396a]
Former-commit-id: 5da3043a97
2013-03-04 14:55:50 -06:00