Commit graph

2310 commits

Author SHA1 Message Date
Nate Jensen
d7696aa692 Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
Former-commit-id: 4db98f508d [formerly d0db96df45] [formerly dbd2729336] [formerly eaef235e8e [formerly dbd2729336 [formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]]]
Former-commit-id: eaef235e8e
Former-commit-id: 2d26b66cf912a53b86fda6b7e210470e522c1cbe [formerly d881ab1442]
Former-commit-id: 15b3d5add6
2013-03-13 16:17:44 -05:00
Bryan Kowal
0b6a31d7ca 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: 9e678feaf8 [formerly db02ab18ed] [formerly 729bc9c4bb] [formerly 5e86ef080e [formerly 729bc9c4bb [formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]]
Former-commit-id: 5e86ef080e
Former-commit-id: 916fa7115cb561d798c47318a5834ec0854bf491 [formerly 58e035a024]
Former-commit-id: f6139755a5
2013-03-13 14:44:05 -05:00
Dave Hladky
68114535f2 Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]
Former-commit-id: 9e97fc9efe
2013-03-13 13:56:33 -05:00
Ben Steffensmeier
6e0c60c210 Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
Former-commit-id: 45cf2fd0ff [formerly 51955a719a] [formerly 36b3c16a42] [formerly ddf2092bde [formerly 36b3c16a42 [formerly 9491a90efdb389372e3ff3c988eb19aac9d508b6]]]
Former-commit-id: ddf2092bde
Former-commit-id: 9ff9ba942dcb40894a6b2a25b30b686d76272ff6 [formerly 247c9f6c1f]
Former-commit-id: a1ca2ae2d7
2013-03-13 13:21:16 -05:00
Steve Harris
45a2d0501d 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]
Former-commit-id: ed5f1dbab6
2013-03-13 09:50:28 -05:00
Greg Armendariz
065fb32918 Merge "Issue #1638 fix build" into development
Former-commit-id: 4f29b438ac [formerly 28eec498f3] [formerly cc168cb94c] [formerly a06a730696 [formerly cc168cb94c [formerly 9c0fe6bf68406ef7fbcf6b68888acb24dabb8fd9]]]
Former-commit-id: a06a730696
Former-commit-id: 637e19f33ae49ff55331c55f304ac4387824f758 [formerly 12e912c548]
Former-commit-id: f121df7e86
2013-03-13 08:56:00 -05:00
Nate Jensen
58cc71f75d Issue #1638 fix build
Change-Id: I2c96c708c30050befc6f87fca41fb306da7ecc5e

Former-commit-id: 84ea117d75 [formerly 975d044ba6] [formerly 192fe9a724] [formerly 1cbc7bbfdc [formerly 192fe9a724 [formerly fe7a28034739ec871528f041cfa7a488e5c71378]]]
Former-commit-id: 1cbc7bbfdc
Former-commit-id: f53aed250ff25cfca29a3a019820f483de4707c6 [formerly 733186900f]
Former-commit-id: 5067a7b372
2013-03-13 08:50:26 -05:00
Dustin Johnson
c971ba7c89 Issue #1784 Update ColorMapParameters import for ncep plugins
Change-Id: I704f2d98eb07531108593de681a9f7ffc67b04e8

