Commit graph

2108 commits

Author SHA1 Message Date
Ben Steffensmeier
a6a1d9bec7 Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74

Former-commit-id: 89eb902284 [formerly 4c150b0fd6 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]
Former-commit-id: 4c150b0fd6
Former-commit-id: 37bae0988b
2013-03-13 17:09:20 -05:00
Lee Venable
13d13428b7 Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
Former-commit-id: 28d74d91b0 [formerly d5af1f02c5 [formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]
Former-commit-id: d5af1f02c5
Former-commit-id: 9a69cd3524
2013-03-12 09:08:44 -05:00
Mike Duff
5704b2689e Issue #1781 - Fix Hydro Time Series slow table loads
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d

Former-commit-id: cac9bd6119 [formerly 6a6844fdaf [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]
Former-commit-id: 6a6844fdaf
Former-commit-id: 492cf0f7e6
2013-03-12 09:03:08 -05:00
Roger Ferrel
0982485efe 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: b421c97d86 [formerly 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]
Former-commit-id: 4deb731bd0
Former-commit-id: 70bd9aafa7
2013-03-11 13:00:44 -05:00
Lee Venable
ed477e891e Merge "Issue #1769 Crashing FFMP caused by thread wait" into omaha_13.3.1
Former-commit-id: 41c7be5267 [formerly ea6731947e [formerly 784852cf5045a32f94ba1923e9fadcd952d45dbb]]
Former-commit-id: ea6731947e
Former-commit-id: 483e2813ac
2013-03-08 13:04:28 -06:00
Dave Hladky
b064d868db Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

Former-commit-id: bb4c54eff0 [formerly 2a854d7c30 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]
Former-commit-id: 2a854d7c30
Former-commit-id: 50696bee89
2013-03-08 09:58:17 -06:00
Nate Jensen
8a5ebbb9c9 Issue #1773 log publish times
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85

Former-commit-id: 5c59a61cef [formerly 5e3d6df7e0 [formerly 392feade3f36680edcdb135f7c061be172210c26]]
Former-commit-id: 5e3d6df7e0
Former-commit-id: 5d9778a8d6
2013-03-07 16:49:40 -06:00
David Gillingham
c30aefd889 Issue #1447: Implement active table fetching, make bug fixes
to active table sharing from testing.

Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d

Former-commit-id: 0a79d08dd8 [formerly 95f8074c97 [formerly cede300be734c8a05f90b9c84372866d9bd4f695]]
Former-commit-id: 95f8074c97
Former-commit-id: 75e82d9fca
2013-03-06 14:23:00 -06:00
Nate Jensen
2a34c5757a Issue #1753 log on user shutdown
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549

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

Former-commit-id: 6a3281c878 [formerly 8f70214f66 [formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]
Former-commit-id: 8f70214f66
Former-commit-id: 80ea3e1ec2
2013-03-05 16:02:47 -06:00
Dustin Johnson
cfae194f9b Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
Former-commit-id: 3eddb2d286 [formerly d4c6c29f5f [formerly 6fd60728a421630cea913d11db02b48f7940554e]]
Former-commit-id: d4c6c29f5f
Former-commit-id: 21abece1f2
2013-03-05 13:32:04 -06:00
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
Mike Duff
ec9f3ea4a1 Issue #1752 - Lock down user admin dialog
Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb

Former-commit-id: 193cf1e54f [formerly 6809cb6f80 [formerly e43718de9e5b0f73e4168c724f82eb021e616a34]]
Former-commit-id: 6809cb6f80
Former-commit-id: 9d99eea617
2013-03-05 11:26:54 -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