Commit graph

5115 commits

Author SHA1 Message Date
Slav Korolev
5954f60886 Issue #2580. Fixed FSSObs error.
Former-commit-id: 9d87a87a04 [formerly 45d7b28f73] [formerly cab076a9a9] [formerly 05a93ea955 [formerly cab076a9a9 [formerly bb56933cea0f68c18e9cdc352dc6bd53473932ff]]]
Former-commit-id: 05a93ea955
Former-commit-id: b4210dc8af86f3371a3022c98b8a3d66e72a23e0 [formerly 16f66b2c07]
Former-commit-id: 86b77001a7
2014-01-02 15:20:43 -05:00
Brian Clements
95c30dbe0f Issue #2563 fixed label issue for non-grouped roster entry
the old code assumed that the username was populated in the roster object
new code uses the userId which is always populated


Former-commit-id: 0124fbd68d [formerly 0ce560149e] [formerly 73347283b6] [formerly d07bc465d4 [formerly 73347283b6 [formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]]]
Former-commit-id: d07bc465d4
Former-commit-id: 59f71ff2ec1502a0ff12db79de7f3fc00a2159bd [formerly 0f4be44a23]
Former-commit-id: 5dcaa98110
2013-12-20 14:40:00 -06:00
Brian Clements
f084679410 Issue #2563 roster updates for stock servers
added functionality that makes the contact list compatible with server rosters that could be modified with other clients
added support for roster entries that aren't in a local or server group


