Steve Harris
3ec20c1689
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 57f42761d7
[formerly 305dd72969
[formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 305dd72969
Former-commit-id: 61a19a460b
2013-03-05 12:27:49 -06:00
Steve Harris
e4a1c61ad5
13.3.1-5 baseline
...
Former-commit-id: e26f7eb151
[formerly a89221c75b
[formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: a89221c75b
Former-commit-id: 8123d5ac45
2013-03-05 10:47:06 -06:00
Steve Harris
9066d511fe
13.3.1-4 baseline
...
Former-commit-id: 2edca90902
[formerly 8c0b90f292
[formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 8c0b90f292
Former-commit-id: d79303de13
2013-03-05 10:39:59 -06:00
Nate Jensen
d7bc5750ae
Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
...
Former-commit-id: a952d48b3e
[formerly b803ae3801
[formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]
Former-commit-id: b803ae3801
Former-commit-id: b393674ef3
2013-03-05 09:10:52 -06:00
Richard Peter
3cc3648b9b
Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
...
Former-commit-id: 784cd2145f
[formerly 070f62d08e
[formerly 01d727795063ff365f3209f44c223c707c3942ab]]
Former-commit-id: 070f62d08e
Former-commit-id: e74f6074e7
2013-03-04 17:48:05 -06:00
Dave Hladky
d0cfd09209
Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
...
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4
Former-commit-id: fc36146f48
[formerly 680317d9c4
[formerly ef45479b067655db8203f199502ea4e772a80e34]]
Former-commit-id: 680317d9c4
Former-commit-id: 22ebfe0ecb
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
9a8b585720
Issue #1628 move xmx settings to linux so windows can override.
...
Former-commit-id: c1c5ac7926
[formerly fad56e32cc
[formerly 623433c2be19dd3b1419309704b7eb9a91c80f5d]]
Former-commit-id: fad56e32cc
Former-commit-id: 5a88604ed6
2013-03-04 16:47:11 -06:00
Steve Harris
f14f5aeb48
Issue #1744 - Revert "Issue #1744 fix deadlock"
...
This reverts commit 394a96db44
[formerly e2f12d16b7
] [formerly 2a575a24e7
] [formerly f4cccabc07
[formerly 2a575a24e7
[formerly 48ef00523488cdf4f65b86c5b74331f908192191]]].
Former-commit-id: fcb48a7280
[formerly 28391884a7
[formerly f7d3af09b6a0ff2c729986880531ec59f9c9e2af]]
Former-commit-id: 28391884a7
Former-commit-id: 7ffb42d6e6
2013-03-04 13:03:19 -06:00
Steve Harris
702cec08bd
Issue #1744 - Revert "Issue #1744 actually fix deadlock this time"
...
This reverts commit eefa0d8e87
[formerly 3dc69632c1
] [formerly 8c84bc5fbb
] [formerly 35007e0460
[formerly 8c84bc5fbb
[formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]].
Former-commit-id: bba410a330
[formerly 88e633934d
[formerly 2d7d40f23da46f1825aaeab81549ee37700670eb]]
Former-commit-id: 88e633934d
Former-commit-id: 870972fb90
2013-03-04 13:02:32 -06:00
Nate Jensen
f832e5949c
Merge "Issue #1476 make fix for collaboration for issues with closing of views when detached" into omaha_13.3.1
...
Former-commit-id: 773b39548d
[formerly 0542f04538
[formerly 7a12fe5a93f52a476db81e0a1fd3beec8ea62023]]
Former-commit-id: 0542f04538
Former-commit-id: 5d772a2228
2013-03-04 12:28:19 -06:00
Matt Nash
999413b2e7
Issue #1476 make fix for collaboration for issues with closing of views when detached
...
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293
Former-commit-id: 1d25736871
[formerly fdc6db0a50
[formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]
Former-commit-id: fdc6db0a50
Former-commit-id: 311ac710ca
2013-03-04 09:41:11 -06:00
Ron Anderson
3aba636666
Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
...
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8
Former-commit-id: e8f1b460ce
[formerly fdeb45705b
[formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]
Former-commit-id: fdeb45705b
Former-commit-id: f1d5ff7c9e
2013-03-04 09:30:04 -06:00
Richard Peter
e54d4ba855
Issue #1740 : Baseline cave monitoring script
...
Former-commit-id: 783e9c1a25
[formerly 163fb343de
[formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]
Former-commit-id: 163fb343de
Former-commit-id: 1632bd2882
2013-03-01 16:17:25 -06:00
Nate Jensen
64d504df91
Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1
...
Former-commit-id: 677908868e
[formerly a90a2fe857
[formerly 2323a19cb44d6ff56188ed7d9062daf1fdc828fe]]
Former-commit-id: a90a2fe857
Former-commit-id: 6bf2eefa2a
2013-03-01 13:43:50 -06:00
David Gillingham
e2a7d7a350
Issue #1447 : Initial commit of VTEC table sharing functionality: port A1 changes to
...
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.
Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510
Former-commit-id: 9351f33c1c
[formerly 50744c1f92
[formerly 1e72fe30d97504f70352a181de35805a197e50f4]]
Former-commit-id: 50744c1f92
Former-commit-id: ca81ae4a71
2013-03-01 11:05:02 -06:00
Ben Steffensmeier
f505cda0bf
Issue #1731 Optimize construction of scan resource.
...
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b
Former-commit-id: 9263ff1846
[formerly 86b9a4d8c2
[formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]
Former-commit-id: 86b9a4d8c2
Former-commit-id: b0870c55f6
2013-03-01 11:03:11 -06:00
Richard Peter
7408f18a45
Merge "Issue #1744 actually fix deadlock this time" into omaha_13.3.1
...
Former-commit-id: c50e1cbe1c
[formerly 1754861897
[formerly 7eafcb1e677fafadc039a5106f296dbee1245136]]
Former-commit-id: 1754861897
Former-commit-id: f2ae906f93
2013-03-01 10:50:33 -06:00
Nate Jensen
eefa0d8e87
Issue #1744 actually fix deadlock this time
...
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb
Former-commit-id: 35007e0460
[formerly 8c84bc5fbb
[formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]
Former-commit-id: 8c84bc5fbb
Former-commit-id: 3dc69632c1
2013-03-01 10:48:03 -06:00
Richard Peter
75f91d596e
Merge "Issue #1744 fix deadlock" into omaha_13.3.1
...
Former-commit-id: 7dcc007bee
[formerly 79c70dacbd
[formerly 6fbc789e08a5e6baf7ae6ff1348e1e2c5709c422]]
Former-commit-id: 79c70dacbd
Former-commit-id: ee1b0df106
2013-03-01 10:27:36 -06:00
Nate Jensen
4f9f0c29d2
Merge "Issue #1731 Remove unneccessary query in getDataStore." into omaha_13.3.1
...
Former-commit-id: 302e851b67
[formerly d695473b0f
[formerly 94e54241b7e85c523e019603cd9e815c179dc584]]
Former-commit-id: d695473b0f
Former-commit-id: 308de6885f
2013-03-01 10:15:46 -06:00
Nate Jensen
394a96db44
Issue #1744 fix deadlock
...
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f
Former-commit-id: f4cccabc07
[formerly 2a575a24e7
[formerly 48ef00523488cdf4f65b86c5b74331f908192191]]
Former-commit-id: 2a575a24e7
Former-commit-id: e2f12d16b7
2013-03-01 10:12:56 -06:00
Ben Steffensmeier
1a87c84975
Issue #1731 Allow ScanResource to work better with D2DTimeMatcher.
...
Former-commit-id: aaffde9bf5
[formerly df38a21e11
[formerly 5909f8c7f9c89d3393a2ce6fd3dbf410c6d44c4b]]
Former-commit-id: df38a21e11
Former-commit-id: 74296b32db
2013-02-28 14:04:53 -06:00
Ben Steffensmeier
f7148f5a98
Issue #1731 Remove unneccessary query in getDataStore.
...
Former-commit-id: 38728f3073
[formerly 52a64eda01
[formerly e78a920afcf25b94d5ea473f96d548ce227ea435]]
Former-commit-id: 52a64eda01
Former-commit-id: 61875750c1
2013-02-28 13:59:02 -06:00
Richard Peter
a1fac92d05
Merge "Issue #1597 Moved some interpolation messages to Performance Log for consistency." into omaha_13.3.1
...
Former-commit-id: a9ffc8b170
[formerly 1ce1fb213b
[formerly f4e326c44178ab01b6c5a7c4514dbdd5c9e00cba]]
Former-commit-id: 1ce1fb213b
Former-commit-id: 2950dc9c42
2013-02-27 16:16:09 -06:00
Richard Peter
47021a729d
Merge "Issue #1659 Add time agnostic caching to grid derived parameters Change-Id: I59db267004a7acd51642c4360404e96d50378480" into omaha_13.3.1
...
Former-commit-id: 656d9d74ae
[formerly 6535c1b6c7
[formerly ac6f072dbb19afe6dd76bfd368167ea60c2c8d00]]
Former-commit-id: 6535c1b6c7
Former-commit-id: 7c1c44c22f
2013-02-27 14:46:49 -06:00
Ron Anderson
bbf1f71873
Issue #1597 Moved some interpolation messages to Performance Log for consistency.
...
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8
Former-commit-id: 079cdbcb29
[formerly c9ca7a2943
[formerly 4683ff00b8bc515fc2f802810fc2caba37c282d8]]
Former-commit-id: c9ca7a2943
Former-commit-id: f491d7f7c3
2013-02-27 14:45:30 -06:00
Bryan Kowal
1b65ae1967
Issue #1662 - wrapper parameters can now be used to specify the order
...
of jvm parameters since yajsw does not enforce the ordering or
uniqueness of jvm argument parameters
Change-Id: I9485d2a2992adfb37cade0e6977aab27e3a3217c
Former-commit-id: 44349717fb
[formerly 8bf5e3ffad
[formerly aae64b29491d8da0001cf1182a357683546d4593]]
Former-commit-id: 8bf5e3ffad
Former-commit-id: 5b3478d6c7
2013-02-27 12:46:48 -06:00
Ben Steffensmeier
80ad26ea4a
Issue #1659 Add time agnostic caching to grid derived parameters
...
Change-Id: I59db267004a7acd51642c4360404e96d50378480
Former-commit-id: 6d85856e60
[formerly db1028ee7a
[formerly 9685d0b363f21afbb42df02e9871884123d75e2c]]
Former-commit-id: db1028ee7a
Former-commit-id: ebfedad360
2013-02-27 12:37:14 -06:00
Ron Anderson
36268bb1e2
Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
...
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27
Former-commit-id: c35e06d82c
[formerly 36be1c5850
[formerly cb612d51394a261d12826d6d3ea9553f399ed2a9]]
Former-commit-id: 36be1c5850
Former-commit-id: 50f5e44b39
2013-02-27 12:34:40 -06:00
Ron Anderson
db805e2097
Issue #1708 Fix redundant excution of evaluateQuery.
...
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a
Former-commit-id: 274ce762d8
[formerly a5a273c1c2
[formerly 2528719c05a9c57ca56a6d6e56ed3ae853d5b860]]
Former-commit-id: a5a273c1c2
Former-commit-id: 2212f333a3
2013-02-26 19:00:56 -06:00
Ron Anderson
547f0d086f
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
...
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: f37999b1eb
[formerly bfe3c684df
[formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]
Former-commit-id: bfe3c684df
Former-commit-id: d43afc8c67
2013-02-26 18:44:51 -06:00
Nate Jensen
0cd78444b8
Merge "Issue #1642 : Fix QPID Deadlock scenario - Address peer review comments" into development
...
Former-commit-id: 24c94ef55b
[formerly 58957d30e5
[formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]]
Former-commit-id: 58957d30e5
Former-commit-id: a020438c99
2013-02-26 18:00:50 -06:00
Richard Peter
3e5ab03ecf
Issue #1642 : Fix QPID Deadlock scenario
...
- Address peer review comments
Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462
Former-commit-id: 5b2650599d
[formerly 9a0177861f
[formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]]
Former-commit-id: 9a0177861f
Former-commit-id: 7d4206420c
2013-02-26 16:01:25 -06:00
Dustin Johnson
1d9690f299
Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
...
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7
Former-commit-id: 88a9b953b6
[formerly 7852f88352
[formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]
Former-commit-id: 7852f88352
Former-commit-id: 8038b840d8
2013-02-26 15:06:04 -06:00
Lee Venable
41820c3632
Merge "Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down" into development
...
Former-commit-id: 46ff81108a
[formerly 9cf3ca07b7
[formerly 26fa358838588643c003287d8125e58949c3648f]]
Former-commit-id: 9cf3ca07b7
Former-commit-id: a4b41e0309
2013-02-26 14:11:35 -06:00
Mike Duff
dda044a519
Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down
...
Change-Id: I92016564da48f7f736bebf58fdc0afca5cc1d9ff
Former-commit-id: c77602652e
[formerly b48e70fff4
[formerly 1d9c456b697a79f6093550a26cb3d2d4f972548d]]
Former-commit-id: b48e70fff4
Former-commit-id: fdd5e903c6
2013-02-26 14:03:55 -06:00
Nate Jensen
eb2e9f64f4
Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
...
Former-commit-id: 36d4eff2c6
[formerly b062299796
[formerly 03591924b4efdc13f1cc01182d39e280309cf381]]
Former-commit-id: b062299796
Former-commit-id: 15c4c4dfa0
2013-02-26 13:53:40 -06:00
Nate Jensen
5ecc23350c
Merge "Issue #1506 fix deadlock and edit areas showing up from query" into development
...
Former-commit-id: 4e60fa682d
[formerly 1e50b3a0e8
[formerly 698d1d88b5c67498046dcec558361797a01b07f5]]
Former-commit-id: 1e50b3a0e8
Former-commit-id: f5ebeb1330
2013-02-26 13:46:30 -06:00
Dustin Johnson
5f4301cb7f
Merge "Issue #1592 Don't submit adhoc query when X button clicked" into development
...
Former-commit-id: d31392d740
[formerly 47cb278c01
[formerly bf86849d284696553ed4cbc3f347afe2f791968d]]
Former-commit-id: 47cb278c01
Former-commit-id: 074fb0aa64
2013-02-26 13:41:46 -06:00
Dustin Johnson
256e2076a2
Merge "Issue #1643 Add NCF bandwidth manager router" into development
...
Former-commit-id: fb235e3f43
[formerly 42402c5d73
[formerly e2bb08df9a9aa2ac143e0f7fc82b911f72b4b87c]]
Former-commit-id: 42402c5d73
Former-commit-id: 50b412b34e
2013-02-26 13:41:36 -06:00
Dustin Johnson
ab8506bab4
Merge "Issue #1588 - Fix match any/all in data browser dialog" into development
...
Former-commit-id: 76738dbf7d
[formerly fb38cceecd
[formerly 00e1133e53664a0b8a22a17ca5880736a0f93502]]
Former-commit-id: fb38cceecd
Former-commit-id: 3dd36d29cf
2013-02-26 13:37:14 -06:00
Matt Nash
9dc4390b7e
Issue #1668 add gsd pattern to allow for their plugins to be deployed
...
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6
Former-commit-id: 051b36ad73
[formerly a2fb0db684
[formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]
Former-commit-id: a2fb0db684
Former-commit-id: 41bbd4cf2d
2013-02-26 13:29:04 -06:00
Matt Nash
f18955a1ed
Issue #1506 fix deadlock and edit areas showing up from query
...
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49
Former-commit-id: b749edca54
[formerly c728f72ea3
[formerly 5fd67088da350141cc97d90346272843dfc7ff5d]]
Former-commit-id: c728f72ea3
Former-commit-id: 4be89bdd43
2013-02-26 12:20:08 -06:00
Dustin Johnson
0ba5133583
Issue #1592 Don't submit adhoc query when X button clicked
...
Change-Id: I7a06857fa64a6d54279ec2dca1404062179fe279
Former-commit-id: c6975aa379
[formerly 598eb88a04
[formerly 9cb2114c239e6782961e8127fe85b10a7ee38f06]]
Former-commit-id: 598eb88a04
Former-commit-id: 604a7c82b2
2013-02-26 12:07:36 -06:00
Dustin Johnson
eaa295dddb
Issue #1643 Add NCF bandwidth manager router
...
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8
Former-commit-id: 722e41b8b0
[formerly d58d28c636
[formerly 2b52368c81272df18f3af1334057295d11bb4b52]]
Former-commit-id: d58d28c636
Former-commit-id: ebf02481f0
2013-02-26 11:32:03 -06:00
Steve Harris
82d50b3eb6
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 098b1e1579
[formerly 9bcabe2c5d
[formerly 16bc4b8c4e0261039a6c689afb4220f2ca6d904a]]
Former-commit-id: 9bcabe2c5d
Former-commit-id: 7ed1eacb6b
2013-02-25 20:41:26 -06:00
Richard Peter
2a69ad78b6
Merge "Issue #1659 Stop derived parameters from sending empty requests for cached times" into development
...
Former-commit-id: 1669945cdb
[formerly be9370576a
[formerly 53850dcdaf54d9ef74bb08cca5b966c448cc054e]]
Former-commit-id: be9370576a
Former-commit-id: 2553955249
2013-02-25 17:47:14 -06:00
Richard Peter
2e15dd3a75
Merge "Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests." into development
...
Former-commit-id: 3b718bea52
[formerly b98bdb3d81
[formerly bedfb6a21680961421b42bcbcec470e41bb9523d]]
Former-commit-id: b98bdb3d81
Former-commit-id: af33dd1743
2013-02-25 17:46:26 -06:00
Lee Venable
0be080c78b
Merge "Issue #1625 Updated addOrRemoveCounty method." into development
...
Former-commit-id: 7f769af427
[formerly e024e4e087
[formerly cda14b7c5e6563a9165fa734f35766816bccccf1]]
Former-commit-id: e024e4e087
Former-commit-id: e54eb4ab55
2013-02-25 17:25:56 -06:00
Jonathan Sanchez
4ee3a8d412
Issue #1625 Updated addOrRemoveCounty method.
...
Former-commit-id: 8c2c7c97f7
[formerly cd6dd3c178
[formerly 18760c0895c1776dd0448b0bb699ab5506c45511]]
Former-commit-id: cd6dd3c178
Former-commit-id: f59a08963c
2013-02-25 17:15:09 -06:00