Former-commit-id: 4b9b444ef6 [formerly a5e0b421b5] [formerly 9cd29d7625] [formerly 0932affd16 [formerly 9cd29d7625 [formerly 884757847d855af099219c8ef2715a6319913646]]]
Former-commit-id: 0932affd16
Former-commit-id: dc78bf38c6ff41dd21542beb50a1f458f7032ab0 [formerly 64d8fc0ea3]
Former-commit-id: 9f81b57ec0
2013-03-13 08:45:54 -05:00
Dustin Johnson
fdaa9b5ce7 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: 2676e08fdd [formerly 2983ed29e4] [formerly 71365cd945] [formerly 1930183036 [formerly 71365cd945 [formerly 60efd125706d618ae06eb84f959302213da2f7f1]]]
Former-commit-id: 1930183036
Former-commit-id: 9459f282f836590ae975e73dd24d60edd299352a [formerly 48a96911c8]
Former-commit-id: f5a3b57107
2013-03-13 08:39:08 -05:00
Steve Harris
f92bc8f3d4 13.3.1-6.1 baseline
Former-commit-id: 3ea50babf5 [formerly 6d96471b9b] [formerly fa9d260c2b] [formerly a062803c8c [formerly fa9d260c2b [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]]
Former-commit-id: a062803c8c
Former-commit-id: 38ded82c18c6e60a96a3dd85d4c9dd3d0ed218fe [formerly bfa25f3330]
Former-commit-id: 2e1dbdc10d
2013-03-13 08:28:26 -05:00
Roger Ferrel
b2845a11d0 Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4

Former-commit-id: 82b526851a [formerly f912d9ece3] [formerly c5a2786c84] [formerly b5743e8f9b [formerly c5a2786c84 [formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]]]
Former-commit-id: b5743e8f9b
Former-commit-id: b8373ea3e1f95cfdea39442e15da79444813af3c [formerly 8bb9044e3a]
Former-commit-id: a9a0a471f9
2013-03-12 16:58:06 -05:00
Nate Jensen
8778e9f945 Merge "Issue #1638 fix velocity on windows" into development
Former-commit-id: 33b73b008f [formerly 37d996c64c] [formerly 4486bd9941] [formerly 676b3c9d11 [formerly 4486bd9941 [formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]]]
Former-commit-id: 676b3c9d11
Former-commit-id: 6bbc851111461bca4aabeb7be09dfa13233066b8 [formerly 33f185d021]
Former-commit-id: a4a5a1e94f
2013-03-12 16:43:13 -05:00
Nate Jensen
f4b80d4b15 Issue #1638 fix velocity on windows
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a

Former-commit-id: 48170212cb [formerly 5e545cc9c4] [formerly 863d4cf3df] [formerly cbf0343d72 [formerly 863d4cf3df [formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]]]
Former-commit-id: cbf0343d72
Former-commit-id: 86f6a376c5bb355801995427243a8f6c4288aac8 [formerly b00ccd2b77]
Former-commit-id: 35d0187e3d
2013-03-12 16:04:59 -05:00
Steve Harris
47cde9bd09 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: 4c4c79036c [formerly 36261cb095] [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 753a5213ab [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: 2726614c378a7a21453ace53443d019d65cea76e [formerly d5bcdb0015]
Former-commit-id: bca46a1354
2013-03-12 16:04:23 -05:00
Dave Hladky
eefd544e4b 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: e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de]
Former-commit-id: 155903d135
2013-03-12 15:48:34 -05:00
Dustin Johnson
2e6dbfe4ce Merge "Issue #1778 Watch for bandwidth configuration changes" into development
Former-commit-id: f417e8fc5d [formerly 13ce9b683d] [formerly 11e7d3b511] [formerly 6a0a04a519 [formerly 11e7d3b511 [formerly f33c6cbe9c63721ec62f57b3953abd48729c8674]]]
Former-commit-id: 6a0a04a519
Former-commit-id: 8e43f9dfa2a910c3efb59ec13bc67a05d282b421 [formerly 4ec51a98d9]
Former-commit-id: f892ae71f7
2013-03-12 12:15:50 -05:00
Dustin Johnson
f3fb0e6fd2 Issue #1778 Watch for bandwidth configuration changes
Amend: Peer review comments

Change-Id: Idf4f70677a0ebb082e9cec986c9d17e60645751e

Former-commit-id: e358952f1f [formerly 6eed493b3e] [formerly 4c7f7801fa] [formerly 794812fb23 [formerly 4c7f7801fa [formerly ebc03ff41b450140ffa2bb6df44b128a75205a7b]]]
Former-commit-id: 794812fb23
Former-commit-id: 4f7ac3d05b747da63a956d1add39e97eccb9f98f [formerly 33fe353252]
Former-commit-id: d63cdbfd17
2013-03-12 12:02:09 -05:00
Lee Venable
5b34278877 Merge "Issue #1760 - fix minutes on the y axis of 3 hour graph" into development
Former-commit-id: ac7a1d3ea6 [formerly 1285a3d4af] [formerly c4c8d74cad] [formerly d68b5ac543 [formerly c4c8d74cad [formerly 85970efae8002eb3f1773942211bd202014fecf2]]]
Former-commit-id: d68b5ac543
Former-commit-id: f7891989074b3e07fb1c34c466fb07b39f2a508d [formerly ed5ff858b4]
Former-commit-id: 25449b6fe0
2013-03-12 11:33:17 -05:00
Mike Duff
7f42fb1818 Issue #1760 - fix minutes on the y axis of 3 hour graph
Change-Id: I4f5f77d4307f69015ceade195270434e49198c69

Former-commit-id: f5d8ba8b0f [formerly a6eea1874b] [formerly b72c26b9e1b53b7b3a876aca712d2b063166889e [formerly 714de645d5]] [formerly 7040daf472 [formerly 714de645d5 [formerly 1c1c34c7eec36f378cfd2969779f68f9a1de4159]]]
Former-commit-id: 7040daf472
Former-commit-id: 079adc9e9487fc0c7120ff74f0179911f122086a [formerly b5bccd0bb2]
Former-commit-id: a712efa614
2013-03-12 11:25:05 -05:00
Mike Duff
143518e10b Issue #1646 - Format the output
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6

Former-commit-id: 6f79d5e8f9 [formerly 75b6040ff6] [formerly d1d694e1db] [formerly ec0d814aa6 [formerly d1d694e1db [formerly bdda0e529ccab13fab63e08330b3dcfcef330318]]]
Former-commit-id: ec0d814aa6
Former-commit-id: d13b8b6dfbbd86c4ce3c55b81a092585ba5836e0 [formerly 7fbc376ec4]
Former-commit-id: f1f79fc498
2013-03-12 10:42:13 -05:00
Lee Venable
da5ff93f57 Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
Former-commit-id: 13d13428b7 [formerly 9a69cd3524] [formerly d5af1f02c5] [formerly 28d74d91b0 [formerly d5af1f02c5 [formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]]
Former-commit-id: 28d74d91b0
Former-commit-id: 6cbbc7b35f1af06bc44a23c6f7846a7c829b25b7 [formerly e080fb5106]
Former-commit-id: b471e3807f
2013-03-12 09:08:44 -05:00
Mike Duff
848f7982d6 Issue #1781 - Fix Hydro Time Series slow table loads
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d

Former-commit-id: 5704b2689e [formerly 492cf0f7e6] [formerly 6a6844fdaf] [formerly cac9bd6119 [formerly 6a6844fdaf [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]]
Former-commit-id: cac9bd6119
Former-commit-id: b852cff98c7943089d4fa9240397aef285faa297 [formerly caed059e23]
Former-commit-id: 2df046d409
2013-03-12 09:03:08 -05:00
Steve Harris
0cec06c171 13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]
Former-commit-id: 6fe4b16924
2013-03-12 08:35:45 -05:00
Roger Ferrel
7c6bd5aeb0 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: 0982485efe [formerly 70bd9aafa7] [formerly 4deb731bd0] [formerly b421c97d86 [formerly 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]
Former-commit-id: b421c97d86
Former-commit-id: bfbd6592633352c9799a573f7b550fe350361788 [formerly 334f2c4a57]
Former-commit-id: 0deb290c24
2013-03-11 13:00:44 -05:00
Roger Ferrel
47fa3496fb 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: c0ee394e9c [formerly a73687c1b8] [formerly 6744238fce] [formerly 9e8472bab6 [formerly 6744238fce [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]]
Former-commit-id: 9e8472bab6
Former-commit-id: ff76a88839c216a130eb0e8c4e251734c7719b17 [formerly 3684c7efed]
Former-commit-id: 7e5bb824d9
2013-03-11 11:16:22 -05:00
Lee Venable
ec43f5c022 Merge "Issue #1769 Crashing FFMP caused by thread wait" into omaha_13.3.1
Former-commit-id: ed477e891e [formerly 483e2813ac] [formerly ea6731947e] [formerly 41c7be5267 [formerly ea6731947e [formerly 784852cf5045a32f94ba1923e9fadcd952d45dbb]]]
Former-commit-id: 41c7be5267
Former-commit-id: 3c83441ba78cd8de0509b446bbd7dc77463041fe [formerly 32221a7a7a]
Former-commit-id: be87f2adc3
2013-03-08 13:04:28 -06:00
Dave Hladky
f3c5756522 Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

Former-commit-id: b064d868db [formerly 50696bee89] [formerly 2a854d7c30] [formerly bb4c54eff0 [formerly 2a854d7c30 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]]
Former-commit-id: bb4c54eff0
Former-commit-id: 0d693e1163a146ba4b75d08a7448f53b6d3a905b [formerly 73c21a6ead]
Former-commit-id: dd446abd03
2013-03-08 09:58:17 -06:00
David Gillingham
479817d4b9 Issue #1759: Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
GfeScriptExecutor and GfeScript.

Change-Id: If3c789549a071e54f9020433f6221e688c51c44a

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

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

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

Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d

Former-commit-id: c30aefd889 [formerly 75e82d9fca] [formerly 95f8074c97] [formerly 0a79d08dd8 [formerly 95f8074c97 [formerly cede300be734c8a05f90b9c84372866d9bd4f695]]]
Former-commit-id: 0a79d08dd8
Former-commit-id: 34ef93fbfd1261df01dfa61865a606e7d9a7141f [formerly 5ad72e2a7f]
Former-commit-id: 94bccc87a3
2013-03-06 14:23:00 -06:00
Nate Jensen
97172b7466 Issue #1753 log on user shutdown
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549

Former-commit-id: 2a34c5757a [formerly f101934a30] [formerly a7e9cfdb39] [formerly 163f93019b [formerly a7e9cfdb39 [formerly f8d4ec45dffcb6c969c2bb94cd924412b0caa308]]]
Former-commit-id: 163f93019b
Former-commit-id: 8af3fb81542f03f05402208a65fd3f1ea9cb1229 [formerly d6c3c84d30]
Former-commit-id: c4175c161f
2013-03-06 09:36:00 -06:00
Jonathan Sanchez
a5478559bc Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: edd4d9e02b [formerly 80ea3e1ec2] [formerly 8f70214f66] [formerly 6a3281c878 [formerly 8f70214f66 [formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]]
Former-commit-id: 6a3281c878
Former-commit-id: 3d49dc5085631dccfa4591b739f0f1e02b09ecee [formerly c2b021427b]
Former-commit-id: 234d73c905
2013-03-05 16:02:47 -06:00
Lee Venable
4b6524a13f Merge "Issue #1600 Created a utility class for adjust angles." into development
Former-commit-id: 90856bb929 [formerly 06462c5706] [formerly 3929ef49cd] [formerly 1854e71f8a [formerly 3929ef49cd [formerly 52672b8ce9f9f28f707f7f6c1cd7ff61845ab752]]]
Former-commit-id: 1854e71f8a
Former-commit-id: 06ba91c2e51936955ea3581ac6896f7a67b1ecd0 [formerly 0fc8bcc119]
Former-commit-id: 19686f12cc
2013-03-05 15:37:18 -06:00
Jonathan Sanchez
0917628d1a Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: f79907bf9f [formerly 3fface264c] [formerly 1a91fe52e7] [formerly 1f2db32448 [formerly 1a91fe52e7 [formerly 14676fe089c0132febc3f533e6cbf2d00f117b90]]]
Former-commit-id: 1f2db32448
Former-commit-id: 51bec9541946d539bda749f417d6c93398a63eb9 [formerly 42bcef0be0]
Former-commit-id: 40f52ab049
2013-03-05 15:05:19 -06:00
Dustin Johnson
77371116fb Merge "Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks" into development
Former-commit-id: d12fad8225 [formerly def94b337f] [formerly 2262872d2d] [formerly 90b18cc477 [formerly 2262872d2d [formerly fdb6fdd88c80e1f9d33c5d0b72aca389910599ed]]]
Former-commit-id: 90b18cc477
Former-commit-id: b6f23cffe21aeb20de3ce78ef9031fe3a7c65e5c [formerly c28f99971c]
Former-commit-id: ec0e13e509
2013-03-05 15:01:02 -06:00
Dustin Johnson
513f990a00 Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
Former-commit-id: cfae194f9b [formerly 21abece1f2] [formerly d4c6c29f5f] [formerly 3eddb2d286 [formerly d4c6c29f5f [formerly 6fd60728a421630cea913d11db02b48f7940554e]]]
Former-commit-id: 3eddb2d286
Former-commit-id: 0344c84d1e8fbcb57eb5b9ad89e040c20ba5273c [formerly bfed4555a2]
Former-commit-id: b88a1eefc1
2013-03-05 13:32:04 -06:00
Steve Harris
1709c34b8f Merge branch 'omaha_13.3.1' into development
Former-commit-id: afd934db35 [formerly 6b13492420] [formerly d5b80f9225] [formerly aa0e9acefd [formerly d5b80f9225 [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 6d472393251484c670223cabe82285a18503dc7c [formerly b9563da8a8]
Former-commit-id: 4a0b8772ec
2013-03-05 12:29:44 -06:00
Steve Harris
7ff64bf8cc Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]
Former-commit-id: 57f42761d7
Former-commit-id: 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]
Former-commit-id: b423579e4a
2013-03-05 12:27:49 -06:00
Richard Peter
c8d658324c Merge "Issue #1750 - edexBridge will now set the QPID persistence flag" into development
Former-commit-id: 23075edfa7 [formerly a077fe35b5] [formerly a44ee67d00] [formerly 993f4ff2bd [formerly a44ee67d00 [formerly 8a29ff0890d07e02623e67dacd08d506c7c85d3a]]]
Former-commit-id: 993f4ff2bd
Former-commit-id: e77d60d1d4f03fa95fedca47bc3e115337ae5cc4 [formerly 11afc055c5]
Former-commit-id: 4cd4aae773
2013-03-05 12:10:31 -06:00
Dustin Johnson
17a3c88acd Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks
Change-Id: Idcd9cc06543582252ddbabe42d7c30cb741dfbdd

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

Former-commit-id: ec9f3ea4a1 [formerly 9d99eea617] [formerly 6809cb6f80] [formerly 193cf1e54f [formerly 6809cb6f80 [formerly e43718de9e5b0f73e4168c724f82eb021e616a34]]]
Former-commit-id: 193cf1e54f
Former-commit-id: 88e4de072ccfa6a5ea0a83518e7661b27952c198 [formerly 775a0e3edd]
Former-commit-id: af84910ac6
2013-03-05 11:26:54 -06:00
Steve Harris
aabd5cd51f 13.3.1-5 baseline
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]
Former-commit-id: e26f7eb151
Former-commit-id: 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]
Former-commit-id: a240379588
2013-03-05 10:47:06 -06:00
Steve Harris
4bfbb518c0 13.3.1-4 baseline
Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]
Former-commit-id: 2edca90902
Former-commit-id: c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9]
Former-commit-id: 3e0614b43a
2013-03-05 10:39:59 -06:00
Nate Jensen
790eb9ef79 Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
Former-commit-id: d7bc5750ae [formerly b393674ef3] [formerly b803ae3801] [formerly a952d48b3e [formerly b803ae3801 [formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]]
Former-commit-id: a952d48b3e
Former-commit-id: a901506e2ccdd1f021aa7b64beb4727c4a3b7241 [formerly e3db522be4]
Former-commit-id: 3c5ca0546f
2013-03-05 09:10:52 -06:00
Nate Jensen
845bfbdf40 Merge "Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build" into development
Former-commit-id: 68716aedc0 [formerly c21079cc06] [formerly 75d959f536] [formerly 8d44b9ea05 [formerly 75d959f536 [formerly 9d53ac277f9a83c7060552e5becda2b2d708ee9e]]]
Former-commit-id: 8d44b9ea05
Former-commit-id: 58038f64e06edc4144e0225d0d7b12ec7bcb9d12 [formerly 910b8c7d25]
Former-commit-id: 70c75b3bcd
2013-03-05 09:10:31 -06:00
Dustin Johnson
df82d27418 Merge "Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions" into development
Former-commit-id: 14db0ef448 [formerly 9a6b647989] [formerly c6137e89e7] [formerly ef632b7bfa [formerly c6137e89e7 [formerly aae57f37aa7da6374958220bc09f91fd0d05a3b1]]]
Former-commit-id: ef632b7bfa
Former-commit-id: 5ec9f8f6e00d06698b9909ef6ca138ee05c652e1 [formerly b3f7f77bf6]
Former-commit-id: 9932db9b09
2013-03-05 08:53:09 -06:00
Bryan Kowal
553f988935 Issue #1750 - edexBridge will now set the QPID persistence flag
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98

Former-commit-id: b407a34461 [formerly d484acbca0] [formerly 3a8efd5edf] [formerly 8b4dce1c3d [formerly 3a8efd5edf [formerly d466b647d0d810418a88c875f39e55d98d680aa1]]]
Former-commit-id: 8b4dce1c3d
Former-commit-id: 7570c6107ddb950a2b736fd6b01c90c29e178ab4 [formerly eba8ccc6cd]
Former-commit-id: 0d9400b2ec
2013-03-04 17:58:04 -06:00
Richard Peter
c7a4dcede6 Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: 3cc3648b9b [formerly e74f6074e7] [formerly 070f62d08e] [formerly 784cd2145f [formerly 070f62d08e [formerly 01d727795063ff365f3209f44c223c707c3942ab]]]
Former-commit-id: 784cd2145f
Former-commit-id: 63aff6583f8761a1de816d6c0659c2736bd51159 [formerly 180540eb47]
Former-commit-id: a4bf42628a
2013-03-04 17:48:05 -06:00
Dave Hladky
f47935a03c Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: d0cfd09209 [formerly 22ebfe0ecb] [formerly 680317d9c4] [formerly fc36146f48 [formerly 680317d9c4 [formerly ef45479b067655db8203f199502ea4e772a80e34]]]
Former-commit-id: fc36146f48
Former-commit-id: 88439cd2618a1c23c44807b5d72302de6137417a [formerly 1260b40307]
Former-commit-id: 0f3c9ba997
2013-03-04 17:41:11 -06:00