Former-commit-id: b41eadd0be [formerly b120d74099] [formerly 2b8668a4eb] [formerly e4bd8a3e2c [formerly 2b8668a4eb [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]]
Former-commit-id: e4bd8a3e2c
Former-commit-id: 35a2c84384d4302036ad4c4d8408a681edbf9e81 [formerly 4b4c7ba50c]
Former-commit-id: 0882672686
2013-12-20 12:03:04 -06:00
Brian Clements
5dcd524fa1 Issue #2563 compatibility features for stock xmpp servers
added more listener handling for venue events and server disconnection
added capability to connect to a different server from UI
added better error messages for failed connection/login to server
fixed assumptions that server always sends HTTP url and has feed chatroom


Former-commit-id: 24b3713680 [formerly 621a8536e6] [formerly 09c0267237] [formerly af83c0cf87 [formerly 09c0267237 [formerly b3173727f3f685119be3668779eb5da7e075df50]]]
Former-commit-id: af83c0cf87
Former-commit-id: f24abb8dd24a72ce76ad2bc6b3b272f81b4d74ad [formerly 43021ae281]
Former-commit-id: 917d8dffee
2013-12-20 10:41:13 -06:00
Nate Jensen
41bd7c47da Merge "Issue #2562 moved session data from chat to packet extension" into development
Former-commit-id: ee5e00e6d6 [formerly ab5de71978] [formerly 54a986613a] [formerly 67ba8bb713 [formerly 54a986613a [formerly 2bfedeebc2051fa8f1be5277224cafa598796bdf]]]
Former-commit-id: 67ba8bb713
Former-commit-id: f70ab4d6017a4ef18430da4722a242c647fc775f [formerly c61ac618ea]
Former-commit-id: 2ceb8c2051
2013-12-19 12:41:32 -06:00
Brian Clements
64dda165db Issue #2562 moved session data from chat to packet extension
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used


Former-commit-id: c2b759b38e [formerly 2c20a87634] [formerly 80650337ce] [formerly ce0a34b53c [formerly 80650337ce [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]
Former-commit-id: ce0a34b53c
Former-commit-id: 698a51437531736c124a805026ea7ca5cd199699 [formerly 4015dc23ee]
Former-commit-id: d58f8d7134
2013-12-19 12:08:21 -06:00
David Gillingham
f4dfa0efb1 Issue #2641: Fix ETN assignment issues introduced by baseline merge.
Former-commit-id: ab3f8b200a [formerly c48c0523ff] [formerly 136265183d] [formerly 09bfdc49e3 [formerly 136265183d [formerly 7ae8efacb3c886ec18af64dca7784f4aa1512bf4]]]
Former-commit-id: 09bfdc49e3
Former-commit-id: 54ef06cbf4b4c0bf6f652f24388beb4dfdf1db37 [formerly 8f3802eecf]
Former-commit-id: 6e642b81fe
2013-12-18 16:18:47 -06:00
Richard Peter
9eef793dda Merge "Issue #2636 - Changed delay to offset" into omaha_14.2.1
Former-commit-id: 009c22c72c [formerly c6453e6cc7] [formerly 7d5761111c] [formerly d3aa5189e8 [formerly 7d5761111c [formerly 64598e95a274241197287b3c04e8bd1f9b269179]]]
Former-commit-id: d3aa5189e8
Former-commit-id: 0946391b11817809315b0e2bfb92cbd55c6e5435 [formerly a84f7055fd]
Former-commit-id: ea606df58a
2013-12-18 15:38:19 -06:00
Mike Duff
a3abca76e7 Issue #2636 - Changed delay to offset
Former-commit-id: e1d7f8c0fc [formerly 7fe007d482] [formerly fa314e5eb6] [formerly 14d9978528 [formerly fa314e5eb6 [formerly b5fefc92c0b80613b90acb29f70b96c459167843]]]
Former-commit-id: 14d9978528
Former-commit-id: 00661fb34401180690fcc4ebe48795d27a0fe19a [formerly b9b03657c5]
Former-commit-id: 9f84482bb5
2013-12-18 15:35:47 -06:00
Richard Peter
d26735ba8b Merge "Issue #2636 - Calculate a data set availability delay for each dataset." into omaha_14.2.1
Former-commit-id: 3ca80962f4 [formerly 7ecd59fe4e] [formerly dc1d8fdacb] [formerly bc327ef5ec [formerly dc1d8fdacb [formerly 58b3ddcd7f48f0d4bd2616f0927de21a4c777461]]]
Former-commit-id: bc327ef5ec
Former-commit-id: 4f0bdbd860f46c4801e9d0abee34ed7b334007ea [formerly 73f21cb31d]
Former-commit-id: fe06498040
2013-12-18 15:23:41 -06:00
Mike Duff
6c88d89368 Issue #2636 - Calculate a data set availability delay for each dataset.
Former-commit-id: 45a03a53f2 [formerly a4036f49a9] [formerly f04e249e23] [formerly fb96084864 [formerly f04e249e23 [formerly 6c5fd79bd2a74422053b064d968de3ca440ecec1]]]
Former-commit-id: fb96084864
Former-commit-id: 28e5e91b2b34593ef9a8e79035bf1fe26f2f0456 [formerly a72fa70992]
Former-commit-id: 01a48c9f17
2013-12-18 14:52:11 -06:00
Richard Peter
4aba3d26be Merge "Issue #2579 Make DecisionTree thread safe. Change-Id: I351135189c58ba5a6107de206f8f5dc2d72fc8c0" into omaha_14.2.1
Former-commit-id: 37c43ad625 [formerly 15fb375ac2] [formerly 2453e0dc32] [formerly 0a4c746b85 [formerly 2453e0dc32 [formerly ccef4b597ce787b10b7f2090bd7b430fed5f141c]]]
Former-commit-id: 0a4c746b85
Former-commit-id: 6116d45de3f4bf55fa2c91cc7efd52efc3b903b8 [formerly bb01318ad4]
Former-commit-id: e80c4003e5
2013-12-18 14:43:39 -06:00
Ben Steffensmeier
54a6380895 Issue #2579 Make DecisionTree thread safe.
Change-Id: I351135189c58ba5a6107de206f8f5dc2d72fc8c0

Former-commit-id: dcf68bf3b7 [formerly fea2532ea7] [formerly b92f9efb53] [formerly b096554d97 [formerly b92f9efb53 [formerly 345316581c514136c823692a09ff0d71ce5b7877]]]
Former-commit-id: b096554d97
Former-commit-id: 494cb44de62ee5c255e6754777eb99627d021a1b [formerly 0d1898a070]
Former-commit-id: 1dc5fcd852
2013-12-18 14:06:13 -06:00
Steve Harris
0a47657ba3 Merge branch 'omaha_14.2.1' into development
Former-commit-id: 36b228cc7f [formerly 8aac57e096] [formerly 0950a8a1ba] [formerly 64f8564cd8 [formerly 0950a8a1ba [formerly 71a8fd9b0659b06e366e734c06fa74232787238b]]]
Former-commit-id: 64f8564cd8
Former-commit-id: d06360f4d96492a1e44ce6135ec70d7fc3b2bcbf [formerly 5d6bae317d]
Former-commit-id: 21aaafbd52
2013-12-18 13:14:27 -06:00
Richard Peter
73f12bf669 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]
Former-commit-id: 5c0cf804f1
2013-12-17 21:04:53 -06:00
Nate Jensen
68909c095c Merge "Issue #2574 fix DatabaseQuery conversion of grid coverage objects. Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309" into omaha_14.2.1
Former-commit-id: 72621bcf14 [formerly 29425906ba] [formerly 66f5000243] [formerly 84e3cf0988 [formerly 66f5000243 [formerly 69cbbcc3c88565c35c1453412f031669306adf0f]]]
Former-commit-id: 84e3cf0988
Former-commit-id: 2d09d28c746d8705ac32468202e80b2c778e0ef6 [formerly 42bd8ccde4]
Former-commit-id: eee649c9b1
2013-12-17 12:20:37 -06:00
Brad Gonzales
38198d379b Issue #2636 fixes for the scheduling gaps in the middle of subscription schedules.
Amend: Added max checks to prevent negative bucket sizes in RetrievalPlan remove methods.  Wrapped debug logging in is debug on checks.

Change-Id: I5ab6d3c103e82bf2b1aa0eaf167f0993e5778c90

Former-commit-id: 8e26f2a99c [formerly 253cc9df80] [formerly cc75442fa3] [formerly b2b352a5ae [formerly cc75442fa3 [formerly 3db5d79b914436b8d0feed600fc586d7d3884706]]]
Former-commit-id: b2b352a5ae
Former-commit-id: b11a7f8006104e7102802aa4735db3bf8c3aaff8 [formerly 0df42dacfd]
Former-commit-id: 6e78d3a521
2013-12-17 11:57:06 -06:00
Richard Peter
20ef2a8997 Merge "Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo." into omaha_14.2.1
Former-commit-id: 3c206aecd2 [formerly 123fa3a850] [formerly d233a5161a] [formerly 253aab3dde [formerly d233a5161a [formerly adb1a2efc0e5d0389047b79e2bbb95de16f69a0c]]]
Former-commit-id: 253aab3dde
Former-commit-id: 66ff5d56aa5f6a52c905cd0c7e0d3897bc073d4d [formerly d78cbc8222]
Former-commit-id: d3c4c1d9fa
2013-12-17 11:00:44 -06:00
Brian Clements
0ee093500b Issue #2562 fixed smack buid properties
removed src folder


Former-commit-id: 7779bb7da2 [formerly b175049eb0] [formerly fdb5504f33] [formerly f4c657de4d [formerly fdb5504f33 [formerly e844d36335795a022a6d2180c0a38bfea6f3eac4]]]
Former-commit-id: f4c657de4d
Former-commit-id: fb6e9c5e5b8e30d509de2531ae54cab53d1b2b4b [formerly 92f1087bcf]
Former-commit-id: 5826f6a006
2013-12-17 10:55:28 -06:00
Brad Gonzales
413d6e83d3 Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168

Former-commit-id: b4b51de862 [formerly d329fc26bb] [formerly d324400d65] [formerly d0ae47d053 [formerly d324400d65 [formerly f4c1739687685a22847a09490724e84825032146]]]
Former-commit-id: d0ae47d053
Former-commit-id: 230f64f02e7a5999b7f549e68cba93e994622dda [formerly 8476a13e41]
Former-commit-id: 729ab5d41e
2013-12-17 09:43:12 -06:00
Mike Duff
ca4bb45e94 Issue #2633 - Fix refresh issues with Bandwidth Utilization Graph
Former-commit-id: c5dbf9536d [formerly e26bea423e] [formerly 66f5585774] [formerly 6406bcdd05 [formerly 66f5585774 [formerly 9b73b9db1ff2e7aeab888118348c66090ef7e2ae]]]
Former-commit-id: 6406bcdd05
Former-commit-id: dc31710b1c3cf0e82793c4e06ce4b433634d350a [formerly 54f7feef03]
Former-commit-id: 0232f16e7a
2013-12-17 09:41:30 -06:00
Greg Armendariz
e2da5b7daa Issue #2182 - Change release number
Former-commit-id: 7219a81337 [formerly 00fd9a7bc5] [formerly 85703b9919] [formerly e994e19877 [formerly 85703b9919 [formerly f9b49df162e36376f96897db77e0504cba87f28a]]]
Former-commit-id: e994e19877
Former-commit-id: 02329498e90a03be29ba695e53af3906d56dfb9d [formerly fad73466a7]
Former-commit-id: e190469fc1
2013-12-17 08:46:15 -06:00
Bryan Kowal
a63bda59b4 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]
Former-commit-id: 120ebd045a
Former-commit-id: 1ab6f3920db4e2de42353fe97a9c4fe694df0851 [formerly fac9d72cc8]
Former-commit-id: 68181d3f62
2013-12-16 16:39:10 -06:00
Ben Steffensmeier
e6606cb28b Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309

Former-commit-id: 89de68386a [formerly fb1480b30d] [formerly 7e5349bbff] [formerly cc5d9edc92 [formerly 7e5349bbff [formerly 33033c354a783ab58d89599eb78355c6b354594f]]]
Former-commit-id: cc5d9edc92
Former-commit-id: 5acc5053cf8a5d78052a11afbf56473f1be1d712 [formerly 23a26f5d4a]
Former-commit-id: 8a3bbbca50
2013-12-16 14:31:44 -06:00
Richard Peter
609d5ca4b6 Merge "Issue #2170: Fix PluginNotifier direct-vm endpoints" into omaha_14.2.1
Former-commit-id: 66adb4939a [formerly 42d277364b] [formerly 3758a9532c] [formerly 84b64dac81 [formerly 3758a9532c [formerly 840448d17e58f7d98ebe09b7df17d2d5d4bb4a6f]]]
Former-commit-id: 84b64dac81
Former-commit-id: 87863d83afd45bf114f60dd6dfd2aa25f33d37f8 [formerly f4ba1cac8c]
Former-commit-id: 9230c9de2a
2013-12-16 13:43:37 -06:00
Richard Peter
bcc4b0226d Merge "Issue #2613 Replication subscription start time correctly set" into omaha_14.2.1
Former-commit-id: 38d9d2fc40 [formerly 8b18800b95] [formerly 35299e917d] [formerly 624c51e393 [formerly 35299e917d [formerly b21de50d989fa341b99c0632e908c6c1f7b6853f]]]
Former-commit-id: 624c51e393
Former-commit-id: bae8a12ce5cd2ad2ea2a1b4df29fdb25a1896deb [formerly c05162ed1a]
Former-commit-id: d0ef49d66c
2013-12-13 16:09:13 -06:00
Mike Duff
d4008334a7 Issue #2545 - Prevent negatvie values in the BandwidthBucket's current size
Former-commit-id: 4a34562b6d [formerly 685c07cde0] [formerly b310cf0388] [formerly eb591030d8 [formerly b310cf0388 [formerly f68aaea220b8ad7dcc886bb3bdeab362b977061e]]]
Former-commit-id: eb591030d8
Former-commit-id: 9481ed3c4c2ed1bd3c5d860228b7afb95c3be678 [formerly 0deef9b6dd]
Former-commit-id: ee5788ae5f
2013-12-13 16:03:36 -06:00
Benjamin Phillippe
5e71dc4194 Issue #2613 Replication subscription start time correctly set
Change-Id: I3d00be2b82282a339c7d13a085abe82ee36850d5

Former-commit-id: c793973916 [formerly dd218bb5e3] [formerly 70e6212353] [formerly e0d32db91c [formerly 70e6212353 [formerly 6f3bc8a63cbd5480d65875815de4cdffa63c266c]]]
Former-commit-id: e0d32db91c
Former-commit-id: 15a4a3cf716b317c2b8a2c64d5fa3e5461da8f2b [formerly 80c01c7117]
Former-commit-id: accf148cfd
2013-12-13 14:17:11 -06:00
Richard Peter
25033b31dc Issue #2170: Fix PluginNotifier direct-vm endpoints
Change-Id: If41bfdadbb4bc6ccda3d53f94d1ee493329f0b0c

Former-commit-id: 756baaefb8 [formerly cfd3810476] [formerly 595a655dfd] [formerly 6267bee5d5 [formerly 595a655dfd [formerly b9415039acdc85ee7975e9d6bd27047cce623723]]]
Former-commit-id: 6267bee5d5
Former-commit-id: b7b7dbef9f70f3c75516d4b5ef6990009c01f694 [formerly 55a21685ea]
Former-commit-id: 21d9a7445d
2013-12-13 12:32:46 -06:00
Lee Venable
df1150692d Issue #2583 - Procedure dialog fixes and clean up.
Change-Id: I9255d9bb21bc8794aacddffe571e62149dd08c10

Former-commit-id: 197a8b5508 [formerly d6eb7534f5] [formerly aa0e9121f8] [formerly 7ee6053c22 [formerly aa0e9121f8 [formerly c88681909d99025be43e5d77dd2a89bbc6e929e2]]]
Former-commit-id: 7ee6053c22
Former-commit-id: 0af2a615c742e34adbdfd0a6913eb7d563f108fa [formerly f3c8b69e2e]
Former-commit-id: d05d650430
2013-12-12 16:15:56 -06:00
Steve Harris
690b177ded 14.1.1-13 baseline
Former-commit-id: a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly b0b55a676b [formerly c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]
Former-commit-id: b0b55a676b
Former-commit-id: afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979]
Former-commit-id: 5368f23247
2013-12-12 16:59:57 -05:00
Richard Peter
c137c98511 Issue #2170: Add registration of Router to Notification Framework
Change-Id: Ib2bc29d82395a021cee3a8f98b894010303f06ad

Former-commit-id: 6b2c2ac57c [formerly db0e9d40ec] [formerly 312fcc2b2f] [formerly ded9c782fc [formerly 312fcc2b2f [formerly 6ea46281b904c99c9b6c9f364293bec96be16f7d]]]
Former-commit-id: ded9c782fc
Former-commit-id: 8c2b99ce5979cc67fe016129fe2f3a8f2ec3736d [formerly b4fc76c03a]
Former-commit-id: 3b4507cbe5
2013-12-12 13:47:37 -06:00
Ben Steffensmeier
6a35407957 Issue #2619 Fix rare dateline bug.
Former-commit-id: 1b99b5aca0 [formerly 45e4b4bbad] [formerly 399c579671] [formerly 607b5edb69 [formerly 399c579671 [formerly 8231fde4fdcb25ad19e31dd8e4f5716becba347c]]]
Former-commit-id: 607b5edb69
Former-commit-id: fc52d111900f81c3257ff7f1b3c079e152fb00d3 [formerly d0f4b18b78]
Former-commit-id: 58dabbfc87
2013-12-12 10:30:22 -06:00
Richard Peter
0980aa3328 Merge "Issue #2613 Fixed build" into omaha_14.2.1
Former-commit-id: 920fc0cd6c [formerly 55047d6807] [formerly ffab0f1669] [formerly 2f2f755110 [formerly ffab0f1669 [formerly c1630accf918363334c4d558cda8810341d0a2b7]]]
Former-commit-id: 2f2f755110
Former-commit-id: 1381038e1b08db21600d309ac1f9900e2fe8c78c [formerly 4e5cd81df9]
Former-commit-id: 875d6570ee
2013-12-12 09:54:19 -06:00
Benjamin Phillippe
9d3c42381b Issue #2613 Fixed build
Change-Id: I699c50d3404d155d6435c2ff4f33a465cfd96d14

Former-commit-id: edc39cafac [formerly 5f3e8a5436] [formerly 7529f5bbe8] [formerly 2e909bc207 [formerly 7529f5bbe8 [formerly ce2bffa120b722cb3337658584a83c5161f07a51]]]
Former-commit-id: 2e909bc207
Former-commit-id: 68b4e030b4ac73f474d7331cc758905d41a0b7bd [formerly 620e838f59]
Former-commit-id: 60d141c6a4
2013-12-12 09:44:05 -06:00
Richard Peter
8c0e800811 Merge "Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations." into omaha_14.2.1
Former-commit-id: 71d88ca431 [formerly 247eb683e5] [formerly 91dc7825ce] [formerly 3cc5ebc43e [formerly 91dc7825ce [formerly 08a46b28d5fb5f2e5d28a5f4138ee4fea3fad05d]]]
Former-commit-id: 3cc5ebc43e
Former-commit-id: f3be58dab7723ab7f480a5a91a797293f8455ece [formerly 74c73c8ee1]
Former-commit-id: 7462693157
2013-12-11 18:00:10 -06:00
Richard Peter
1a34cd0d66 Merge "Issue #2625 - fix no data errors in bandwidth utilization graph remove datauri from RetrievalGeneratorUtilities Set queries for DPA data to query by insertTime rather than obsTime" into omaha_14.2.1
Former-commit-id: d4b5572775 [formerly e41adf1ee9] [formerly 49def8a4b2] [formerly a0f59f2059 [formerly 49def8a4b2 [formerly 4da283cae33cca8264007e246fa3d02b9809a114]]]
Former-commit-id: a0f59f2059
Former-commit-id: 16027467a25225e85df14eb9f42c3327ad009c45 [formerly 7673b97152]
Former-commit-id: 9a02a5cf39
2013-12-11 17:59:43 -06:00
Brad Gonzales
d81e245314 Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c

Former-commit-id: 1c027db49b [formerly 6515d6a9e5] [formerly 112649eff2] [formerly 96dc3b65b1 [formerly 112649eff2 [formerly 14171c13dd5f127df0b90a5db9a9e11b301ffc5f]]]
Former-commit-id: 96dc3b65b1
Former-commit-id: 0737955a8aef371ea08edc7e3c56b368da7ef030 [formerly 79efc3b53a]
Former-commit-id: 3f5c25ff46
2013-12-11 17:06:41 -06:00
Richard Peter
eb2ae25b0b Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1
Former-commit-id: ce63ee408b [formerly f278dad7cc] [formerly 63bd2b26eb] [formerly 6f57e14406 [formerly 63bd2b26eb [formerly 3d887a288459b786718a59d0c4a368408c3419f0]]]
Former-commit-id: 6f57e14406
Former-commit-id: 4d3fe53b50bbff6dffd235bf492f67ac729eea24 [formerly 2f0e43e5a4]
Former-commit-id: cdf86e65ec
2013-12-11 16:19:02 -06:00
Richard Peter
34f55d6132 Merge "Issue #2613 Registry performance enhancements" into omaha_14.2.1
Former-commit-id: cfd32aee5f [formerly 4ec080e015] [formerly 375c532376] [formerly 0ed2ba8024 [formerly 375c532376 [formerly 6a3b2d31829b4f6d39a6a06ec06c901b58506deb]]]
Former-commit-id: 0ed2ba8024
Former-commit-id: 19bf66da69dde6bc681fece6d897e713df539fe5 [formerly 890f038a54]
Former-commit-id: 1d339f16f5
2013-12-11 16:11:26 -06:00
Richard Peter
c2bb4039df Merge "Issue #2566 fix bandwidthmanager spring file resource resolution." into omaha_14.2.1
Former-commit-id: 02e6e33eb8 [formerly d720fbbd63] [formerly d9d19a1515] [formerly 51e46e08c5 [formerly d9d19a1515 [formerly 4ea822a22d2b21b4b3172a1f93773f01c2af20de]]]
Former-commit-id: 51e46e08c5
Former-commit-id: ff7f24a830fce1b40cd26b8492b11dff33299fce [formerly 561706ef1e]
Former-commit-id: 6dbcd6677c
2013-12-11 16:08:06 -06:00
Jonathan Sanchez
bef733bb8f Issue #2604 Refactored portions util out of viz.warngen.
Change-Id: I58fad25e0a53d34b3369d6b6463f29e753cb6d10

Former-commit-id: 966f814d2d [formerly 9878c3a797] [formerly 125e747fc9] [formerly 2ecfe79516 [formerly 125e747fc9 [formerly ae9f22dbfce191c79e170b242bfc0c905b61e9bf]]]
Former-commit-id: 2ecfe79516
Former-commit-id: 77df683bd7320416ea169ad18d4f073fee509742 [formerly 5796d108c3]
Former-commit-id: 45903c0e7d
2013-12-11 14:59:16 -06:00
Mike Duff
1504d28ac8 Issue #2616 - Set overwrite allowed flag on madis records when decoded
Added delta script for table MADIS with the hibernate generated key name

Change-Id: Id8cfee5bfba68aa686b9d998bdbf85e5de5c7519

Former-commit-id: fa87393135 [formerly 1a0893d70e] [formerly 9a02ae7d68] [formerly 5a42580c2b [formerly 9a02ae7d68 [formerly b3a18fd5270f2ce109b0560fba6e11e76e721bc9]]]
Former-commit-id: 5a42580c2b
Former-commit-id: 66d528190928112341ed3f56645df5e6a90b4a1e [formerly dc6ab027b5]
Former-commit-id: d65b7c1cf5
2013-12-11 14:12:05 -06:00
Richard Peter
c8a84d6701 Merge "Issue #2581 remove LSR dataURI column" into omaha_14.2.1
Former-commit-id: 453a1072eb [formerly fcbf2ff270] [formerly e441b548cc] [formerly 6e86c98c04 [formerly e441b548cc [formerly e1e34142baebc23917a975a60f9f45aab750a775]]]
Former-commit-id: 6e86c98c04
Former-commit-id: 499298b5962fa570c04a3e8342f7aa0dc9b0934d [formerly 3ebbced489]
Former-commit-id: a9e4ee030d
2013-12-11 13:56:38 -06:00
Greg Armendariz
e734c1ea68 Merge "Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change" into omaha_14.2.1
Former-commit-id: 6dcfee182a [formerly 78e1e9d78f] [formerly 45c9f7352e] [formerly 4c1eb198d2 [formerly 45c9f7352e [formerly 00ef95580fa8ad1fe64694b1bc0a6cdf4ffe6823]]]
Former-commit-id: 4c1eb198d2
Former-commit-id: fdad5044546b55c2852a6891aec138cca46ce41c [formerly 0e0bfc0521]
Former-commit-id: 5171847cdf
2013-12-11 13:54:17 -06:00
Greg Armendariz
07211ccd00 Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change
Change-Id: I831681915d2e214cf8111faeaabb3176eb3fc3c3

Former-commit-id: 74c49f1eee [formerly 57c98d4343] [formerly cb952cdb13] [formerly 2d2641ea7e [formerly cb952cdb13 [formerly 584c543fbab59889769570330e7d83529a6b733f]]]
Former-commit-id: 2d2641ea7e
Former-commit-id: 5e9d4ca213ff3e8a2b41e6d180cedfce81e47a93 [formerly f5f21141a4]
Former-commit-id: fce327c001
2013-12-11 13:46:27 -06:00
Ben Steffensmeier
f62b7011b7 Issue #2602 Switch around the order of some things on startup to make thinclient better.
Former-commit-id: c92b5842ab [formerly bf508b4455] [formerly a37db9d1b4] [formerly 922674273e [formerly a37db9d1b4 [formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]]
Former-commit-id: 922674273e
Former-commit-id: 7b5206504ecad1e36005120b31bf8d5def0e3bf5 [formerly 4a86c90bfc]
Former-commit-id: 0fb85fe4aa
2013-12-11 12:45:11 -06:00
Benjamin Phillippe
d794e8efed Issue #2613 Registry performance enhancements
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21

Former-commit-id: fd4e9edb76 [formerly b2c565c173] [formerly 969099d4c4] [formerly 0cb4e61261 [formerly 969099d4c4 [formerly 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d]]]
Former-commit-id: 0cb4e61261
Former-commit-id: a1014b45f1af11aad2b8627651760da5407df827 [formerly 0d98a48d18]
Former-commit-id: bfa17652ff
2013-12-11 12:20:12 -06:00
Mike Duff
4e87904b6f Issue #2625 - fix no data errors in bandwidth utilization graph
remove datauri from RetrievalGeneratorUtilities
Set queries for DPA data to query by insertTime rather than obsTime

Change-Id: I67a55ca6898a5f478456d75c9ffd7e24120cade7

Former-commit-id: 9f5cf8e0c8 [formerly 4073f048d2] [formerly d378d9194a] [formerly 3492436907 [formerly d378d9194a [formerly 9e37fa3a052d49830b36e6187280615cb6517d47]]]
Former-commit-id: 3492436907
Former-commit-id: 286bba28a76b2a963357edfe7cede7d5247d6b31 [formerly bed189cc7b]
Former-commit-id: d83734f883
2013-12-11 11:29:38 -06:00
Brad Gonzales
919cea89ce Issue #2566 fix bandwidthmanager spring file resource resolution.
Change-Id: I533b39782454083411c65c3a1f721ca26a0d9731

Former-commit-id: 31930d262d [formerly 419230d6db] [formerly 5dd466e22a] [formerly cfa7128be2 [formerly 5dd466e22a [formerly c12676830e66cf8e18f10e835c0f95e25074d992]]]
Former-commit-id: cfa7128be2
Former-commit-id: 548da1be7aa44a46bdb6fe06ce610a6d4f4e0449 [formerly 531c598e3b]
Former-commit-id: 71d6ef856a
2013-12-11 11:19:40 -06:00